diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 2b325e2a5..5ba4567f0 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -597,7 +597,7 @@ int OpenTxFirmware::getCapability(const Capability capability) case OffsetWeight: return (IS_ARM(board) ? 500 : 245); case Timers: - return ((IS_ARM(board) && id.contains("timer3")) ? 3 : 2); + return (IS_ARM(board) ? 3 : 0); case TimersName: return (IS_TARANIS(board) ? 8 : (IS_ARM(board) ? 3 : 0)); case PermTimers: @@ -1142,7 +1142,6 @@ void addOpenTxCommonOptions(OpenTxFirmware * firmware) void addOpenTxTaranisOptions(OpenTxFirmware * firmware) { - firmware->addOption("timer3", QObject::tr("Support for a third timer")); firmware->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support")); firmware->addOption("nogvars", QObject::tr("Disable Global variables")); firmware->addOption("lua", QObject::tr("Support for Lua model scripts")); @@ -1218,7 +1217,6 @@ void registerOpenTxFirmwares() firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); - firmware->addOption("timer3", QObject::tr("Support for a third timer")); firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); @@ -1370,7 +1368,6 @@ void registerOpenTxFirmwares() firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); - firmware->addOption("timer3", QObject::tr("Support for a third timer")); firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); @@ -1394,7 +1391,6 @@ void registerOpenTxFirmwares() firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); - firmware->addOption("timer3", QObject::tr("Support for a third timer")); firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt index b17e42271..2019f273b 100644 --- a/radio/src/targets/common/arm/CMakeLists.txt +++ b/radio/src/targets/common/arm/CMakeLists.txt @@ -12,11 +12,6 @@ option(DEBUG_INTERRUPTS "Count interrupts" OFF) option(DEBUG_TASKS "Task switching statistics" OFF) option(DEBUG_TIMERS "Time critical parts of the code" OFF) -if(TIMERS EQUAL 3) - add_definitions(-DTIMERS=3) -else() - add_definitions(-DTIMERS=2) -endif() if(LOG_TELEMETRY) add_definitions(-DLOG_TELEMETRY) endif() @@ -72,6 +67,7 @@ if(MULTIMODULE) add_definitions(-DMULTIMODULE) set(SRC ${SRC} pulses/multi_arm.cpp telemetry/spektrum.cpp) endif() +add_definitions(-DTIMERS=3) add_definitions(-DCPUARM -DVIRTUAL_INPUTS) add_definitions(-DTELEMETRY_FRSKY -DTELEMETRY_FRSKY_SPORT -DFRSKY_HUB -DGPS -DPXX -DDSM2) add_definitions(-DBOLD_FONT -DBATTGRAPH -DTHRTRACE -DGAUGES) diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 4cf6d75ce..97a92866e 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -26,7 +26,6 @@ set(RAMBACKUP YES) add_definitions(-DPCBHORUS -DPCBREV=${PCBREV} -DSTM32F429_439xx -DSDRAM -DCOLORLCD -DPPM_PIN_UART -DPPM_PIN_TIMER) add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK) add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE}) -add_definitions(-DTIMERS=3) include_directories(${RADIO_SRC_DIRECTORY}/fonts/480x272 gui/${GUI_DIR} gui/${GUI_DIR}/layouts)