sambas abe3742217 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext ...

Conflicts:
	flight/Libraries/CoordinateConversions.c
	flight/Libraries/paths.c
	flight/Modules/System/systemmod.c
	flight/PiOS/STM32F4xx/pios_sys.c
	flight/targets/boards/coptercontrol/pios_board.h
	flight/targets/boards/revolution/pios_board.h
	flight/targets/boards/revoproto/pios_board.h

2013-04-25 17:26:49 +03:00

..

Libraries

Merge remote-tracking branch 'origin/next' into os/OP-899_board-rename-and-config-rework

2013-04-24 21:28:33 +02:00

library.mk

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

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

link_stm32f10x_HD.ld

Normalize line endings

2013-04-07 09:49:13 +03:00

link_stm32f10x_MD.ld

Normalize line endings

2013-04-07 09:49:13 +03:00

link_STM3210E_OP_BL_sections.ld

Normalize line endings

2013-04-07 09:49:13 +03:00

link_STM3210E_OP_memory.ld

Normalize line endings

2013-04-07 09:49:13 +03:00

link_STM3210E_OP_sections.ld

Normalize line endings

2013-04-07 09:49:13 +03:00

link_STM32103CB_CC_Rev1_BL_sections.ld

Normalize line endings

2013-04-07 09:49:13 +03:00

link_STM32103CB_CC_Rev1_memory.ld

Normalize line endings

2013-04-07 09:49:13 +03:00

link_STM32103CB_CC_Rev1_sections.ld

Normalize line endings

2013-04-07 09:49:13 +03:00

link_STM32103CB_OPLINKMINI_BL_sections.ld

OP-896: rename OPLink to OPLinkMini

2013-04-24 00:07:04 +03:00

link_STM32103CB_OPLINKMINI_memory.ld

OP-896: rename OPLink to OPLinkMini

2013-04-24 00:07:04 +03:00

link_STM32103CB_OPLINKMINI_sections.ld

OP-896: rename OPLink to OPLinkMini

2013-04-24 00:07:04 +03:00

pios_adc.c

pios: STM32F10x PIOS #ifdef guards

2013-03-24 13:03:55 +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: STM32F10x PIOS #ifdef guards

2013-03-24 13:03:55 +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: STM32F10x PIOS #ifdef guards

2013-03-24 13:03:55 +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_eeprom.c

Normalize line endings

2013-04-07 09:49:13 +03:00

pios_exti.c

pios: STM32F10x PIOS #ifdef guards

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

pios_gpio.c

pios: STM32F10x PIOS #ifdef guards

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

pios_i2c.c

pios: STM32F10x PIOS #ifdef guards

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

pios_irq.c

pios: STM32F10x PIOS #ifdef guards

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

pios_led.c

pios: STM32F10x PIOS #ifdef guards

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

pios_ppm_out.c

Makefile and pios_config.h cleanup for PipXtreme

2013-03-24 13:04:08 +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: STM32F10x PIOS #ifdef guards

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

pios_servo.c

pios: STM32F10x PIOS #ifdef guards

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

pios_spi.c

OP-911: Added SPI_ReleaseBusISR counterpart

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

pios_sys.c

pios: STM32F10x PIOS #ifdef guards

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

pios_tim.c

MagBaro Extension board module

2013-03-28 18:20:50 +02:00

pios_usart.c

pios: STM32F10x PIOS #ifdef guards

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

pios_usb_cdc.c

pios: STM32F10x PIOS #ifdef guards

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

pios_usb_hid_istr.c

Makefile: fix Makefile for BootloaderUpdater (STM32F10x only targets)

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

pios_usb_hid_pwr.c

Reset executable bits from non-executable files (Windows legacy)

2013-04-24 01:18:46 +03:00

pios_usb_hid.c

pios: STM32F10x PIOS #ifdef guards

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

pios_usb_rctx.c

pios: STM32F10x PIOS #ifdef guards

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

pios_usb.c

pios: STM32F10x PIOS #ifdef guards

2013-03-24 13:03:55 +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: STM32F10x PIOS #ifdef guards

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

startup_stm32f10x_HD_OP.S

Normalize line endings

2013-04-07 09:49:13 +03:00

startup_stm32f10x_HD.S

Normalize line endings

2013-04-07 09:49:13 +03:00

startup_stm32f10x_MD_CC.S

Normalize line endings

2013-04-07 09:49:13 +03:00

startup_stm32f10x_MD_PX.S

Normalize line endings

2013-04-07 09:49:13 +03:00

startup_stm32f10x_MD.S

Normalize line endings

2013-04-07 09:49:13 +03:00