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
..
inc	Merge in PixHawk F4 work	2011-11-01 01:09:55 -05:00
Libraries	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
library.mk	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
link_STM32F4xx_BL_memory.ld	Merge in PixHawk F4 work	2011-11-01 01:09:55 -05:00
link_STM32F4xx_OP_memory.ld	revo: move fw image into 128KB sectors	2012-03-28 21:52:43 -04:00
link_STM32F4xx_sections.ld	Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next	2012-05-30 16:30:09 +03:00
pios_adc.c	Merge remote-tracking branch 'op-revo/james/revo' into revo-next	2012-10-30 00:08:43 -04:00
pios_bl_helper.c	f4 flash: fix flash voltage range setting in bl_helper	2012-03-22 22:37:31 -04:00
pios_debug.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_delay.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_dsm.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_exti.c	PIOS_EXTI: Make the line task macro now take in the xHigherTaskPriority variable name	2012-09-28 00:40:36 -05:00
pios_gpio.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_i2c.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_iap.c	Merge branch 'next' into MikeL	2012-06-04 15:38:57 -07:00
pios_irq.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_led.c	Merge branch 'next' into revo	2012-09-26 00:43:02 -05:00
pios_overo.c	Disable writing to the overo driver for every pios_com write again. It drives	2012-07-25 13:15:47 -05:00
pios_ppm.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_pwm.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_rtc.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_servo.c	They will be added the needed banks instead of defaulting to the last bank.	2012-09-14 22:50:13 +02:00
pios_spi.c	Make revolution work with the FreeRTOS queue based MPU6000 driver	2012-04-03 03:41:52 -05:00
pios_sys.c	F4 cpuid fix, RM says flash size comes from same base address. who knows?	2012-05-29 22:17:31 +03:00
pios_tim.c	Added TIM12 to PIOS_TIM	2012-09-30 20:32:03 +02:00
pios_usart.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
pios_usb_cdc.c	revo usb: Add support for USB to Revo	2012-02-07 02:25:31 -05:00
pios_usb_hid.c	f4 usb: don't skip yield from ISR	2012-03-27 00:18:44 -04:00
pios_usb.c	Make guidance support my Y6, also caused telemetry/usb RXdatarate go thru the roof (Guidance Warning). Almost impossible to change dataframe type to supported one with clean board.	2012-05-07 12:51:07 -05:00
pios_usbhook.c	f4 usbhook: drop in/out bit from EP numbers before using as index	2012-03-07 20:01:35 -05:00
pios_wdg.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
startup.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00
vectors_stm32f4xx.c	Update the F4 copyright headers to 2012	2012-01-04 19:29:29 -06:00