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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'mtecs' into navigator_rewrite	Julian Oes	2014-06-03	3	-0/+87
\|\
\| *	introduce tecs status uorb message	Thomas Gubler	2014-05-24	3	-0/+87
\| \|
* \|	Merge remote-tracking branch 'px4/master' into navigator_rewrite	Julian Oes	2014-06-03	1	-5/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/modules/navigator/navigator_main.cpp
\| * \|	actuator_armed: Fixed comments and doxygen, no C-level changes	Lorenz Meier	2014-06-01	1	-5/+15
\| \|/
* \|	navigator: mission class added (WIP)	Julian Oes	2014-06-03	2	-26/+16
\| \|
* \|	commander and navigator: lot's of changes, failsafe handling in commander, ↵	Julian Oes	2014-05-27	3	-21/+30
\| \| \| \| \| \| \| \|	navigator only for execution (WIP)
* \|	Merge branch 'master' into navigator_rewrite	Julian Oes	2014-05-26	5	-25/+50
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	gps topic: Added snr and jamming fields	Lorenz Meier	2014-05-23	1	-0/+3
\| \|
\| *	Better docs in GPS topic	Lorenz Meier	2014-05-23	1	-1/+1
\| \|
\| *	Merge pull request #979 from PX4/acro2	Lorenz Meier	2014-05-20	3	-8/+11
\| \|\ \| \| \| \| \| \|	ACRO mode
\| \| *	Merge branch 'master' into acro2	Anton Babushkin	2014-05-20	38	-273/+898
\| \| \|\
\| \| * \	Merge branch 'master' into acro2	Anton Babushkin	2014-03-08	1	-5/+5
\| \| \|\ \
\| \| * \| \|	rc_channels topic: bug fixed; sensors: minor cleanup	Anton Babushkin	2014-02-04	1	-17/+17
\| \| \| \| \|
\| \| * \| \|	Merge branch 'beta' into acro2	Anton Babushkin	2014-02-02	1	-0/+1
\| \| \|\ \ \
\| \| * \| \| \|	ACRO mode implemented	Anton Babushkin	2014-01-31	3	-5/+15
\| \| \| \| \| \|
\| * \| \| \| \|	commander: don't require good EPH for local_position_valid, ↵	Anton Babushkin	2014-05-16	1	-0/+2
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	position_estimator_inav: estimate EPH/EPV and publish it in local position topic
\| * \| \| \|	manual control setpoint: add comment about sign	Thomas Gubler	2014-05-12	1	-4/+11
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into manualcontrolrename	Thomas Gubler	2014-05-12	3	-7/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \|	manual_control_setpoint: comments fixed	Anton Babushkin	2014-05-11	1	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL	Anton Babushkin	2014-05-11	2	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Use "POSCTL" switch name consistently	Anton Babushkin	2014-05-11	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Replaces poshold/althold with posctrl/altctrl	TickTock-	2014-04-28	3	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	renamed EASY to POSHOLD and SEATBELT to ALTHOLD	TickTock-	2014-04-27	3	-5/+5
\| \| \| \| \| \|
\| \| * \| \| \|	compiles	TickTock-	2014-04-27	2	-8/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Merged in upstream master	TickTock-	2014-04-27	3	-0/+10
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged	TickTock-	2014-04-25	3	-8/+8
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	renamed mission_switch to loiter_switch and assisted_switch to easy_switch	TickTock-	2014-04-22	2	-4/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into ↵	TickTock-	2014-04-22	3	-45/+21
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rc_merged
\| * \| \| \| \| \| \| \|	manual control setpoint: rename variables	Thomas Gubler	2014-05-12	1	-13/+23
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merged mpc_rc with master	Lorenz Meier	2014-04-27	1	-0/+2
\| \|\ \ \ \ \ \ \
* \| \| \| \| \| \| \| \|	eph and epv renaming, make this compile again	Julian Oes	2014-04-26	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'px4/ekf_home_init' into ↵	Julian Oes	2014-04-26	6	-14/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merged mpc_rc into ekf_params	Lorenz Meier	2014-04-26	6	-54/+30
\| \|\\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'rc_timeout' into mpc_rc	Anton Babushkin	2014-04-24	2	-2/+2
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	MISSION switch renamed to LOITER	Anton Babushkin	2014-04-24	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge branch 'master' into rc_timeout	Anton Babushkin	2014-04-22	2	-2/+2
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / \| \| \| \| \|/\| / / / / / \| \| \| \| \|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into mpc_rc	Anton Babushkin	2014-04-20	2	-2/+2
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / \| \| \| \|/\| \| / / / / \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'rc_timeout' into mpc_rc	Anton Babushkin	2014-04-13	7	-51/+103
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into mpc_local_pos	Anton Babushkin	2014-04-02	26	-182/+247
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into mpc_local_pos	Anton Babushkin	2014-03-28	2	-2/+5
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	'vehicle_global_position' topic updated: removed baro_alt and XXX_valid flags.	Anton Babushkin	2014-03-27	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into mpc_local_pos	Anton Babushkin	2014-03-22	7	-1/+494
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Optical flow fixes	Anton Babushkin	2014-03-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'beta_mavlink2' into mpc_local_pos_mavlink	Anton Babushkin	2014-03-19	3	-11/+11
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	copyright and code style fixes	Anton Babushkin	2014-03-18	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	vehicle_local_position: use double for ref_lat and ref_lon instead of int32, ↵	Anton Babushkin	2014-03-17	1	-2/+2
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix related apps
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'ArmDisarm' of github.com:DonLakeFlyer/Firmware into ekf_params	Lorenz Meier	2014-04-21	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'px4/master' into navigator_cleanup	Julian Oes	2014-04-26	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #749 from DonLakeFlyer/ArmDisarm	Lorenz Meier	2014-04-26	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| / / / / / / / / / \| \| \|/ / / / / / / / /	Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM