From 8530cce10aba75da11fbc5221b4175e89c2b46c2 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 5 Jul 2018 11:04:39 +0200 Subject: [PATCH] Remove CASE_PERSISTENT_TIMERS --- radio/src/gui/128x64/model_setup.cpp | 6 +++--- radio/src/opentx.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index a4d8a86fc..6c414dbde 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -40,12 +40,12 @@ enum MenuModelSetupItems { ITEM_MODEL_NAME, ITEM_MODEL_TIMER1, ITEM_MODEL_TIMER1_NAME, - CASE_PERSISTENT_TIMERS(ITEM_MODEL_TIMER1_PERSISTENT) + ITEM_MODEL_TIMER1_PERSISTENT, ITEM_MODEL_TIMER1_MINUTE_BEEP, ITEM_MODEL_TIMER1_COUNTDOWN_BEEP, ITEM_MODEL_TIMER2, ITEM_MODEL_TIMER2_NAME, - CASE_PERSISTENT_TIMERS(ITEM_MODEL_TIMER2_PERSISTENT) + ITEM_MODEL_TIMER2_PERSISTENT, ITEM_MODEL_TIMER2_MINUTE_BEEP, ITEM_MODEL_TIMER2_COUNTDOWN_BEEP, ITEM_MODEL_TIMER3, @@ -166,7 +166,7 @@ enum MenuModelSetupItems { #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES (HEADER_LINE+ITEM_MODEL_SETUP_MAX) #define POT_WARN_ITEMS() ((g_model.potsWarnMode) ? (uint8_t)(NUM_POTS+NUM_SLIDERS) : (uint8_t)0) - #define TIMER_ROWS 2, 0, CASE_PERSISTENT_TIMERS(0) 0, 0 + #define TIMER_ROWS 2, 0, 0, 0, 0 #if defined(PCBSKY9X) && !defined(REVA) #define EXTRA_MODULE_ROWS LABEL(ExtraModule), 1, 2, #else diff --git a/radio/src/opentx.h b/radio/src/opentx.h index b325b77da..b05ed0475 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -63,8 +63,6 @@ #define CASE_LUA(x) #endif - #define CASE_PERSISTENT_TIMERS(x) x, - #if defined(RTCLOCK) #define CASE_RTCLOCK(x) x, #else