diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 20852450c..96c9c622e 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -418,6 +418,13 @@ endif() set(SRC ${SRC} ${FIRMWARE_SRC}) +if(INTERNAL_MODULE_MULTI) + set(DEFAULT_TEMPLATE_SETUP 21 CACHE STRING "") +else() + set(DEFAULT_TEMPLATE_SETUP 0 CACHE STRING "") +endif() +message(STATUS "ICI ${INTERNAL_MODULE_MULTI} ${DEFAULT_TEMPLATE_SETUP}") +add_definitions(-DDEFAULT_TEMPLATE_SETUP=${DEFAULT_TEMPLATE_SETUP}) ##### firmware target ##### diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index b07230e4a..ba4052d48 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -17,7 +17,6 @@ set(LINKER_SCRIPT targets/horus/stm32f4_flash.ld) set(RTC_BACKUP_RAM YES) set(PPM_LIMITS_SYMETRICAL YES) set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)") -set(DEFAULT_TEMPLATE_SETUP "0" CACHE STRING "Default channel order") # for size report script set(CPU_TYPE_FULL STM32F429xI) @@ -51,7 +50,6 @@ if (PCB STREQUAL X10) elseif (PCBREV STREQUAL T16) set(FLAVOUR t16) set(LUA_EXPORT lua_export_t16) - set(DEFAULT_TEMPLATE_SETUP 21) add_definitions(-DRADIO_T16) add_definitions(-DRADIO_FAMILY_T16) option(INTERNAL_MODULE_MULTI "Support for MULTI internal module" OFF) @@ -59,7 +57,6 @@ if (PCB STREQUAL X10) elseif (PCBREV STREQUAL TX16S) set(FLAVOUR tx16s) set(LUA_EXPORT lua_export_t16) - set(DEFAULT_TEMPLATE_SETUP 21) add_definitions(-DRADIO_TX16S) add_definitions(-DRADIO_FAMILY_T16) option(INTERNAL_MODULE_MULTI "Support for MULTI internal module" ON) @@ -142,10 +139,6 @@ if(INTERNAL_MODULE_MULTI) add_definitions(-DINTERNAL_MODULE_MULTI) endif() -if(NOT DEFAULT_TEMPLATE_SETUP STREQUAL "") - add_definitions(-DDEFAULT_TEMPLATE_SETUP=${DEFAULT_TEMPLATE_SETUP}) -endif() - include_directories(${RADIO_SRC_DIRECTORY}/fonts/480x272 gui/${GUI_DIR} gui/${GUI_DIR}/layouts) file(GLOB THEMES_SRC RELATIVE ${RADIO_SRC_DIRECTORY}/gui/480x272 ${RADIO_SRC_DIRECTORY}/gui/480x272/themes/*.cpp)