Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged in upstream master | TickTock- | 2014-04-27 | 6 | -286/+405 |
|\ | |||||
| * | Make commander less pedantic about position status | Lorenz Meier | 2014-04-27 | 1 | -1/+1 |
| | | |||||
| * | Merged mpc_rc with master | Lorenz Meier | 2014-04-27 | 6 | -279/+386 |
| |\ | |||||
| | * | Merge pull request #749 from DonLakeFlyer/ArmDisarm | Lorenz Meier | 2014-04-26 | 6 | -279/+386 |
| | |\ | | | | | | | | | Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM | ||||
| | | * | Fix float equality comparison | Don Gagne | 2014-04-07 | 1 | -11/+12 |
| | | | | | | | | | | | | | | | | Also restructured incorrect return statement | ||||
| | | * | Added comprehensive arming_state_transition unit test | Don Gagne | 2014-03-27 | 2 | -92/+267 |
| | | | | | | | | | | | | | | | | Also converted full to C++ style. Also converted to new unit test code. | ||||
| | | * | Update to convert to C++ style | Don Gagne | 2014-03-27 | 1 | -2/+1 |
| | | | | |||||
| | | * | Fixed bug with transition from in air restore to armed | Don Gagne | 2014-03-27 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | Also added better debug output for invalid transitions | ||||
| | | * | Simpler state transition code | Don Gagne | 2014-03-26 | 1 | -101/+74 |
| | | | | | | | | | | | | | | | | | | | | Also fixed ARMING_STATE_ARMED_ERROR->ARMING_STATE_STANDBY_ERROR transition. | ||||
| | | * | Function naming and remove unneeded sprintf | Don Gagne | 2014-03-17 | 1 | -9/+7 |
| | | | | |||||
| | | * | arming_state_transition now outputs error messages | Don Gagne | 2014-03-16 | 2 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | | If mavlink fd is passed in method will output reason for arming failure to mavlink. | ||||
| | | * | Use single set of arm/disarm code | Don Gagne | 2014-03-16 | 1 | -81/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set mode and arm/disarm commands now call a single method to arm disarm, thus removing code duplication. Also calls updated arming_state_transition method such that the arming state logic does not need to be duplicated outside of arming_state_transition. | ||||
| * | | | Failsafe landing without position control fixed | Anton Babushkin | 2014-04-25 | 1 | -2/+5 |
| | | | | |||||
| * | | | Merge branch 'rc_timeout' into mpc_rc | Anton Babushkin | 2014-04-24 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | MISSION switch renamed to LOITER | Anton Babushkin | 2014-04-24 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'rc_timeout' into mpc_rc | Anton Babushkin | 2014-04-23 | 1 | -3/+8 |
| |\| | | | |||||
| | * | | | commander: don't start RTL on failsafe if landed | Anton Babushkin | 2014-04-23 | 1 | -3/+8 |
| | | | | | |||||
| | * | | | Merge branch 'master' into rc_timeout | Anton Babushkin | 2014-04-22 | 1 | -3/+8 |
| | |\| | | |||||
| * | | | | Merge branch 'mpc_local_pos' into mpc_rc | Anton Babushkin | 2014-04-23 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into mpc_local_pos | Anton Babushkin | 2014-04-22 | 2 | -9/+16 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | commander: Also publish battery status in HIL, since we have a fake battery ↵ | Lorenz Meier | 2014-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | available and the system freaks out without knowing its main supply | ||||
| * | | | | | Merge branch 'master' into mpc_rc | Anton Babushkin | 2014-04-20 | 1 | -2/+7 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
* | | | | | | Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged | TickTock- | 2014-04-25 | 1 | -45/+116 |
|\| | | | | | |||||
| * | | | | | Merge branch 'rc_timeout' into mpc_rc | Anton Babushkin | 2014-04-13 | 2 | -79/+74 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| * | | | | commander: minor comment fix | Anton Babushkin | 2014-04-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | position_estimator_inav: increase acceptable EPH/EPV, in commander use ↵ | Anton Babushkin | 2014-04-07 | 1 | -6/+17 |
| | | | | | | | | | | | | | | | | | | | | EPH/EPV to decide if global position valid | ||||
| * | | | | commander: home publication fixed | Anton Babushkin | 2014-04-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into mpc_local_pos | Anton Babushkin | 2014-04-04 | 1 | -11/+2 |
| |\ \ \ \ | |||||
| * | | | | | commander: set home position on arming only if at least 2 s from commander ↵ | Anton Babushkin | 2014-04-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | start spent | ||||
| * | | | | | caommander: setting home position by command implemented | Anton Babushkin | 2014-04-02 | 1 | -3/+48 |
| | | | | | | |||||
| * | | | | | commander: position timeout increased to 30ms | Anton Babushkin | 2014-04-02 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | commander: set home position on arming | Anton Babushkin | 2014-04-02 | 1 | -6/+30 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into mpc_local_pos | Anton Babushkin | 2014-03-28 | 1 | -1/+10 |
| |\ \ \ \ \ | |||||
| * | | | | | | 'vehicle_global_position' topic updated: removed baro_alt and XXX_valid flags. | Anton Babushkin | 2014-03-27 | 1 | -41/+32 |
| | | | | | | | |||||
* | | | | | | | Added RC_MAP_FAILSAFE parameter for customizing failsafe channel. Default ↵ | TickTock- | 2014-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to THROTTLE | ||||
* | | | | | | | renamed mission_switch to loiter_switch and assisted_switch to easy_switch | TickTock- | 2014-04-22 | 1 | -5/+5 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into ↵ | TickTock- | 2014-04-22 | 1 | -73/+66 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | |_|_|_|/ / |/| | | | | | rc_merged | ||||
| * | | | | | commander: brackets added to return switch check | Anton Babushkin | 2014-04-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | commander: don't use mode switch if it's not mapped | Anton Babushkin | 2014-04-06 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into rc_timeout | Anton Babushkin | 2014-04-06 | 1 | -6/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'failsafe_sbus_cleanup' into rc_timeout | Anton Babushkin | 2014-04-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | commander, navigator: use updated manual_control_setpoint | Anton Babushkin | 2014-04-03 | 1 | -73/+63 |
| | | | | | | | |||||
| * | | | | | | 'signal_lost' flag added to manual_control_setpoint and rc_channels topics ↵ | Anton Babushkin | 2014-04-03 | 1 | -11/+2 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | to indicate signal loss immediately | ||||
* | | | | | | commander: handle_command: do not filter command if componentid == 0 | Thomas Gubler | 2014-04-08 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | commander: handle_command: filter commands by sysid and componentid | Thomas Gubler | 2014-04-08 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | Merge remote-tracking branch 'px4/master' into mavlink_broadcast | Julian Oes | 2014-04-07 | 2 | -17/+10 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Update airspeed calibration routine to account for new signedness options | Lorenz Meier | 2014-04-05 | 1 | -6/+8 |
| | |/ / / | |/| | | | |||||
| * | | | | Bump RC timeout for all cases to half a second | Lorenz Meier | 2014-04-04 | 1 | -11/+2 |
| |/ / / | |||||
* | | | | commander: put unsupported warning back in place | Julian Oes | 2014-04-07 | 1 | -6/+6 |
| | | | | |||||
* | | | | commander: don't beep if message is not understood | Julian Oes | 2014-04-03 | 1 | -5/+5 |
|/ / / |