aboutsummaryrefslogtreecommitdiff
path: root/src/modules/commander/state_machine_helper.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merged master into airspeed_test_fixLorenz Meier2014-07-111-18/+14
|\
| * Stop warning users just because they shake a bit, be more strict to catch ↵Lorenz Meier2014-07-111-6/+3
| | | | | | | | sensor failures or calibration errors in time
| * Make commander error message more verboseLorenz Meier2014-07-111-1/+1
| |
| * Commander: More hotfixes to prearm check routineLorenz Meier2014-07-111-2/+3
| |
| * Add a check command and fix error reportingLorenz Meier2014-07-111-13/+10
| |
| * Hotfix: Close fd before reusing it againLorenz Meier2014-07-111-0/+2
| |
* | Generalized the airspeed checkLorenz Meier2014-07-101-18/+11
|/
* Merge branch 'master' into offboard2_mergeJulian Oes2014-07-071-1/+1
|\ | | | | | | | | | | Conflicts: src/modules/navigator/navigator.h src/modules/navigator/navigator_main.cpp
| * commander: require home position for MISSION, fallback to LOITERAnton Babushkin2014-07-061-1/+1
| |
* | Merge branch 'master' into offboard2_mergeJulian Oes2014-07-021-20/+149
|\| | | | | | | | | Conflicts: src/modules/uORB/topics/rc_channels.h
| * Warning fixes in commanderLorenz Meier2014-07-011-2/+2
| |
| * 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: put circuit breaker into effectLorenz Meier2014-05-251-14/+18
| | | |
| | * | commander: Enforce (in presence of power sensing) that a) system is not ↵Lorenz Meier2014-05-251-0/+22
| | | | | | | | | | | | | | | | purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail
| * | | 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: detect if offboard control is lost and missing offboard statesJulian Oes2014-06-271-0/+19
| | |
* | | Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboardJulian Oes2014-06-201-0/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 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 offboard2Anton Babushkin2014-05-211-0/+4
| |\ \
| * \ \ Merge branch 'master' into offboard2Anton Babushkin2014-05-161-89/+84
| |\ \ \
| * \ \ \ Merge branch 'master' into offboard2Anton Babushkin2014-03-301-9/+44
| |\ \ \ \
| * \ \ \ \ Merge branch 'beta' into offboard2Anton Babushkin2014-02-141-0/+30
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'beta' into offboard2Anton Babushkin2014-02-051-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'beta' into offboard2Anton Babushkin2014-01-291-55/+85
| |\ \ \ \ \ \ \
| * | | | | | | | cammander, navigator: code style fixedAnton Babushkin2014-01-231-27/+29
| | | | | | | | |
| * | | | | | | | commander: OFFBOARD mode added, WIPAnton Babushkin2014-01-221-0/+6
| | | | | | | | |
* | | | | | | | | 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 ↵Anton Babushkin2014-06-161-42/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state and failsafe determined directly from main state and conditions
* | | | | | | | | navigator: renamed the different RTL statesJulian Oes2014-06-121-4/+4
| | | | | | | | |
* | | | | | | | | commander and navigator: lot's of changes, failsafe handling in commander, ↵Julian Oes2014-05-271-330/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator only for execution (WIP)
* | | | | | | | | Merge branch 'master' into navigator_rewriteJulian Oes2014-05-261-74/+92
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/gps/gps.cpp src/drivers/gps/mtk.cpp src/modules/commander/commander.cpp src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp src/modules/navigator/mission.cpp src/modules/navigator/mission.h src/modules/navigator/navigator_main.cpp src/modules/navigator/navigator_state.h src/modules/position_estimator_inav/position_estimator_inav_main.c
| * | | | | | | | 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 branch 'master' into acro2Anton Babushkin2014-03-081-0/+30
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'beta' into acro2Anton Babushkin2014-02-011-0/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | ACRO mode implementedAnton Babushkin2014-01-311-0/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'px4/master' into navigator_cleanupJulian Oes2014-04-261-102/+83
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #749 from DonLakeFlyer/ArmDisarmLorenz Meier2014-04-261-102/+83
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM
| | * | | | | Fixed bug with transition from in air restore to armedDon Gagne2014-03-271-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added better debug output for invalid transitions
| | * | | | | Simpler state transition codeDon Gagne2014-03-261-101/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed ARMING_STATE_ARMED_ERROR->ARMING_STATE_STANDBY_ERROR transition.
| | * | | | | arming_state_transition now outputs error messagesDon Gagne2014-03-161-8/+13
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | If mavlink fd is passed in method will output reason for arming failure to mavlink.