piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' of https://github.com/opentx/opentx into TaranisPlus

Browse Source 
Conflicts:
	companion/src/firmwares/opentx/opentxinterface.cpp
	radio/src/haptic.cpp
	radio/src/targets/gruvin9x/board_gruvin9x.h
	radio/src/targets/mega2560/board_mega2560.h
	radio/src/targets/sky9x/board_sky9x.h
	radio/src/targets/stock/board_stock.h
	radio/src/targets/taranis/board_taranis.h
	radio/src/targets/taranis/haptic_driver.cpp
This commit is contained in:
Andre Bernet
2014-04-29 15:13:05 +02:00
parent dfead504f7 667dd5fe9e
commit 0ffd0c8e0b
45 changed files with 3682 additions and 2569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/Makefile
+7 -1
View File
@@ -271,7 +271,7 @@ LUA = NO
# Menu Lock modes
# Values = NO, READONLY, NOMENUS
MENUS_LOCK == NO
MENUS_LOCK = NO
#------- END BUILD OPTIONS ---------------------------
@@ -632,6 +632,12 @@ ifeq ($(PCB), TARANIS)
SDCARD = YES
THR_TRACE = YES
EXT = FRSKY
AUTOSWITCH = YES
AUTOSOURCE = YES
DBLKEYS = YES
PPM_LIMITS_SYMETRICAL = YES
PPM_CENTER_ADJUSTABLE = YES
DSM2 = PPM
CPPDEFS += -DPCBTARANIS -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DPXX
INCDIRS += targets/taranis CoOS/kernel CoOS/portable
EXTRAINCDIRS += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/include