aboutsummaryrefslogtreecommitdiff
path: root/src/modules/commander
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into manualcontrolrenameThomas Gubler2014-05-129-261/+340
|\
| * Reporting cleanup, use different variables for different state switching resu...Lorenz Meier2014-05-111-41/+23
| * sensors, commander: code style fixedAnton Babushkin2014-05-117-179/+275
| * ALTCTRL/POSCTRL renamed to ALTCTL/POSCTLAnton Babushkin2014-05-114-33/+33
| * Merge pull request #858 from TickTock-/rc_mergedLorenz Meier2014-05-084-42/+43
| |\
| | * shortened rc_assisted_th to rc_assist_th in case we add a dedicated switch ma...TickTock-2014-04-291-3/+3
| | * Replaces poshold/althold with posctrl/altctrlTickTock-2014-04-284-39/+39
| | * renamed EASY to POSHOLD and SEATBELT to ALTHOLDTickTock-2014-04-274-39/+39
| | * compilesTickTock-2014-04-271-4/+1
| | * Merged in upstream masterTickTock-2014-04-276-286/+405
| | |\
| | * \ Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_mergedTickTock-2014-04-251-45/+116
| | |\ \
| | * | | Added RC_MAP_FAILSAFE parameter for customizing failsafe channel. Default to...TickTock-2014-04-221-1/+1
| | * | | renamed mission_switch to loiter_switch and assisted_switch to easy_switchTickTock-2014-04-221-5/+5
| | * | | Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into rc_me...TickTock-2014-04-221-73/+66
| | |\ \ \
* | | | | | commander: use new manual control setpoint variable namesThomas Gubler2014-05-122-7/+7
|/ / / / /
* | | | | Merge pull request #909 from PX4/failsafe_reportingLorenz Meier2014-05-071-0/+17
|\ \ \ \ \
| * | | | | Much better failsafe reporting on failsafe state changesLorenz Meier2014-05-061-0/+17
* | | | | | commander: Fix the position failsafe to a) use proper logic to determine if e...Lorenz Meier2014-05-071-6/+20
|/ / / / /
* | | | | Fix in-air restarts, protect against an external MAVLink sender exploiting th...Lorenz Meier2014-05-061-0/+5
* | | | | commander: Stop mixing board support and high level code - just accept that n...Lorenz Meier2014-04-301-13/+3
| |_|_|/ |/| | |
* | | | Make commander less pedantic about position statusLorenz Meier2014-04-271-1/+1
* | | | Merged mpc_rc with masterLorenz Meier2014-04-276-279/+386
|\ \ \ \
| * \ \ \ Merge pull request #749 from DonLakeFlyer/ArmDisarmLorenz Meier2014-04-266-279/+386
| |\ \ \ \
| | * | | | Fix float equality comparisonDon Gagne2014-04-071-11/+12
| | * | | | Added comprehensive arming_state_transition unit testDon Gagne2014-03-272-92/+267
| | * | | | Update to convert to C++ styleDon Gagne2014-03-271-2/+1
| | * | | | Fixed bug with transition from in air restore to armedDon Gagne2014-03-271-4/+7
| | * | | | Simpler state transition codeDon Gagne2014-03-261-101/+74
| | * | | | Function naming and remove unneeded sprintfDon Gagne2014-03-171-9/+7
| | * | | | arming_state_transition now outputs error messagesDon Gagne2014-03-162-9/+14
| | * | | | Use single set of arm/disarm codeDon Gagne2014-03-161-81/+34
* | | | | | Failsafe landing without position control fixedAnton Babushkin2014-04-251-2/+5
* | | | | | Merge branch 'rc_timeout' into mpc_rcAnton Babushkin2014-04-241-2/+2
|\ \ \ \ \ \
| * | | | | | MISSION switch renamed to LOITERAnton Babushkin2014-04-241-2/+2
* | | | | | | Merge branch 'rc_timeout' into mpc_rcAnton Babushkin2014-04-231-3/+8
|\| | | | | |
| * | | | | | commander: don't start RTL on failsafe if landedAnton Babushkin2014-04-231-3/+8
| * | | | | | Merge branch 'master' into rc_timeoutAnton Babushkin2014-04-221-3/+8
| |\| | | | | | | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'mpc_local_pos' into mpc_rcAnton Babushkin2014-04-231-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into mpc_local_posAnton Babushkin2014-04-222-9/+16
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | commander: Also publish battery status in HIL, since we have a fake battery a...Lorenz Meier2014-04-221-1/+1
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'master' into mpc_rcAnton Babushkin2014-04-201-2/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | commander: handle_command: do not filter command if componentid == 0Thomas Gubler2014-04-081-1/+1
| * | | | commander: handle_command: filter commands by sysid and componentidThomas Gubler2014-04-081-0/+5
| * | | | Merge remote-tracking branch 'px4/master' into mavlink_broadcastJulian Oes2014-04-072-17/+10
| |\ \ \ \
| * | | | | commander: put unsupported warning back in placeJulian Oes2014-04-071-6/+6
| * | | | | commander: don't beep if message is not understoodJulian Oes2014-04-031-5/+5
* | | | | | Merge branch 'rc_timeout' into mpc_rcAnton Babushkin2014-04-132-79/+74
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | commander: brackets added to return switch checkAnton Babushkin2014-04-091-1/+1
| * | | | commander: don't use mode switch if it's not mappedAnton Babushkin2014-04-061-0/+3
| * | | | Merge branch 'master' into rc_timeoutAnton Babushkin2014-04-061-6/+8
| |\ \ \ \ | | | |/ / | | |/| |