chore(radio): remove EEPROM macros and related code (#5461)
This commit is contained in:
@@ -139,14 +139,10 @@ extern uint8_t s_copySrcCh;
|
||||
extern int8_t s_currCh;
|
||||
extern uint8_t s_maxLines;
|
||||
|
||||
#if defined(SDCARD)
|
||||
#define STATUS_LINE_LENGTH 32
|
||||
extern char statusLineMsg[STATUS_LINE_LENGTH];
|
||||
void showStatusLine();
|
||||
void drawStatusLine();
|
||||
#else
|
||||
#define drawStatusLine()
|
||||
#endif
|
||||
|
||||
void menuTextView(event_t event);
|
||||
void pushMenuTextView(const char *filename);
|
||||
|
||||
@@ -25,9 +25,7 @@ const MenuHandler menuTabGeneral[MENU_RADIO_PAGES_COUNT] = {
|
||||
#if defined(RADIO_TOOLS)
|
||||
{ menuRadioTools, nullptr },
|
||||
#endif
|
||||
#if defined(SDCARD)
|
||||
{ menuRadioSdManager, nullptr },
|
||||
#endif
|
||||
{ menuRadioSetup, nullptr },
|
||||
{ menuRadioSpecialFunctions, radioGFEnabled },
|
||||
{ menuRadioTrainer, radioTrainerEnabled },
|
||||
|
||||
@@ -54,7 +54,7 @@ enum MenuRadioIndexes
|
||||
#if defined(RADIO_TOOLS)
|
||||
MENU_RADIO_TOOLS,
|
||||
#endif
|
||||
CASE_SDCARD(MENU_RADIO_SD_MANAGER)
|
||||
MENU_RADIO_SD_MANAGER,
|
||||
MENU_RADIO_SETUP,
|
||||
MENU_RADIO_SPECIAL_FUNCTIONS,
|
||||
MENU_RADIO_TRAINER,
|
||||
|
||||
@@ -53,7 +53,6 @@ void onModelSelectMenu(const char * result)
|
||||
s_copyTgtOfs = 0;
|
||||
s_copySrcRow = -1;
|
||||
}
|
||||
#if defined(SDCARD)
|
||||
else if (result == STR_BACKUP_MODEL) {
|
||||
storageCheck(true); // force writing of current model data before this is changed
|
||||
POPUP_WARNING(backupModel(sub));
|
||||
@@ -61,24 +60,17 @@ void onModelSelectMenu(const char * result)
|
||||
else if (result == STR_RESTORE_MODEL || result == STR_UPDATE_LIST) {
|
||||
const char* ext = nullptr;
|
||||
const char* path = nullptr;
|
||||
#if defined(SDCARD_YAML)
|
||||
ext = STR_YAML_EXT;
|
||||
path = STR_BACKUP_PATH;
|
||||
#else
|
||||
ext = STR_MODELS_EXT;
|
||||
path = STR_MODELS_PATH;
|
||||
#endif
|
||||
if (sdListFiles(path, ext, MENU_LINE_LENGTH-1, nullptr))
|
||||
POPUP_MENU_START(onModelSelectMenu);
|
||||
else
|
||||
POPUP_WARNING(STR_NO_MODELS_ON_SD);
|
||||
}
|
||||
#endif
|
||||
else if (result == STR_DELETE_MODEL) {
|
||||
POPUP_CONFIRMATION(STR_DELETEMODEL, onDeleteModelConfirm);
|
||||
SET_WARNING_INFO(modelHeaders[sub].name, sizeof(g_model.header.name), 0);
|
||||
}
|
||||
#if defined(SDCARD)
|
||||
else if (result != STR_EXIT) {
|
||||
// The user choosed a file on SD to restore
|
||||
storageCheck(true);
|
||||
@@ -87,7 +79,6 @@ void onModelSelectMenu(const char * result)
|
||||
loadModel(sub);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static void moveToFreeModelSlot(bool forward, int8_t& sub, int8_t oldSub)
|
||||
@@ -206,22 +197,18 @@ void menuModelSelect(event_t event)
|
||||
if (g_eeGeneral.currModel != sub) {
|
||||
if (modelExists(sub)) {
|
||||
POPUP_MENU_ADD_ITEM(STR_SELECT_MODEL);
|
||||
POPUP_MENU_ADD_SD_ITEM(STR_BACKUP_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_BACKUP_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_COPY_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_MOVE_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_DELETE_MODEL);
|
||||
}
|
||||
else {
|
||||
#if defined(SDCARD)
|
||||
POPUP_MENU_ADD_ITEM(STR_CREATE_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_RESTORE_MODEL);
|
||||
#else
|
||||
selectModel(sub);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else {
|
||||
POPUP_MENU_ADD_SD_ITEM(STR_BACKUP_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_BACKUP_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_COPY_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_MOVE_MODEL);
|
||||
}
|
||||
@@ -265,12 +252,6 @@ void menuModelSelect(event_t event)
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(EEPROM)
|
||||
lcdDrawText(9*FW-(LEN_FREE-4)*FW-4, 0, STR_FREE);
|
||||
if (event) reusableBuffer.modelsel.eepromfree = EeFsGetFree();
|
||||
lcdDrawNumber(lcdLastRightPos+3, 0, reusableBuffer.modelsel.eepromfree, LEFT);
|
||||
#endif
|
||||
|
||||
extern uint8_t menuSize(const MenuHandler*, uint8_t);
|
||||
uint8_t sz = menuSize(menuTabModel, DIM(menuTabModel));
|
||||
#if defined(NAVIGATION_X7)
|
||||
|
||||
@@ -30,10 +30,8 @@
|
||||
#include "usb_joystick.h"
|
||||
#endif
|
||||
|
||||
#if !defined(EEPROM)
|
||||
#include "storage/sdcard_common.h"
|
||||
#include "storage/modelslist.h"
|
||||
#endif
|
||||
|
||||
#if defined(CROSSFIRE)
|
||||
#include "telemetry/crossfire.h"
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (19 * FW - 3)
|
||||
#define MODEL_SPECIAL_FUNC_5TH_COLUMN_ONOFF (20 * FW + 1)
|
||||
|
||||
#if defined(SDCARD)
|
||||
#define SD_LOGS_PERIOD_MIN 1 // 0.1s fastest period
|
||||
#define SD_LOGS_PERIOD_MAX 255 // 25.5s slowest period
|
||||
#define SD_LOGS_PERIOD_DEFAULT 10 // 1s default period for newly created SF
|
||||
@@ -75,7 +74,6 @@ void onCustomFunctionsFileSelectionMenu(const char * result)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // SDCARD
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
void onAdjustGvarSourceLongEnterPress(const char * result)
|
||||
@@ -316,7 +314,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
|
||||
}
|
||||
#endif
|
||||
#if defined(SDCARD)
|
||||
else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT || func == FUNC_RGB_LED) {
|
||||
coord_t x = MODEL_SPECIAL_FUNC_3RD_COLUMN - 6;
|
||||
if (func == FUNC_PLAY_SCRIPT)
|
||||
@@ -359,7 +356,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
INCDEC_ENABLE_CHECK(functionsContext == &globalFunctionsContext ? isSourceAvailableInGlobalFunctions : isSourceAvailable);
|
||||
}
|
||||
}
|
||||
#endif // SDCARD
|
||||
else if (func == FUNC_VOLUME) {
|
||||
val_max = MIXSRC_LAST_CH;
|
||||
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
|
||||
@@ -376,7 +372,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
INCDEC_ENABLE_CHECK(isSourceAvailable);
|
||||
}
|
||||
}
|
||||
#if defined(SDCARD)
|
||||
else if (func == FUNC_LOGS) {
|
||||
val_min = SD_LOGS_PERIOD_MIN;
|
||||
val_max = SD_LOGS_PERIOD_MAX;
|
||||
@@ -388,7 +383,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT);
|
||||
lcdDrawChar(lcdLastRightPos, y, 's');
|
||||
}
|
||||
#endif
|
||||
#if defined(GVARS)
|
||||
else if (func == FUNC_ADJUST_GVAR) {
|
||||
switch (CFN_GVAR_MODE(cfn)) {
|
||||
|
||||
@@ -243,7 +243,6 @@ int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(SDCARD)
|
||||
char statusLineMsg[STATUS_LINE_LENGTH];
|
||||
tmr10ms_t statusLineTime = 0;
|
||||
uint8_t statusLineHeight = 0;
|
||||
@@ -272,4 +271,3 @@ void drawStatusLine()
|
||||
lcdDrawFilledRect(0, LCD_H-statusLineHeight, LCD_W, FH, SOLID);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -51,13 +51,8 @@ void onModelSelectMenu(const char * result)
|
||||
else if (result == STR_RESTORE_MODEL || result == STR_UPDATE_LIST) {
|
||||
const char* ext = nullptr;
|
||||
const char* path = nullptr;
|
||||
#if defined(SDCARD_YAML)
|
||||
ext = STR_YAML_EXT;
|
||||
path = STR_BACKUP_PATH;
|
||||
#else
|
||||
ext = STR_MODELS_EXT;
|
||||
path = STR_MODELS_PATH;
|
||||
#endif
|
||||
if (sdListFiles(path, ext, MENU_LINE_LENGTH-1, nullptr))
|
||||
POPUP_MENU_START(onModelSelectMenu);
|
||||
else
|
||||
@@ -201,7 +196,7 @@ void menuModelSelect(event_t event)
|
||||
if (g_eeGeneral.currModel != sub) {
|
||||
if (modelExists(sub)) {
|
||||
POPUP_MENU_ADD_ITEM(STR_SELECT_MODEL);
|
||||
POPUP_MENU_ADD_SD_ITEM(STR_BACKUP_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_BACKUP_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_COPY_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_MOVE_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_DELETE_MODEL);
|
||||
@@ -212,7 +207,7 @@ void menuModelSelect(event_t event)
|
||||
}
|
||||
}
|
||||
else {
|
||||
POPUP_MENU_ADD_SD_ITEM(STR_BACKUP_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_BACKUP_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_COPY_MODEL);
|
||||
POPUP_MENU_ADD_ITEM(STR_MOVE_MODEL);
|
||||
}
|
||||
@@ -241,12 +236,6 @@ void menuModelSelect(event_t event)
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(EEPROM)
|
||||
lcdDrawNumber(19*FW, 0, EeFsGetFree(), RIGHT);
|
||||
lcdDrawText(19*FW + 3, 0, STR_BYTES);
|
||||
lcdDrawText(lcdLastRightPos + 3, 0, STR_FREE);
|
||||
#endif
|
||||
|
||||
extern uint8_t menuSize(const MenuHandler*, uint8_t);
|
||||
drawScreenIndex(MENU_MODEL_SELECT, menuSize(menuTabModel, DIM(menuTabModel)), 0);
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
|
||||
@@ -279,9 +268,6 @@ void menuModelSelect(event_t event)
|
||||
|
||||
if (modelExists(k)) {
|
||||
drawModelName(4*FW, y, modelHeaders[k].name, k, 0);
|
||||
#if defined(EEPROM)
|
||||
lcdDrawNumber(20*FW, y, eeModelSize(k), RIGHT);
|
||||
#endif
|
||||
if (k==g_eeGeneral.currModel && (s_copyMode!=COPY_MODE || s_copySrcRow<0 || i+menuVerticalOffset!=(vertpos_t)sub))
|
||||
lcdDrawChar(1, y, '*');
|
||||
}
|
||||
|
||||
@@ -304,7 +304,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
|
||||
}
|
||||
#endif
|
||||
#if defined(SDCARD)
|
||||
else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT) {
|
||||
coord_t x = MODEL_SPECIAL_FUNC_3RD_COLUMN;
|
||||
if (ZEXIST(cfn->play.name))
|
||||
@@ -338,7 +337,6 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
INCDEC_ENABLE_CHECK(functionsContext == &globalFunctionsContext ? isSourceAvailableInGlobalFunctions : isSourceAvailable);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
else if (func == FUNC_VOLUME) {
|
||||
val_max = MIXSRC_LAST_CH;
|
||||
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
|
||||
|
||||
@@ -203,7 +203,6 @@ int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(SDCARD)
|
||||
char statusLineMsg[STATUS_LINE_LENGTH];
|
||||
tmr10ms_t statusLineTime = 0;
|
||||
uint8_t statusLineHeight = 0;
|
||||
@@ -232,4 +231,3 @@ void drawStatusLine()
|
||||
lcdDrawFilledRect(0, LCD_H-statusLineHeight, LCD_W, FH, SOLID);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -425,11 +425,7 @@ static void replaceSpaceWithUnderscore(std::string& name)
|
||||
} while (index != std::string::npos);
|
||||
}
|
||||
|
||||
#if defined(SDCARD_YAML)
|
||||
#define MODEL_FILE_EXT YAML_EXT
|
||||
#else
|
||||
#define MODEL_FILE_EXT MODELS_EXT
|
||||
#endif
|
||||
|
||||
static bool checkNotesFile(std::string modelNotesName)
|
||||
{
|
||||
@@ -449,7 +445,6 @@ static std::string getModelNotesFile()
|
||||
if (checkNotesFile(modelNotesName))
|
||||
return modelNotesName;
|
||||
|
||||
#if !defined(EEPROM)
|
||||
modelNotesName.assign(g_eeGeneral.currModelFilename);
|
||||
size_t index = modelNotesName.find(MODEL_FILE_EXT);
|
||||
if (index != std::string::npos) {
|
||||
@@ -461,7 +456,6 @@ static std::string getModelNotesFile()
|
||||
replaceSpaceWithUnderscore(modelNotesName);
|
||||
if (checkNotesFile(modelNotesName))
|
||||
return modelNotesName;
|
||||
#endif
|
||||
|
||||
return std::string("");
|
||||
}
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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)];
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -153,7 +153,7 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
|
||||
case EVT_KEY_LONG(KEY_MODEL):
|
||||
if (menuTab == menuTabModel) {
|
||||
if (modelHasNotes()) {
|
||||
POPUP_MENU_ADD_SD_ITEM(STR_VIEW_CHANNELS);
|
||||
POPUP_MENU_ADD_ITEM(STR_VIEW_CHANNELS);
|
||||
POPUP_MENU_ADD_ITEM(STR_VIEW_NOTES);
|
||||
POPUP_MENU_START(onLongMenuPress);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user