aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* renamed EASY to POSHOLD and SEATBELT to ALTHOLDTickTock-2014-04-2715-96/+96
* compilesTickTock-2014-04-274-45/+2
* Merged in upstream masterTickTock-2014-04-2750-513/+814
|\
| * Merge pull request #864 from PX4/mpc_rcLorenz Meier2014-04-2731-919/+974
| |\
| | * Renamed parameters which changed from RAD to DEGREES to avoid user confusion....Lorenz Meier2014-04-271-12/+13
| | * Make commander less pedantic about position statusLorenz Meier2014-04-271-1/+1
| | * Merged mpc_rc with masterLorenz Meier2014-04-2715-353/+455
| | |\ | | |/ | |/|
| * | Merge pull request #749 from DonLakeFlyer/ArmDisarmLorenz Meier2014-04-269-334/+429
| |\ \
| | * | 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
| | * | Rewrote to provide better feedbackDon Gagne2014-03-272-55/+41
| | * | Simpler state transition codeDon Gagne2014-03-262-101/+76
| | * | 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
| * | | Merge pull request #845 from PX4/mag_decl_hotfixLorenz Meier2014-04-261-0/+2
| |\ \ \
| | * | | attitude_estimator_ekf: added missing includeAnton Babushkin2014-04-191-0/+1
| | * | | attitude_estimator_ekf: use degrees for ATT_MAG_DECL parameter to be consiste...Anton Babushkin2014-04-191-0/+1
| * | | | Merge pull request #849 from PX4/compile_pedanticLorenz Meier2014-04-265-17/+21
| |\ \ \ \
| | * | | | Fix of errors triggered by more pedantic compile optionsLorenz Meier2014-04-214-16/+16
| | * | | | More pedantic warningsLorenz Meier2014-04-211-1/+5
| * | | | | Merge pull request #869 from PX4/warningsLorenz Meier2014-04-261-2/+3
| |\ \ \ \ \
| | * | | | | warnings: don't spam with warning for missing field initializerJulian Oes2014-04-261-2/+3
| |/ / / / /
| | | | | * mc_pos_control: parameters comments minor fixesAnton Babushkin2014-04-251-0/+3
| | | | | * mc_pos_control: convert tilt_max to degreesAnton Babushkin2014-04-252-4/+8
| | | | | * rc_mode_switch diagram updatedAnton Babushkin2014-04-252-0/+0
| | | | | * Failsafe landing without position control fixedAnton Babushkin2014-04-252-2/+17
| | | | | * Merge branch 'master' into mpc_rcAnton Babushkin2014-04-2518-60/+117
| | | | | |\ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #852 from PX4/sensors_loopLorenz Meier2014-04-251-7/+5
| |\ \ \ \ \
| | * | | | | sensors: Keep looping in sensors app even if gyros do not update any more. Th...Lorenz Meier2014-04-221-7/+5
| | |/ / / /
| * | | | | Merge pull request #867 from PX4/launchdetector_copyrightLorenz Meier2014-04-257-22/+21
| |\ \ \ \ \
| | * | | | | launchdetector: fix copyright headerThomas Gubler2014-04-257-22/+21
| |/ / / / /
| * | | | | Merge pull request #843 from PX4/sensor_err_handlingLorenz Meier2014-04-255-26/+56
| |\ \ \ \ \
| | * | | | | airspeed: Let the status check routine handle the initial stateLorenz Meier2014-04-201-2/+1
| | * | | | | airspeed driver: Do not spam the console on error, report the system change o...Lorenz Meier2014-04-204-22/+53
| | * | | | | HMC5883: Do not spam the console on error and make everything worse.Lorenz Meier2014-04-201-2/+2
| * | | | | | Merge pull request #860 from PX4/vicongpssimulationLorenz Meier2014-04-244-5/+34
| |\ \ \ \ \ \
| | * | | | | | remove tags fileThomas Gubler2014-04-241-285536/+0
| | * | | | | | filter gps simulation hil gps message with sysidThomas Gubler2014-04-232-1/+285537
| | * | | | | | add parameter to mavlink app to allow parsing of HIL GPS message even if not ...Thomas Gubler2014-04-234-5/+34
| * | | | | | | Merge pull request #862 from thomasgubler/gitignore_tagsLorenz Meier2014-04-241-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | add tags file to .gitignoreThomas Gubler2014-04-241-0/+1
| |/ / / / / /
| | | | | | * Merge branch 'rc_timeout' into mpc_rcAnton Babushkin2014-04-245-12/+12
| | | | | | |\
| | | | | | | * MISSION switch renamed to LOITERAnton Babushkin2014-04-245-12/+12
| | | | | | * | Merge branch 'rc_timeout' into mpc_rcAnton Babushkin2014-04-233-32/+34
| | | | | | |\|
| | | | | | | * commander: don't start RTL on failsafe if landedAnton Babushkin2014-04-231-3/+8
| | | | | | | * Merge branch 'master' into rc_timeoutAnton Babushkin2014-04-22232-314/+10920
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #850 from PX4/mavlink_startup_cleanupLorenz Meier2014-04-222-29/+26
| |\ \ \ \ \ \ \