diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index cd0195d96..d9a11ced2 100644 --- a/radio/src/datastructs_private.h +++ b/radio/src/datastructs_private.h @@ -807,7 +807,6 @@ PACK(struct TrainerData { uint8_t slidersConfig:4 ARRAY(1,struct_sliderConfig,nullptr); \ uint8_t potsConfig ARRAY(2,struct_potConfig,nullptr); /* two bits per pot */\ uint8_t backlightColor; \ - swarnstate_t switchUnlockStates; \ CUST_ARRAY(sticksConfig, struct_sticksConfig, stick_name_valid); \ swconfig_t switchConfig ARRAY(2,struct_switchConfig,nullptr); \ char switchNames[STORAGE_NUM_SWITCHES][LEN_SWITCH_NAME] SKIP; \ diff --git a/radio/src/gui/128x64/splash.cpp b/radio/src/gui/128x64/splash.cpp index a711db4ae..24bf69bcb 100644 --- a/radio/src/gui/128x64/splash.cpp +++ b/radio/src/gui/128x64/splash.cpp @@ -33,16 +33,6 @@ void drawSplash() { lcdClear(); lcdDraw1bitBitmap(0, 0, splash_lbm, 0, 0); - -#if MENUS_LOCK == 1 - if (readonly == false) { - lcdDrawFilledRect((LCD_W - (sizeof(TR_UNLOCKED) - 1) * FW) / 2 - 9, 50, - (sizeof(TR_UNLOCKED) - 1) * FW + 16, 11, SOLID, - ERASE | ROUND); - lcdDrawText((LCD_W - (sizeof(TR_UNLOCKED) - 1) * FW) / 2, 53, STR_UNLOCKED); - } -#endif - lcdRefresh(); } #endif diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index 32fc2edef..471dc7168 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -461,7 +461,6 @@ void menuMainView(event_t event) POPUP_MENU_START(onMainViewMenu); break; -#if MENUS_LOCK != 2 /*no menus*/ #if defined(EVT_KEY_LAST_MENU) case EVT_KEY_LAST_MENU: pushMenu(lastPopMenu()); @@ -478,7 +477,7 @@ void menuMainView(event_t event) pushMenu(menuTabGeneral[0]); killEvents(event); break; -#endif + #if defined(HARDWARE_NO_TRIMS) case EVT_KEY_FIRST(KEY_ENTER): if (!trimSelection.preEnterValid) { diff --git a/radio/src/gui/212x64/splash.cpp b/radio/src/gui/212x64/splash.cpp index c5b2467a2..110f5e4a5 100644 --- a/radio/src/gui/212x64/splash.cpp +++ b/radio/src/gui/212x64/splash.cpp @@ -37,16 +37,6 @@ void drawSplash() { lcdClear(); lcdDrawRleBitmap(0, 0, splash_lbm); - -#if MENUS_LOCK == 1 - if (readonly == false) { - lcdDrawFilledRect((LCD_W - (sizeof(TR_UNLOCKED) - 1) * FW) / 2 - 9, 50, - (sizeof(TR_UNLOCKED) - 1) * FW + 16, 11, SOLID, - ERASE | ROUND); - lcdDrawText((LCD_W - (sizeof(TR_UNLOCKED) - 1) * FW) / 2, 53, STR_UNLOCKED); - } -#endif - lcdRefresh(); } #endif diff --git a/radio/src/gui/212x64/view_main.cpp b/radio/src/gui/212x64/view_main.cpp index 772195976..6bc40a2b7 100644 --- a/radio/src/gui/212x64/view_main.cpp +++ b/radio/src/gui/212x64/view_main.cpp @@ -449,7 +449,6 @@ void menuMainView(event_t event) POPUP_MENU_START(onMainViewMenu); break; -#if MENUS_LOCK != 2/*no menus*/ case EVT_KEY_BREAK(KEY_MENU): pushMenu(menuModelSelect); break; @@ -458,7 +457,6 @@ void menuMainView(event_t event) pushMenu(menuTabGeneral[0]); killEvents(event); break; -#endif case EVT_KEY_BREAK(KEY_PAGE): storageDirty(EE_MODEL); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 378fa03cf..f358af4a4 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -579,20 +579,6 @@ void resetBacklightTimeout() lightOffCounter = ((uint16_t)g_eeGeneral.lightAutoOff*250) << 1; } -#if MENUS_LOCK == 1 -bool readonly = true; -bool readonlyUnlocked() -{ - if (readonly) { - POPUP_WARNING(STR_MODS_FORBIDDEN); - return false; - } - else { - return true; - } -} -#endif - #if defined(SPLASH) void doSplash() { @@ -1750,9 +1736,7 @@ void opentxInit() #elif defined(GUI) // TODO add a function for this (duplicated) menuHandlers[0] = menuMainView; - #if MENUS_LOCK != 2/*no menus*/ - menuHandlers[1] = menuModelSelect; - #endif + menuHandlers[1] = menuModelSelect; #endif #if defined(EEPROM) @@ -1857,13 +1841,6 @@ void opentxInit() aux2SerialInit(g_eeGeneral.aux2SerialMode, modelTelemetryProtocol()); #endif -#if MENUS_LOCK == 1 - getMovedSwitch(); - if (TRIMS_PRESSED() && g_eeGeneral.switchUnlockStates==switches_states) { - readonly = false; - } -#endif - currentSpeakerVolume = requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF; currentBacklightBright = requiredBacklightBright = g_eeGeneral.backlightBright; #if !defined(SOFTWARE_VOLUME) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index e2f20df35..c5bd3636b 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -621,15 +621,9 @@ void flightReset(uint8_t check=true); void doSplash(); #endif -#if MENUS_LOCK == 1 - extern bool readonly; - extern bool readonlyUnlocked(); - #define READ_ONLY() readonly - #define READ_ONLY_UNLOCKED() readonlyUnlocked() -#else - #define READ_ONLY() false - #define READ_ONLY_UNLOCKED() true -#endif +// disabled function (not used anywhere) +#define READ_ONLY() false +#define READ_ONLY_UNLOCKED() true void checkLowEEPROM(); void checkThrottleStick(); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index f127841a4..418d4b639 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -925,11 +925,6 @@ const char * const STR_LSW_DESCRIPTIONS[] = TR_LSW_DESCRIPTIONS; const char * const STR_GVAR_HEADERS[] = TR_GVAR_HEADERS; #endif -#if MENUS_LOCK == 1 -const char STR_UNLOCKED[] = TR_UNLOCKED; -const char STR_MODS_FORBIDDEN[] = TR_MODS_FORBIDDEN; -#endif - #if defined(BLUETOOTH) const char STR_BLUETOOTH[] = TR_BLUETOOTH; const char STR_BLUETOOTH_DISC[] = TR_BLUETOOTH_DISC; diff --git a/radio/src/translations.h b/radio/src/translations.h index 1c180f971..f1c16e9a2 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -1088,11 +1088,6 @@ extern const char STR_RTC_CHECK[]; extern const char STR_SPORT_UPDATE_POWER_MODE[]; extern const char STR_SPORT_UPDATE_POWER_MODES[]; -#if MENUS_LOCK == 1 - extern const char STR_UNLOCKED[]; - extern const char STR_MODS_FORBIDDEN[]; -#endif - extern const char STR_MODULE_RANGE[]; extern const char STR_RECEIVER_OPTIONS[];