Stacey Sheldon 2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next ... Conflicts: Makefile flight/Modules/Attitude/revolution/attitude.c flight/Modules/Battery/battery.c flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c flight/Modules/GPS/GPS.c flight/Modules/ManualControl/inc/manualcontrol.h flight/Modules/ManualControl/manualcontrol.c flight/Modules/OveroSync/overosync.c flight/Modules/PathPlanner/inc/pathplanner.h flight/Modules/PathPlanner/pathplanner.c flight/Modules/Sensors/sensors.c flight/Modules/VtolPathFollower/vtolpathfollower.c flight/PiOS/Boards/STM32F4xx_Revolution.h flight/PiOS/Boards/pios_board.h flight/PiOS/STM32F4xx/library.mk flight/PiOS/inc/pios_hmc5883.h flight/PiOS/inc/pios_l3gd20.h flight/PiOS/inc/pios_rfm22b_priv.h flight/Revolution/Makefile flight/Revolution/Makefile.osx flight/Revolution/System/inc/pios_config.h flight/Revolution/UAVObjects.inc ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp ground/openpilotgcs/src/libs/utils/homelocationutil.cpp ground/openpilotgcs/src/libs/utils/homelocationutil.h ground/openpilotgcs/src/plugins/config/configrevowidget.cpp ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp ground/openpilotgcs/src/plugins/plugins.pro ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro package/Makefile shared/uavobjectdefinition/fixedwingpathfollowersettings.xml shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/pathdesired.xml shared/uavobjectdefinition/vtolpathfollowersettings.xml shared/uavobjectdefinition/waypoint.xml		2012-10-30 00:08:43 -04:00
..
Actuator	Merge branch 'next' into revo	2012-10-04 16:38:08 -05:00
AHRSComms	Merged latest origin/next.	2012-05-05 09:40:44 -07:00
Airspeed/revolution	Fix filtering rate for case where we have a baro sensor and a gps, but	2012-07-24 15:16:52 +02:00
Altitude	Added an option to be able to change the interleave between Pressure and Temperature conversion for the MS5611	2012-08-25 13:04:41 +02:00
AltitudeHold	Slow down update rate for the altitude hold smoothed EKF	2012-04-06 13:58:46 -05:00
Attitude	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
Autotune	Autotuning: Increase the measurement time to 30 seconds.	2012-08-24 21:32:11 -05:00
Battery	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
CameraStab	Merge remote-tracking branch 'origin/stac/i2c_decoupling' into next	2012-01-17 22:35:36 -05:00
ComUsbBridge	modules: Allow optional modules to be used as built-in	2012-01-14 16:55:55 -05:00
Example	OP-423: simplify the MODULE_INITCALL macro and remove the ordering loops	2011-07-12 20:44:32 -07:00
Extensions/MagBaro	Optional modules for Revolution, compiles but not flight tested.	2012-07-30 12:20:18 +03:00
Fault	modules: Allow optional modules to be used as built-in	2012-01-14 16:55:55 -05:00
FirmwareIAP	Hack: The OSX sim includes modules slightly differently than the	2012-10-10 08:29:30 -05:00
FixedWingPathFollower	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
FlightPlan	uavobjectmanager: remove uavo name field and related functions	2012-07-07 21:49:53 -04:00
GPS	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
ManualControl	Merge remote-tracking branch 'op-public/next' into revo-next	2012-09-16 09:56:35 -04:00
MK/MKSerial	OP-265 Flight reorganization of UAVObjects and Modules up a directory	2011-01-14 01:38:19 +00:00
Osd	Just some tests/fixes	2012-07-30 11:47:34 +03:00
OveroSync	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
PathPlanner	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
PipXtreme	Cleanup on the PipX branch.	2012-05-18 17:42:25 -07:00
Radio	RFM22B: Added link quality calculation based on number of dropped packets. Also added packet error correction, which apparently wasn't being done before.	2012-10-04 21:11:40 -07:00
RadioComBridge	Merge remote-tracking branch 'revo/brian/rfm22_rf2' into revo	2012-10-05 08:20:35 -05:00
Sensors	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
Stabilization	Merge branch 'next' into kenz/diag_stack_split	2012-09-27 19:29:23 +02:00
System	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
Telemetry	RM: Fixed crashing when radio module is disabled.	2012-09-22 20:13:02 -07:00
TxPID	TxPID: add GyroTau to the list of parameters (OP-637)	2012-05-28 12:48:55 +03:00
VtolPathFollower	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00