James Cotton 6bfb2a5e45 Merge branch 'next' into revo ...

Conflicts:
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/coordinateconversions.h
	ground/openpilotgcs/src/plugins/opmap/opmap.pro
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
	shared/uavobjectdefinition/waypoint.xml

2012-09-01 16:18:03 -05:00

..

inc

Merge in PixHawk F4 work

2011-11-01 01:09:55 -05:00

Libraries

f4 usb_dcd: disable FIFO empty IRQ while waiting for tx completion

2012-03-07 20:36:37 -05:00

library.mk

f4 usb: configure and build ST USB OTG and USB DEV libraries

2012-02-07 02:25:31 -05: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

makefile: Add EF (Entire Flash) targets for all boards

2012-02-03 00:59:36 -05:00

pios_adc.c

For now make the F4 PIOS_ADC return an error code if there is no new data in

2012-06-11 09:22:04 -05: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

Update pios_exti for F4

2012-01-23 16:55:54 -06: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

Make PIOS_LED init it's GPIO clocks so it doesn't rely on startup code

2012-05-30 10:12:40 -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

actuator: factor out settings updates from main loop

2012-08-11 19:46:00 -04: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

revo usb: Add support for USB to Revo

2012-02-07 02:25:31 -05:00

pios_tim.c

Update the F4 copyright headers to 2012

2012-01-04 19:29:29 -06: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