Alessio Morale 57ca1639cc Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next ...

Conflicts:
	flight/Libraries/op_dfu.c
	flight/PiOS/STM32F10x/pios_iap.c
	flight/PiOS/inc/pios_iap.h
	flight/targets/BootloaderUpdater/main.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/CopterControl/op_dfu.c
	flight/targets/Bootloaders/OSD/inc/op_dfu.h
	flight/targets/Bootloaders/PipXtreme/op_dfu.c
	flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
	flight/targets/Bootloaders/RevoMini/op_dfu.c
	flight/targets/Bootloaders/Revolution/inc/op_dfu.h
	flight/targets/Bootloaders/Revolution/op_dfu.c
	ground/openpilotgcs/src/plugins/uploader/uploader.ui
	make/apps-defs.mk
	make/boot-defs.mk

2013-04-23 23:14:11 +02:00

..

inc

Merge in PixHawk F4 work

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

Libraries

Merge branch 'amorale/OP-900_update_freertos_740' into next

2013-04-23 21:57:50 +02:00

library.mk

make: sort wildcard sources to make binaries identical on all platforms

2013-04-19 20:43:31 +02: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

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_bkp.c

OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next.

2013-04-08 01:10:37 +02:00

pios_bl_helper.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_debug.c

pios_debug: use PIOS_INCLUDE_DEBUG_CONSOLE to DEBUG_PRINTF(level, ...)

2013-03-24 13:05:51 +02:00

pios_delay.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_dsm.c

Merge remote-tracking branch 'origin/lilvinz/dsmx_zero_fix' into next

2013-04-20 22:14:23 +02:00

pios_exti.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_flash_internal.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_gpio.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_i2c.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_irq.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_led.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_overo.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_ppm.c

Merge remote-tracking branch 'origin/lilvinz/dsmx_zero_fix' into next

2013-04-20 22:14:23 +02:00

pios_pwm.c

Merge remote-tracking branch 'origin/lilvinz/dsmx_zero_fix' into next

2013-04-20 22:14:23 +02:00

pios_rtc.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_servo.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_spi.c

OP-911: Added SPI_ReleaseBusISR counterpart

2013-04-17 23:40:49 +02:00

pios_sys.c

OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next.

2013-04-08 01:10:37 +02:00

pios_tim.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_usart.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_usb_cdc.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_usb_hid.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_usb.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02:00

pios_usbhook.c

Makefile: fix Makefile for BootloaderUpdater (STM32F10x only targets)

2013-03-24 13:05:52 +02:00

pios_wdg.c

pios: STM32F4xx PIOS #ifdef guards

2013-03-24 13:03:56 +02: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