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
..
pios_board.h	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
STM32F4xx_OSD.h	OSD uSDcard support, settings save/load works (tested on 128MB card). booting takes some time for some reason.	2012-07-30 11:45:22 +03:00
STM32F4xx_Revolution.h	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
STM32F4xx_RevoMini.h	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
STM3210E_OP.h	Merge remote-tracking branch 'origin/stac/led-boottime-config' into next	2012-01-24 10:38:33 -06:00
STM32103CB_AHRS.h	leds: use boot-time config for PiOS LED layer	2012-01-22 18:22:59 -05:00
STM32103CB_CC_Rev1.h	console: add support for serial debug consoles	2012-10-11 00:22:07 -04:00
STM32103CB_PIPXTREME_Rev1.h	RFM22B: All outgoing data to the radio is now going through the PIOS_RFM22B_Send_Packet call. Also removed all global variables with the exception of the rx buffer.	2012-09-22 20:13:11 -07:00