Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard | Julian Oes | 2014-06-20 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/commander/state_machine_helper.cpp src/modules/mavlink/mavlink_receiver.cpp src/modules/mavlink/mavlink_receiver.h src/modules/uORB/topics/vehicle_status.h | ||||
| * | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-05-21 | 1 | -0/+1 |
| |\ | |||||
| * \ | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-05-16 | 1 | -2/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-03-30 | 1 | -0/+2 |
| |\ \ \ | |||||
| * | | | | OFFBOARD mode support in commander, mavlink, mc_att_control, WIP | Anton Babushkin | 2014-01-22 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 1 | -0/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'master' into acro2 | Anton Babushkin | 2014-05-20 | 1 | -2/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL | Anton Babushkin | 2014-05-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | Replaces poshold/althold with posctrl/altctrl | TickTock- | 2014-04-28 | 1 | -2/+2 |
| | | | | |||||
| * | | | renamed EASY to POSHOLD and SEATBELT to ALTHOLD | TickTock- | 2014-04-27 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | commander/px4_custom_mode.h: added missing include | Anton Babushkin | 2014-02-26 | 1 | -0/+2 |
| |/ | |||||
* / | mavlink: custom mode ACRO added | Anton Babushkin | 2014-02-04 | 1 | -0/+1 |
|/ | |||||
* | Indicate AUTO submodes in mavlink custom_mode. | Anton Babushkin | 2013-08-23 | 1 | -5/+24 |
| | |||||
* | commander/px4_custom_mode.h added | Anton Babushkin | 2013-08-14 | 1 | -0/+18 |