Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into obcfailsafe | Thomas Gubler | 2014-08-12 | 1 | -1/+1 |
|\ | |||||
| * | Add fRunPreArmChecks flag | Don Gagne | 2014-08-04 | 1 | -1/+1 |
| | | | | | | | | | | This is to allow unit tests to be written which do not perform pre-arm checks | ||||
* | | add method to block fallback to mission | Thomas Gubler | 2014-07-23 | 1 | -1/+1 |
|/ | | | | | failsafe navigation modes can use a flag in mission_result to tell the commander to not switch back to mission | ||||
* | Documentation only and unused defines only cleanup. | Lorenz Meier | 2014-07-13 | 1 | -6/+4 |
| | |||||
* | Add a check command and fix error reporting | Lorenz Meier | 2014-07-11 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-06-27 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/commander/state_machine_helper.h src/modules/mavlink/mavlink_messages.cpp | ||||
| * | commander: Make mavlink_fd in arming command non-optional | Lorenz Meier | 2014-06-26 | 1 | -1/+1 |
| | | |||||
* | | commander: added some failsafe logic | Julian Oes | 2014-06-18 | 1 | -1/+1 |
| | | |||||
* | | commander: modes display fixes, don't activate failsafe while disarmed | Anton Babushkin | 2014-06-17 | 1 | -1/+1 |
| | | |||||
* | | commander: failsafe_state removed, replaced with bool failsafe, navigation ↵ | Anton Babushkin | 2014-06-16 | 1 | -2/+0 |
| | | | | | | | | state and failsafe determined directly from main state and conditions | ||||
* | | commander and navigator: lot's of changes, failsafe handling in commander, ↵ | Julian Oes | 2014-05-27 | 1 | -12/+4 |
|/ | | | | navigator only for execution (WIP) | ||||
* | arming_state_transition now outputs error messages | Don Gagne | 2014-03-16 | 1 | -1/+1 |
| | | | | | If mavlink fd is passed in method will output reason for arming failure to mavlink. | ||||
* | «flighttermination state» replaced by more general «failsafe state» | Anton Babushkin | 2014-01-25 | 1 | -2/+2 |
| | |||||
* | Moving nav state from commander to navigator, WIP | Anton Babushkin | 2013-12-29 | 1 | -6/+3 |
| | |||||
* | added simple flight termination state machine which enbales parachute on request | Thomas Gubler | 2013-12-08 | 1 | -0/+4 |
| | |||||
* | State machine fixes for HIL | Lorenz Meier | 2013-10-06 | 1 | -1/+1 |
| | |||||
* | Full failsafe rewrite. | Anton Babushkin | 2013-08-27 | 1 | -2/+4 |
| | |||||
* | Rejecting arming if safety switch is not in safe position, added reboot command | Lorenz Meier | 2013-08-15 | 1 | -1/+5 |
| | |||||
* | commander rewrite almost completed, WIP | Anton Babushkin | 2013-07-31 | 1 | -3/+9 |
| | |||||
* | State machine rewritten, compiles, WIP | Anton Babushkin | 2013-07-28 | 1 | -2/+10 |
| | |||||
* | Changed location of lots of flags and conditions, needs testing and more work | Julian Oes | 2013-07-16 | 1 | -1/+1 |
| | |||||
* | Renamed actuator_safety back to actuator_armed, compiling but untested | Julian Oes | 2013-07-15 | 1 | -2/+2 |
| | |||||
* | Shrinking the main commander file a bit | Julian Oes | 2013-06-25 | 1 | -10/+2 |
| | |||||
* | Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine | Julian Oes | 2013-06-18 | 1 | -1/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp src/modules/commander/commander.c src/modules/commander/state_machine_helper.c src/modules/commander/state_machine_helper.h src/modules/px4iofirmware/mixer.cpp src/modules/uORB/topics/actuator_controls.h src/modules/uORB/topics/vehicle_status.h | ||||
| * | Added safety status feedback, disallow arming of a rotary wing with engaged ↵ | Lorenz Meier | 2013-06-09 | 1 | -0/+4 |
| | | | | | | | | safety | ||||
* | | Controllers should not access state machine anymore but access the ↵ | Julian Oes | 2013-06-15 | 1 | -2/+2 |
| | | | | | | | | vehicle_control_mode flags | ||||
* | | Introduced new actuator_safety topic | Julian Oes | 2013-06-14 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into new_state_machine | Julian Oes | 2013-05-17 | 1 | -154/+6 |
|/ | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp src/modules/commander/commander.c src/modules/commander/state_machine_helper.c | ||||
* | Merge working changes into export-build branch. | px4dev | 2013-04-26 | 1 | -0/+209 |