Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-13 | 1 | -18/+19 |
|\ | |||||
| * | Merge branch 'navigator_rewrite' of github.com:PX4/Firmware into navigator_re... | Julian Oes | 2014-06-12 | 1 | -0/+1 |
| |\ | |||||
| * | | navigator: renamed the different RTL states | Julian Oes | 2014-06-12 | 1 | -18/+19 |
* | | | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-12 | 11 | -37/+225 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite | Thomas Gubler | 2014-06-11 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | mtecs: filter airspeed | Thomas Gubler | 2014-06-11 | 1 | -0/+1 |
| * | | Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite | Julian Oes | 2014-06-06 | 3 | -0/+80 |
| |\| | |||||
| | * | Merge branch 'mtecs' into mtecs_wind_estimate | Lorenz Meier | 2014-06-01 | 1 | -5/+15 |
| | |\ | |||||
| | | * | Merge branch 'master' of github.com:PX4/Firmware into mtecs | Lorenz Meier | 2014-06-01 | 1 | -5/+15 |
| | | |\ | |||||
| | * | | | wind estimate: added uORB topic | Lorenz Meier | 2014-06-01 | 2 | -0/+70 |
| | |/ / | |||||
| | * | | mtecs publish state | Thomas Gubler | 2014-05-30 | 1 | -0/+10 |
| * | | | Merge branch 'mtecs' into navigator_rewrite | Julian Oes | 2014-06-03 | 3 | -0/+87 |
| |\| | | |||||
| | * | | introduce tecs status uorb message | Thomas Gubler | 2014-05-24 | 3 | -0/+87 |
| * | | | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-03 | 1 | -5/+15 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | navigator: mission class added (WIP) | Julian Oes | 2014-06-03 | 2 | -26/+16 |
| * | | | commander and navigator: lot's of changes, failsafe handling in commander, na... | Julian Oes | 2014-05-27 | 3 | -21/+30 |
| * | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 5 | -25/+50 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | eph and epv renaming, make this compile again | Julian Oes | 2014-04-26 | 1 | -2/+2 |
| * | | | Merge remote-tracking branch 'px4/ekf_home_init' into navigator_cleanup_ekf_h... | Julian Oes | 2014-04-26 | 6 | -14/+16 |
| |\ \ \ | |||||
| | * | | | Send current local position estimate as well | Lorenz Meier | 2014-04-26 | 1 | -1/+4 |
| | * | | | Merged mpc_rc into ekf_params | Lorenz Meier | 2014-04-26 | 6 | -54/+30 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'ArmDisarm' of github.com:DonLakeFlyer/Firmware into ekf_params | Lorenz Meier | 2014-04-21 | 1 | -0/+2 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge remote-tracking branch 'px4/master' into navigator_cleanup | Julian Oes | 2014-04-26 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | navigator: lot's of cleanup (WIP) | Julian Oes | 2014-04-21 | 4 | -11/+28 |
| * | | | | | | | navigator: wrong mission topic was copied, clearer naming of offboard mission... | Julian Oes | 2014-04-18 | 2 | -2/+2 |
| * | | | | | | | mavlink and mission topic: added reading in DO_JUMP mission items | Julian Oes | 2014-04-18 | 1 | -1/+3 |
* | | | | | | | | mavlink: waypoint manager fixes, mission saving on reboot | Anton Babushkin | 2014-06-09 | 1 | -2/+2 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | actuator_armed: Fixed comments and doxygen, no C-level changes | Lorenz Meier | 2014-06-01 | 1 | -5/+15 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | gps topic: Added snr and jamming fields | Lorenz Meier | 2014-05-23 | 1 | -0/+3 |
* | | | | | | Better docs in GPS topic | Lorenz Meier | 2014-05-23 | 1 | -1/+1 |
* | | | | | | Merge pull request #979 from PX4/acro2 | Lorenz Meier | 2014-05-20 | 3 | -8/+11 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into acro2 | Anton Babushkin | 2014-05-20 | 38 | -273/+898 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into acro2 | Anton Babushkin | 2014-03-08 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | rc_channels topic: bug fixed; sensors: minor cleanup | Anton Babushkin | 2014-02-04 | 1 | -17/+17 |
| * | | | | | | | | Merge branch 'beta' into acro2 | Anton Babushkin | 2014-02-02 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ACRO mode implemented | Anton Babushkin | 2014-01-31 | 3 | -5/+15 |
* | | | | | | | | | | commander: don't require good EPH for local_position_valid, position_estimato... | Anton Babushkin | 2014-05-16 | 1 | -0/+2 |
| |_|_|/ / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | manual control setpoint: add comment about sign | Thomas Gubler | 2014-05-12 | 1 | -4/+11 |
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into manualcontrolrename | Thomas Gubler | 2014-05-12 | 3 | -7/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | manual_control_setpoint: comments fixed | Anton Babushkin | 2014-05-11 | 1 | -4/+4 |
| * | | | | | | | | | ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL | Anton Babushkin | 2014-05-11 | 2 | -4/+4 |
| * | | | | | | | | | Use "POSCTL" switch name consistently | Anton Babushkin | 2014-05-11 | 1 | -1/+1 |
| * | | | | | | | | | Replaces poshold/althold with posctrl/altctrl | TickTock- | 2014-04-28 | 3 | -4/+4 |
| * | | | | | | | | | renamed EASY to POSHOLD and SEATBELT to ALTHOLD | TickTock- | 2014-04-27 | 3 | -5/+5 |
| * | | | | | | | | | compiles | TickTock- | 2014-04-27 | 2 | -8/+0 |
| * | | | | | | | | | Merged in upstream master | TickTock- | 2014-04-27 | 3 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged | TickTock- | 2014-04-25 | 3 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | renamed mission_switch to loiter_switch and assisted_switch to easy_switch | TickTock- | 2014-04-22 | 2 | -4/+4 |
| * | | | | | | | | | | | Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into rc_me... | TickTock- | 2014-04-22 | 3 | -45/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | manual control setpoint: rename variables | Thomas Gubler | 2014-05-12 | 1 | -13/+23 |
| |_|_|/ / / / / / / |/| | | | | | | | | |