chore(radio): remove EEPROM macros and related code (#5461)

This commit is contained in:
philmoz
2024-08-22 10:32:16 +10:00
committed by GitHub
parent 8cfa5b4846
commit e0ec49d84e
83 changed files with 27 additions and 3177 deletions
+1 -7
View File
@@ -16,6 +16,7 @@ set(GUI_SRC
../common/stdlcd/view_telemetry.cpp
../common/stdlcd/calibration.cpp
../common/stdlcd/splash.cpp
../common/stdlcd/radio_sdmanager.cpp
model_curve_edit.cpp
)
@@ -27,13 +28,6 @@ if(HELI)
set(GUI_SRC ${GUI_SRC} ../common/stdlcd/model_heli.cpp)
endif()
if(SDCARD)
set(GUI_SRC
${GUI_SRC}
../common/stdlcd/radio_sdmanager.cpp
)
endif()
if(PXX2)
set(GUI_SRC
${GUI_SRC}
-6
View File
@@ -131,10 +131,4 @@
#define CASE_PCBX9E_PCBX9DP(x)
#endif
#if defined(SDCARD)
#define CASE_SDCARD(x) x,
#else
#define CASE_SDCARD(x)
#endif
#define CASE_SPLASH_PARAM(x) x,
-8
View File
@@ -111,39 +111,31 @@ const char * runPopupMenu(event_t event)
if (popupMenuSelectedItem > 0) {
popupMenuSelectedItem--;
}
#if defined(SDCARD)
else if (popupMenuOffset > 0) {
popupMenuOffset--;
result = STR_UPDATE_LIST;
}
#endif
else {
popupMenuSelectedItem = min<uint8_t>(display_count, MENU_MAX_DISPLAY_LINES) - 1;
#if defined(SDCARD)
if (popupMenuItemsCount > MENU_MAX_DISPLAY_LINES) {
popupMenuOffset = popupMenuItemsCount - display_count;
result = STR_UPDATE_LIST;
}
#endif
}
} else if (IS_NEXT_EVENT(eventTemp)) {
if (popupMenuSelectedItem < display_count - 1 && popupMenuOffset + popupMenuSelectedItem + 1 < popupMenuItemsCount) {
popupMenuSelectedItem++;
}
#if defined(SDCARD)
else if (popupMenuItemsCount > popupMenuOffset + display_count) {
popupMenuOffset++;
result = STR_UPDATE_LIST;
}
#endif
else {
popupMenuSelectedItem = 0;
#if defined(SDCARD)
if (popupMenuOffset) {
popupMenuOffset = 0;
result = STR_UPDATE_LIST;
}
#endif
}
} else if (eventTemp == EVT_KEY_BREAK(KEY_ENTER)) {
result = popupMenuItems[popupMenuSelectedItem + (popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)];
-6
View File
@@ -92,12 +92,6 @@ enum WarningType
extern void POPUP_MENU_ADD_ITEM(const char * s);
#if defined(SDCARD)
#define POPUP_MENU_ADD_SD_ITEM(s) POPUP_MENU_ADD_ITEM(s)
#else
#define POPUP_MENU_ADD_SD_ITEM(s)
#endif
extern void POPUP_MENU_SELECT_ITEM(uint8_t index);
extern void POPUP_MENU_TITLE(const char * s);
@@ -87,10 +87,6 @@ enum {
ITEM_RADIO_HARDWARE_DEBUG,
#if defined(FUNCTION_SWITCHES)
ITEM_RADIO_HARDWARE_DEBUG_FS,
#endif
#if defined(EEPROM)
ITEM_RADIO_BACKUP_EEPROM,
ITEM_RADIO_FACTORY_RESET,
#endif
ITEM_RADIO_HARDWARE_MAX
};
@@ -124,17 +120,6 @@ static const IsValueAvailable _isSerialModeAvailable[MAX_SERIAL_PORTS] = {
_isAux1ModeAvailable, _isAux2ModeAvailable, _isVCPModeAvailable
};
#if defined(EEPROM)
void onFactoryResetConfirm(const char* result)
{
if (result == STR_OK) {
showMessageBox(STR_STORAGE_FORMAT);
storageEraseAll(false);
NVIC_SystemReset();
}
}
#endif
static void _init_menu_tab_array(uint8_t* tab, size_t len)
{
memset((void*)tab, READONLY_ROW, sizeof(MENU_TAB_ARRAY_TYPE) * len);
@@ -224,10 +209,6 @@ static void _init_menu_tab_array(uint8_t* tab, size_t len)
#if defined(FUNCTION_SWITCHES)
tab[ITEM_RADIO_HARDWARE_DEBUG_FS] = 0;
#endif
#if defined(EEPROM)
tab[ITEM_RADIO_BACKUP_EEPROM] = 0;
tab[ITEM_RADIO_FACTORY_RESET] = 0;
#endif
}
void menuRadioHardware(event_t event)
@@ -469,30 +450,6 @@ void menuRadioHardware(event_t event)
break;
#endif
#if defined(EEPROM)
case ITEM_RADIO_BACKUP_EEPROM:
if (LCD_W < 212)
lcdDrawText(LCD_W / 2, y, BUTTON(STR_EEBACKUP), attr | CENTERED);
else
lcdDrawText(HW_SETTINGS_COLUMN2, y, BUTTON(STR_EEBACKUP), attr);
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = EDIT_SELECT_FIELD;
eepromBackup();
}
break;
case ITEM_RADIO_FACTORY_RESET:
if (LCD_W < 212)
lcdDrawText(LCD_W / 2, y, BUTTON(STR_FACTORYRESET), attr | CENTERED);
else
lcdDrawText(HW_SETTINGS_COLUMN2, y, BUTTON(STR_FACTORYRESET), attr);
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = EDIT_SELECT_FIELD;
POPUP_CONFIRMATION(STR_CONFIRMRESET, onFactoryResetConfirm);
}
break;
#endif
default:
if (k <= ITEM_RADIO_HARDWARE_STICK_END) {
// Sticks