fix merge error

dropax · Jan 1, 2016 · cd3adff · cd3adff
1 parent 71adb03
commit cd3adff
Show file tree

Hide file tree

Showing 144 changed files with 3,200 additions and 0 deletions.
diff --git a/.travis.sh b/.travis.sh
diff --git a/.travis.yml b/.travis.yml
diff --git a/JLinkSettings.ini b/JLinkSettings.ini
diff --git a/Makefile b/Makefile
diff --git a/build_docs.sh b/build_docs.sh
diff --git a/docs/Board - ColibriRace.md b/docs/Board - ColibriRace.md
diff --git a/docs/Display.md b/docs/Display.md
diff --git a/docs/Wiring/Crius CO-16 OLED diagram.png b/docs/Wiring/Crius CO-16 OLED diagram.png
diff --git a/docs/Wiring/Crius CO-16 OLED modifications.jpg b/docs/Wiring/Crius CO-16 OLED modifications.jpg
diff --git a/docs/development/Building Manual.md b/docs/development/Building Manual.md
diff --git a/docs/development/Building in Mac OS X.md b/docs/development/Building in Mac OS X.md
diff --git a/docs/development/Building in Ubuntu.md b/docs/development/Building in Ubuntu.md
diff --git a/docs/development/Building in Windows.md b/docs/development/Building in Windows.md
diff --git a/docs/development/Development.md b/docs/development/Development.md
diff --git a/docs/development/assets/001.cygwin_dl.png b/docs/development/assets/001.cygwin_dl.png
diff --git a/docs/development/assets/002.cygwin_setup.png b/docs/development/assets/002.cygwin_setup.png
diff --git a/docs/development/assets/003.cygwin_setup.png b/docs/development/assets/003.cygwin_setup.png
diff --git a/docs/development/assets/004.cygwin_setup.png b/docs/development/assets/004.cygwin_setup.png
diff --git a/docs/development/assets/005.cygwin_setup.png b/docs/development/assets/005.cygwin_setup.png
diff --git a/docs/development/assets/006.cygwin_setup.png b/docs/development/assets/006.cygwin_setup.png
diff --git a/docs/development/assets/007.cygwin_setup.png b/docs/development/assets/007.cygwin_setup.png
diff --git a/docs/development/assets/008.toolchain.png b/docs/development/assets/008.toolchain.png
diff --git a/docs/development/assets/009.toolchain_path.png b/docs/development/assets/009.toolchain_path.png
diff --git a/docs/development/assets/010.toolchain_path.png b/docs/development/assets/010.toolchain_path.png
diff --git a/docs/development/assets/011.git_checkout.png b/docs/development/assets/011.git_checkout.png
diff --git a/docs/development/assets/012.git_checkout.png b/docs/development/assets/012.git_checkout.png
diff --git a/docs/development/assets/013.compile.png b/docs/development/assets/013.compile.png
diff --git a/docs/override.css b/docs/override.css
diff --git a/fake_travis_build.sh b/fake_travis_build.sh
diff --git a/lib/main/CMSIS/CM3/CoreSupport/core_cm3.c b/lib/main/CMSIS/CM3/CoreSupport/core_cm3.c
diff --git a/lib/main/CMSIS/CM3/CoreSupport/core_cm3.h b/lib/main/CMSIS/CM3/CoreSupport/core_cm3.h
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/misc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/misc.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/misc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/misc.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
diff --git a/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
diff --git a/src/main/config/config.c b/src/main/config/config.c
diff --git a/src/main/drivers/accgyro_spi_mpu6500.c b/src/main/drivers/accgyro_spi_mpu6500.c
diff --git a/src/main/drivers/accgyro_spi_mpu6500.h b/src/main/drivers/accgyro_spi_mpu6500.h
diff --git a/src/main/drivers/pwm_mapping.c b/src/main/drivers/pwm_mapping.c
diff --git a/src/main/drivers/timer.c b/src/main/drivers/timer.c
diff --git a/src/main/flight/lowpass.c b/src/main/flight/lowpass.c
diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c
diff --git a/src/main/io/gps.c b/src/main/io/gps.c
diff --git a/src/main/io/rc_controls.h b/src/main/io/rc_controls.h
diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
diff --git a/src/main/mw.c b/src/main/mw.c
diff --git a/src/main/rx/rx.c.orig b/src/main/rx/rx.c.orig
diff --git a/src/main/rx/rx_BACKUP_3096.c b/src/main/rx/rx_BACKUP_3096.c
diff --git a/src/main/rx/rx_BASE_3096.c b/src/main/rx/rx_BASE_3096.c
diff --git a/src/main/rx/rx_LOCAL_3096.c b/src/main/rx/rx_LOCAL_3096.c
diff --git a/src/main/rx/rx_REMOTE_3096.c b/src/main/rx/rx_REMOTE_3096.c
diff --git a/src/main/scheduler.c b/src/main/scheduler.c
diff --git a/src/main/scheduler.h b/src/main/scheduler.h
diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c
diff --git a/src/main/target/CJMCU/hardware_revision.c b/src/main/target/CJMCU/hardware_revision.c
diff --git a/src/main/target/CJMCU/hardware_revision.h b/src/main/target/CJMCU/hardware_revision.h
diff --git a/src/main/target/COLIBRI_RACE/system_stm32f30x.c b/src/main/target/COLIBRI_RACE/system_stm32f30x.c
diff --git a/src/main/target/COLIBRI_RACE/system_stm32f30x.h b/src/main/target/COLIBRI_RACE/system_stm32f30x.h
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
diff --git a/src/main/target/NAZE/hardware_revision.c b/src/main/target/NAZE/hardware_revision.c
diff --git a/src/main/target/NAZE/hardware_revision.h b/src/main/target/NAZE/hardware_revision.h
diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c
diff --git a/src/test/unit/rx_ranges_unittest.cc b/src/test/unit/rx_ranges_unittest.cc
diff --git a/support/buildserver/upload.php b/support/buildserver/upload.php