px4-firmware - PX4 Firmware for PX4FMU autopilot and PX4IO servo / failsafe board

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'px4/master' into navigator_rewrite	Julian Oes	2014-06-03	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/modules/navigator/navigator_main.cpp
\| *	do not read out home position in gcs (home position is still displayed)	Thomas Gubler	2014-06-01	1	-1/+1
\| \|
* \|	commander: modes and RC loss working now	Julian Oes	2014-05-27	1	-32/+37
\| \|
* \|	commander and navigator: lot's of changes, failsafe handling in commander, ↵	Julian Oes	2014-05-27	1	-258/+214
\| \| \| \| \| \| \| \|	navigator only for execution (WIP)
* \|	Merge branch 'master' into navigator_rewrite	Julian Oes	2014-05-26	1	-147/+220
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Fixed audio output to provide decent user feedback	Lorenz Meier	2014-05-23	1	-1/+2
\| \|
\| *	commander: Better audio indications on arming reject reasons	Lorenz Meier	2014-05-23	1	-3/+3
\| \|
\| *	Merge pull request #979 from PX4/acro2	Lorenz Meier	2014-05-20	1	-2/+23
\| \|\ \| \| \| \| \| \|	ACRO mode
\| \| *	commander: allow disarm in ACRO mode	Anton Babushkin	2014-05-20	1	-1/+1
\| \| \|
\| \| *	Merge branch 'master' into acro2	Anton Babushkin	2014-05-20	1	-288/+370
\| \| \|\
\| \| * \	Merge branch 'master' into acro2	Anton Babushkin	2014-03-08	1	-55/+47
\| \| \|\ \
\| \| * \ \	Merge branch 'beta' into acro2	Anton Babushkin	2014-02-04	1	-0/+4
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'beta' into acro2	Anton Babushkin	2014-02-02	1	-10/+50
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'beta' into acro2	Anton Babushkin	2014-02-01	1	-0/+2
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	commander: allow disarming in ACRO without landing (as in MANUAL)	Anton Babushkin	2014-02-01	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	ACRO mode implemented	Anton Babushkin	2014-01-31	1	-4/+31
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #970 from PX4/flow_no_gps	Lorenz Meier	2014-05-20	1	-1/+20
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|	Allow POSCTL with only PX4FLOW (without GPS)
\| \| * \| \| \| \| \|	commander: don't require good EPH for local_position_valid, ↵	Anton Babushkin	2014-05-16	1	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	position_estimator_inav: estimate EPH/EPV and publish it in local position topic
\| * \| \| \| \| \| \|	commander: missed 'break' in 'switch' added	Anton Babushkin	2014-05-17	1	-0/+1
\| \|/ / / / / /
\| * \| \| \| \| \|	commander: Reduce calibration count, minimally reduce stack sizes after ↵	Lorenz Meier	2014-05-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	careful inspection
\| * \| \| \| \| \|	mavlink, commander: Get back close to original stack sizes. Although tests ↵	Lorenz Meier	2014-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	came clean, we do not want to take any chances
\| * \| \| \| \| \|	Reduce commander stack size mildly	Lorenz Meier	2014-05-14	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into manualcontrolrename	Thomas Gubler	2014-05-12	1	-125/+147
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/modules/commander/commander.cpp src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/uORB/topics/manual_control_setpoint.h
\| \| * \| \| \| \| \|	Reporting cleanup, use different variables for different state switching ↵	Lorenz Meier	2014-05-11	1	-41/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	results to avoid being tripped on local / global name scope
\| \| * \| \| \| \| \|	sensors, commander: code style fixed	Anton Babushkin	2014-05-11	1	-59/+98
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL	Anton Babushkin	2014-05-11	1	-23/+23
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge pull request #858 from TickTock-/rc_merged	Lorenz Meier	2014-05-08	1	-26/+27
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rc merged
\| \| \| * \| \| \| \| \|	shortened rc_assisted_th to rc_assist_th in case we add a dedicated switch ↵	TickTock-	2014-04-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mapping later
\| \| \| * \| \| \| \| \|	Replaces poshold/althold with posctrl/altctrl	TickTock-	2014-04-28	1	-23/+23
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	renamed EASY to POSHOLD and SEATBELT to ALTHOLD	TickTock-	2014-04-27	1	-23/+23
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	compiles	TickTock-	2014-04-27	1	-4/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merged in upstream master	TickTock-	2014-04-27	1	-89/+53
\| \| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged	TickTock-	2014-04-25	1	-45/+116
\| \| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Added RC_MAP_FAILSAFE parameter for customizing failsafe channel. Default ↵	TickTock-	2014-04-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to THROTTLE
\| \| \| * \| \| \| \| \| \| \|	renamed mission_switch to loiter_switch and assisted_switch to easy_switch	TickTock-	2014-04-22	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into ↵	TickTock-	2014-04-22	1	-73/+66
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rc_merged
\| * \| \| \| \| \| \| \| \| \| \|	commander: use new manual control setpoint variable names	Thomas Gubler	2014-05-12	1	-4/+4
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params	Julian Oes	2014-05-07	1	-6/+42
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #909 from PX4/failsafe_reporting	Lorenz Meier	2014-05-07	1	-0/+17
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Much better failsafe reporting on failsafe state changes
\| \| * \| \| \| \| \| \| \| \| \|	Much better failsafe reporting on failsafe state changes	Lorenz Meier	2014-05-06	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	commander: Fix the position failsafe to a) use proper logic to determine if ↵	Lorenz Meier	2014-05-07	1	-6/+20
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eph / epv are good or not (the previous logic was in some states not initialized) and b) add a hysteresis time - because the check as it was before had zero hysteresis time for a bad eph / epv value
\| * \| \| \| / / / / / /	Fix in-air restarts, protect against an external MAVLink sender exploiting ↵	Lorenz Meier	2014-05-06	1	-0/+5
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the restart mechanism
\| * \| \| \| \| \| \| \| \|	Make commander less pedantic about position status	Lorenz Meier	2014-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merged mpc_rc with master	Lorenz Meier	2014-04-27	1	-82/+34
\| \|\ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'px4/ekf_params' into ↵	Julian Oes	2014-04-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	navigator_cleanup_ekf_home_init Conflicts: src/drivers/gps/gps.cpp
\| * \| \| \| \| \| \| \| \| \| \|	Let commander be less pedantic about positioning data	Lorenz Meier	2014-04-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	commander: some HIL commands and land detector cleanup	Julian Oes	2014-04-27	1	-77/+53
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'px4/ekf_home_init' into ↵	Julian Oes	2014-04-26	1	-74/+158
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	navigator_cleanup_ekf_home_init Conflicts: src/modules/commander/commander.cpp src/modules/mc_pos_control/mc_pos_control_main.cpp src/modules/navigator/navigator_main.cpp src/modules/uORB/topics/vehicle_global_position.h
\| * \| \| \| \| \| \| \| \| \| \| \|	Send current local position estimate as well	Lorenz Meier	2014-04-26	1	-8/+16
\| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merged mpc_rc into ekf_params	Lorenz Meier	2014-04-26	1	-121/+194
\| \|\\| \| \| \| \| \| \| \| \| \|