aboutsummaryrefslogtreecommitdiff
path: root/src/modules/commander/state_machine_helper.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merged master into prearm_checksLorenz Meier2014-06-301-324/+214
|\
| * commander: Minor checks / improvements to power enforce patchLorenz Meier2014-06-301-11/+5
| * Merged master into power_enforceLorenz Meier2014-06-301-329/+193
| |\
| | * commander/navigator: renamed FS modes to RTL and RTGS (return to ground station)Julian Oes2014-06-191-6/+6
| | * commander: added some failsafe logicJulian Oes2014-06-181-33/+99
| | * commander: modes display fixes, don't activate failsafe while disarmedAnton Babushkin2014-06-171-7/+25
| | * commander: failsafe_state removed, replaced with bool failsafe, navigation st...Anton Babushkin2014-06-161-42/+70
| | * navigator: renamed the different RTL statesJulian Oes2014-06-121-4/+4
| | * commander and navigator: lot's of changes, failsafe handling in commander, na...Julian Oes2014-05-271-330/+84
| | * Merge branch 'master' into navigator_rewriteJulian Oes2014-05-261-74/+92
| | |\
| | * \ Merge remote-tracking branch 'px4/master' into navigator_cleanupJulian Oes2014-04-261-102/+83
| | |\ \
| | * | | navigator: lot's of cleanup (WIP)Julian Oes2014-04-211-4/+2
| * | | | commander: put circuit breaker into effectLorenz Meier2014-05-251-14/+18
| * | | | commander: Enforce (in presence of power sensing) that a) system is not purel...Lorenz Meier2014-05-251-0/+22
| | |_|/ | |/| |
* | | | commander: Remove prearm test print statementsLorenz Meier2014-06-261-4/+0
* | | | commander: Add pre-arm check for main sensors.Lorenz Meier2014-06-261-17/+118
* | | | commander: Formatting and logic flow cleanup, no functional changeLorenz Meier2014-06-241-9/+15
|/ / /
* | | commander: Better audio indications on arming reject reasonsLorenz Meier2014-05-231-2/+2
* | | Merge branch 'master' into acro2Anton Babushkin2014-05-201-97/+127
|\ \ \
| * | | sensors, commander: code style fixedAnton Babushkin2014-05-111-71/+85
| * | | ALTCTRL/POSCTRL renamed to ALTCTL/POSCTLAnton Babushkin2014-05-111-2/+2
| * | | Replaces poshold/althold with posctrl/altctrlTickTock-2014-04-281-2/+2
| * | | renamed EASY to POSHOLD and SEATBELT to ALTHOLDTickTock-2014-04-271-2/+2
| | |/ | |/|
| * | Merge pull request #749 from DonLakeFlyer/ArmDisarmLorenz Meier2014-04-261-102/+83
| |\ \ | | |/ | |/|
| | * Fixed bug with transition from in air restore to armedDon Gagne2014-03-271-4/+7
| | * Simpler state transition codeDon Gagne2014-03-261-101/+74
| | * arming_state_transition now outputs error messagesDon Gagne2014-03-161-8/+13
| * | commander: Fixed compile error and some stupidity in usage of path namesLorenz Meier2014-03-161-12/+28
| * | commander: Skip devices we do not want to touch in HILLorenz Meier2014-03-161-2/+17
| * | Merged upstream mavlink2_hil branchLorenz Meier2014-03-161-1/+1
| |\ \
| | * | commander: fixed message formatting when disabling sensors publishing in HIL ...Anton Babushkin2014-03-161-1/+1
| | |/
| * | commander: Linting: Reduce scope of variableLorenz Meier2014-03-161-1/+2
| * | commander: Improve HIL publication blocking call handlingLorenz Meier2014-03-161-5/+8
| |/
* | Merge branch 'master' into acro2Anton Babushkin2014-03-081-0/+30
|\|
| * Merged master into betaLorenz Meier2014-02-111-0/+30
| |\
| | * Fixed bogus return value of publication blocking disableLorenz Meier2014-01-141-3/+2
| | * System disables all driver publications it can get hold of once entering HILLorenz Meier2014-01-121-0/+31
* | | Merge branch 'beta' into acro2Anton Babushkin2014-02-011-0/+2
|\| |
| * | commander, navigator, mc_att_control, mc_pos_control: code style fixedAnton Babushkin2014-02-011-0/+2
* | | ACRO mode implementedAnton Babushkin2014-01-311-0/+4
|/ /
* | vehicle_control_mode publication moved to commander, WIPAnton Babushkin2014-01-271-0/+4
* | state_machine_helper: added missed transition to FAILSAFE_STATE_LAND, transit...Anton Babushkin2014-01-261-1/+12
* | commander, navigator: minor cleanup (refactoring), code style fixedAnton Babushkin2014-01-261-10/+14
* | cammander: state machine can now deny current state (e.g. when position lock ...Anton Babushkin2014-01-261-41/+50
* | «flighttermination state» replaced by more general «failsafe state»Anton Babushkin2014-01-251-30/+28
* | Moving nav state from commander to navigator, WIPAnton Babushkin2013-12-291-182/+7
* | fix wrong usage of navigation state in flighttermination state machineThomas Gubler2013-12-141-1/+1
* | added simple flight termination state machine which enbales parachute on requestThomas Gubler2013-12-081-0/+51
* | enable seatbelt without position lock for non rotary wing vehiclesThomas Gubler2013-11-081-2/+3
|/
* Merge pull request #446 from PX4/commander_fixesLorenz Meier2013-10-131-1/+0
|\