From 3b410fca4f5c3c5069007de53801015cbb33aa3e Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 7 Dec 2020 09:48:58 +0000 Subject: [PATCH] Delete REa switch from SKY9X --- radio/src/dataconstants.h | 4 ---- radio/src/gui/gui_common.cpp | 6 ------ radio/src/strhelpers.cpp | 7 ------- 3 files changed, 17 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 7cc47a1ce..dcdd6e5c8 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -543,10 +543,6 @@ enum SwitchSources { SWSRC_TrimT6Up, #endif -#if defined(PCBSKY9X) - SWSRC_REa, -#endif - SWSRC_FIRST_LOGICAL_SWITCH, SWSRC_SW1 = SWSRC_FIRST_LOGICAL_SWITCH, SWSRC_SW2, diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 5008f164b..053db7d2b 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -342,12 +342,6 @@ bool isSwitchAvailable(int swtch, SwitchContext context) } #endif -#if defined(PCBSKY9X) && defined(REVX) - if (swtch == SWSRC_REa) { - return false; - } -#endif - if (swtch >= SWSRC_FIRST_LOGICAL_SWITCH && swtch <= SWSRC_LAST_LOGICAL_SWITCH) { if (context == GeneralCustomFunctionsContext) { return false; diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index b8f68b11f..b88c26099 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -351,16 +351,9 @@ char * getSwitchPositionName(char * dest, swsrc_t idx) } #endif -#if defined(PCBSKY9X) - else if (idx <= SWSRC_REa) { - getStringAtIndex(s, STR_VSWITCHES, IDX_TRIMS_IN_STR_VSWITCHES+idx-SWSRC_FIRST_TRIM); - } -#else else if (idx <= SWSRC_LAST_TRIM) { getStringAtIndex(s, STR_VSWITCHES, IDX_TRIMS_IN_STR_VSWITCHES+idx-SWSRC_FIRST_TRIM); } -#endif - else if (idx <= SWSRC_LAST_LOGICAL_SWITCH) { *s++ = 'L'; strAppendUnsigned(s, idx-SWSRC_FIRST_LOGICAL_SWITCH+1, 2);