7 Commits

Author	SHA1	Message	Date
Lorenz Meier	9179fcefc9	Calibration state machine fixes, generates less bogus error messages during calibration	2015-05-21 17:25:37 +02:00
Lorenz Meier	83fdb9931a	commander / mavlink: Add battery status to output BATTERY_STATUS MAVLink message	2015-05-17 17:44:51 +02:00
Roman Bapst	bd1c3363df	added new vtol mav types	2015-04-27 22:22:52 +02:00
Lorenz Meier	64cdcfc0cc	Fix detection of USB connected state. Needs bench test without USB	2015-04-04 10:15:46 +02:00
Thomas Gubler	16b9f666e7	Merge remote-tracking branch 'upstream/master' into dev_ros ... Conflicts: src/lib/mathlib/math/Matrix.hpp src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_status.h src/platforms/px4_includes.h	2015-01-05 10:02:07 +01:00
Thomas Gubler	b376316fb1	Merge remote-tracking branch 'upstream/isvtol' into dev_ros ... Conflicts: src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_status.h	2014-12-25 09:59:58 +01:00
Thomas Gubler	16618f1ada	Merge remote-tracking branch 'upstream/master' into dev_ros ... Conflicts: src/examples/subscriber/subscriber_params.c src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_attitude.h src/modules/uORB/topics/vehicle_attitude_setpoint.h src/platforms/px4_middleware.h	2014-12-18 12:11:05 +01:00