piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(bw): remove unused READ_ONLY and READ_ONLY_UNLOCKED macros (#5156)

Browse Source
This commit is contained in:
philmoz
2024-06-12 09:54:59 +10:00
committed by GitHub
parent 0c742e2863
commit 1bc114d99f
27 changed files with 156 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_custom_scripts.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ void menuModelCustomScriptOne(event_t event)
lcdDrawSizedText(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.file, sizeof(sd.file), attr);
else
lcdDrawTextAtIndex(SCRIPT_ONE_2ND_COLUMN_POS, y, STR_VCSWFUNC, 0, attr);
if (attr && event==EVT_KEY_BREAK(KEY_ENTER) && !READ_ONLY()) {
if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
if (sdListFiles(SCRIPTS_MIXES_PATH, SCRIPTS_EXT, sizeof(sd.file), sd.file, LIST_NONE_SD_FILE)) {
POPUP_MENU_START(onModelCustomScriptMenu);
radio/src/gui/128x64/model_display.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ void menuModelDisplay(event_t event)
else
lcdDrawTextAtIndex(DISPLAY_COL2+7*FW, y, STR_VCSWFUNC, 0, (menuHorizontalPosition==1 ? attr : 0));
if (menuHorizontalPosition==1 && attr && event==EVT_KEY_BREAK(KEY_ENTER) && READ_ONLY_UNLOCKED()) {
if (menuHorizontalPosition==1 && attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
if (sdListFiles(SCRIPTS_TELEM_PATH, SCRIPTS_EXT, sizeof(g_model.screens[screenIndex].script.file), g_model.screens[screenIndex].script.file)) {
POPUP_MENU_START(onTelemetryScriptFileSelectionMenu);
radio/src/gui/128x64/model_failsafe.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ void menuModelFailsafe(event_t event)
if (g_eeGeneral.ppmunit == PPM_PERCENT_PREC1)
wbar -= 6;
if (sub == k && !READ_ONLY() && event == EVT_KEY_LONG(KEY_ENTER)) {
if (sub == k && event == EVT_KEY_LONG(KEY_ENTER)) {
POPUP_MENU_START(onFailsafeMenu, 4, STR_NONE, STR_HOLD, STR_CHANNEL2FAILSAFE, STR_CHANNELS2FAILSAFE);
}
radio/src/gui/128x64/model_outputs.cpp
+1 -1
View File
@@ -234,7 +234,7 @@ void menuModelLimits(event_t event)
if (sub == k &&
((event == EVT_KEY_BREAK(KEY_ENTER)) ||
(event == EVT_KEY_LONG(KEY_ENTER))) &&
!READ_ONLY() && (k != MAX_OUTPUT_CHANNELS)) {
(k != MAX_OUTPUT_CHANNELS)) {
s_editMode = 0;
POPUP_MENU_START(onLimitsMenu, 5, STR_EDIT, STR_RESET,
STR_COPY_TRIMS_TO_OFS, STR_COPY_STICKS_TO_OFS,
radio/src/gui/128x64/model_select.cpp
+1 -6
View File
@@ -167,12 +167,7 @@ void menuModelSelect(event_t event)
case EVT_KEY_LONG(KEY_ENTER):
case EVT_KEY_BREAK(KEY_ENTER):
s_editMode = 0;
if (READ_ONLY()) {
if (g_eeGeneral.currModel != sub && modelExists(sub)) {
selectModel(sub);
}
}
else if (s_copyMode && (s_copyTgtOfs || s_copySrcRow>=0)) {
if (s_copyMode && (s_copyTgtOfs || s_copySrcRow>=0)) {
showMessageBox(s_copyMode==COPY_MODE ? STR_COPYINGMODEL : STR_MOVINGMODEL);
storageCheck(true); // force writing of current model data before this is changed
radio/src/gui/128x64/model_setup.cpp
+25 -29
View File
@@ -1073,29 +1073,27 @@ void menuModelSetup(event_t event)
if (attr) {
#endif
s_editMode = 0;
if (!READ_ONLY()) {
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
break;
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
break;
case EVT_KEY_LONG(KEY_ENTER):
if (menuHorizontalPosition < 0 ||
menuHorizontalPosition >= switchWarningsCount) {
START_NO_HIGHLIGHT();
getMovedSwitch();
// Mask switches enabled for warnings
swarnstate_t sw_mask = 0;
for(uint8_t i = 0; i < switchGetMaxSwitches(); i++) {
if (SWITCH_WARNING_ALLOWED(i))
if (g_model.switchWarning & (0x07 << (3 * i)))
sw_mask |= (0x07 << (3 * i));
}
g_model.switchWarning = switches_states & sw_mask;
AUDIO_WARNING1();
storageDirty(EE_MODEL);
case EVT_KEY_LONG(KEY_ENTER):
if (menuHorizontalPosition < 0 ||
menuHorizontalPosition >= switchWarningsCount) {
START_NO_HIGHLIGHT();
getMovedSwitch();
// Mask switches enabled for warnings
swarnstate_t sw_mask = 0;
for(uint8_t i = 0; i < switchGetMaxSwitches(); i++) {
if (SWITCH_WARNING_ALLOWED(i))
if (g_model.switchWarning & (0x07 << (3 * i)))
sw_mask |= (0x07 << (3 * i));
}
break;
}
g_model.switchWarning = switches_states & sw_mask;
AUDIO_WARNING1();
storageDirty(EE_MODEL);
}
break;
}
}
@@ -1103,7 +1101,7 @@ void menuModelSetup(event_t event)
for (int i = 0; i < switchGetMaxSwitches(); i++) {
if (SWITCH_WARNING_ALLOWED(i)) {
div_t qr = div(current, MAX_SWITCH_PER_LINE);
if (!READ_ONLY() && event == EVT_KEY_BREAK(KEY_ENTER) && attr &&
if (event == EVT_KEY_BREAK(KEY_ENTER) && attr &&
l_posHorz == current && old_posHorz >= 0) {
uint8_t curr_state = (states & 0x07);
// remove old setting
@@ -1145,7 +1143,7 @@ void menuModelSetup(event_t event)
if (attr) {
if (menuHorizontalPosition > 0) s_editMode = 0;
if (!READ_ONLY() && menuHorizontalPosition > 0) {
if (menuHorizontalPosition > 0) {
switch (event) {
case EVT_KEY_LONG(KEY_ENTER):
if (g_model.potsWarnMode == POTS_WARN_MANUAL) {
@@ -1203,11 +1201,9 @@ void menuModelSetup(event_t event)
}
if (attr) {
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
if (READ_ONLY_UNLOCKED()) {
s_editMode = 0;
g_model.beepANACenter ^= ((BeepANACenter)1<<menuHorizontalPosition);
storageDirty(EE_MODEL);
}
s_editMode = 0;
g_model.beepANACenter ^= ((BeepANACenter)1<<menuHorizontalPosition);
storageDirty(EE_MODEL);
}
}
} break;
@@ -2379,7 +2375,7 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_SETUP_USBJOYSTICK_APPLY:
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_APPLY_CHANGES), attr);
if (attr && !READ_ONLY() && event == EVT_KEY_BREAK(KEY_ENTER)) {
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
onUSBJoystickModelChanged();
}
break;
radio/src/gui/128x64/model_special_functions.cpp
+2 -2
View File
@@ -156,9 +156,9 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
#if defined(PCBTARANIS)
#if defined(PCBXLITE)
// ENT LONG on xlite brings up switch type menu, so this menu is activated with SHIFT + ENT LONG
if (menuHorizontalPosition==0 && event==EVT_KEY_LONG(KEY_ENTER) && keysGetState(KEY_SHIFT) && !READ_ONLY()) {
if (menuHorizontalPosition==0 && event==EVT_KEY_LONG(KEY_ENTER) && keysGetState(KEY_SHIFT)) {
#else
if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER)) {
#endif
CustomFunctionData *cfn = &functions[sub];
if (!CFN_EMPTY(cfn))
radio/src/gui/128x64/radio_calibration.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ void menuRadioCalibration(event_t event)
{
check_submenu_simple(event, 0);
title(STR_MENUCALIBRATION);
menuCommonCalib(READ_ONLY() ? 0 : event);
menuCommonCalib(event);
if (menuEvent) {
menuCalibrationState = CALIB_START;
}
radio/src/gui/212x64/model_custom_scripts.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ void menuModelCustomScriptOne(event_t event)
lcdDrawSizedText(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.file, sizeof(sd.file), attr);
else
lcdDrawTextAtIndex(SCRIPT_ONE_2ND_COLUMN_POS, y, STR_VCSWFUNC, 0, attr);
if (attr && event==EVT_KEY_BREAK(KEY_ENTER) && !READ_ONLY()) {
if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
if (sdListFiles(SCRIPTS_MIXES_PATH, SCRIPTS_EXT, sizeof(sd.file), sd.file, LIST_NONE_SD_FILE)) {
POPUP_MENU_START(onModelCustomScriptMenu);
radio/src/gui/212x64/model_display.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ void menuModelDisplay(event_t event)
else
lcdDrawTextAtIndex(DISPLAY_COL2+7*FW, y, STR_VCSWFUNC, 0, (menuHorizontalPosition==1 ? attr : 0));
if (menuHorizontalPosition==1 && attr && event==EVT_KEY_BREAK(KEY_ENTER) && READ_ONLY_UNLOCKED()) {
if (menuHorizontalPosition==1 && attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
if (sdListFiles(SCRIPTS_TELEM_PATH, SCRIPTS_EXT, sizeof(g_model.screens[screenIndex].script.file), g_model.screens[screenIndex].script.file)) {
POPUP_MENU_START(onTelemetryScriptFileSelectionMenu);
radio/src/gui/212x64/model_logical_switches.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ void menuModelLogicalSwitches(event_t event)
horzpos_t horz = menuHorizontalPosition;
bool showHeader = true;
if (horz<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
if (horz<0 && event==EVT_KEY_LONG(KEY_ENTER)) {
LogicalSwitchData * cs = lswAddress(sub);
if (cs->func)
POPUP_MENU_ADD_ITEM(STR_COPY);
radio/src/gui/212x64/model_outputs.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ void menuModelLimits(event_t event)
int limit = (g_model.extendedLimits ? LIMIT_EXT_MAX : 1000);
putsChn(0, y, k+1, (sub==k && menuHorizontalPosition < 0) ? INVERS : 0);
if (sub==k && menuHorizontalPosition < 0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
if (sub==k && menuHorizontalPosition < 0 && event==EVT_KEY_LONG(KEY_ENTER)) {
POPUP_MENU_START(onLimitsMenu, 4, STR_RESET, STR_COPY_TRIMS_TO_OFS, STR_COPY_STICKS_TO_OFS, STR_COPY_MIN_MAX_TO_OUTPUTS);
}
radio/src/gui/212x64/model_select.cpp
+1 -6
View File
@@ -163,12 +163,7 @@ void menuModelSelect(event_t event)
case EVT_KEY_LONG(KEY_ENTER):
case EVT_KEY_BREAK(KEY_ENTER):
s_editMode = 0;
if (READ_ONLY()) {
if (g_eeGeneral.currModel != sub && modelExists(sub)) {
selectModel(sub);
}
}
else if (s_copyMode && (s_copyTgtOfs || s_copySrcRow>=0)) {
if (s_copyMode && (s_copyTgtOfs || s_copySrcRow>=0)) {
showMessageBox(s_copyMode==COPY_MODE ? STR_COPYINGMODEL : STR_MOVINGMODEL);
storageCheck(true); // force writing of current model data before this is changed
radio/src/gui/212x64/model_setup.cpp
+25 -29
View File
@@ -644,7 +644,7 @@ void menuModelSetup(event_t event)
lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.header.bitmap, LEN_BITMAP_NAME, attr);
else
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VCSWFUNC, 0, attr);
if (attr && event==EVT_KEY_BREAK(KEY_ENTER) && READ_ONLY_UNLOCKED()) {
if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
if (sdListFiles(BITMAPS_PATH, BITMAPS_EXT, LEN_BITMAP_NAME, g_model.header.bitmap, LIST_NONE_SD_FILE)) {
POPUP_MENU_START(onModelSetupBitmapMenu);
@@ -876,28 +876,26 @@ void menuModelSetup(event_t event)
if (attr) {
s_editMode = 0;
if (!READ_ONLY()) {
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
break;
switch (event) {
case EVT_KEY_BREAK(KEY_ENTER):
break;
case EVT_KEY_LONG(KEY_ENTER):
if (menuHorizontalPosition < 0) {
START_NO_HIGHLIGHT();
getMovedSwitch();
// Mask switches enabled for warnings
swarnstate_t sw_mask = 0;
for(uint8_t i = 0; i < switchGetMaxSwitches(); i++) {
if (SWITCH_WARNING_ALLOWED(i))
if (g_model.switchWarning & (0x07 << (3 * i)))
sw_mask |= (0x07 << (3 * i));
}
g_model.switchWarning = switches_states & sw_mask;
AUDIO_WARNING1();
storageDirty(EE_MODEL);
case EVT_KEY_LONG(KEY_ENTER):
if (menuHorizontalPosition < 0) {
START_NO_HIGHLIGHT();
getMovedSwitch();
// Mask switches enabled for warnings
swarnstate_t sw_mask = 0;
for(uint8_t i = 0; i < switchGetMaxSwitches(); i++) {
if (SWITCH_WARNING_ALLOWED(i))
if (g_model.switchWarning & (0x07 << (3 * i)))
sw_mask |= (0x07 << (3 * i));
}
break;
}
g_model.switchWarning = switches_states & sw_mask;
AUDIO_WARNING1();
storageDirty(EE_MODEL);
}
break;
}
}
@@ -907,7 +905,7 @@ void menuModelSetup(event_t event)
for (int i = 0; i < switchGetMaxSwitches(); i++) {
if (SWITCH_WARNING_ALLOWED(i)) {
div_t qr = div(current, 8);
if (!READ_ONLY() && event == EVT_KEY_BREAK(KEY_ENTER) && line &&
if (event == EVT_KEY_BREAK(KEY_ENTER) && line &&
l_posHorz == current) {
uint8_t curr_state = (states & 0x07);
// remove old setting
@@ -957,7 +955,7 @@ void menuModelSetup(event_t event)
if (attr) {
if (menuHorizontalPosition > 0) s_editMode = 0;
if (!READ_ONLY() && menuHorizontalPosition > 0) {
if (menuHorizontalPosition > 0) {
switch (event) {
case EVT_KEY_LONG(KEY_ENTER):
if (g_model.potsWarnMode == POTS_WARN_MANUAL) {
@@ -1033,11 +1031,9 @@ void menuModelSetup(event_t event)
}
if (attr && CURSOR_ON_CELL) {
if (event==EVT_KEY_BREAK(KEY_ENTER)) {
if (READ_ONLY_UNLOCKED()) {
s_editMode = 0;
g_model.beepANACenter ^= ((BeepANACenter)1<<menuHorizontalPosition);
storageDirty(EE_MODEL);
}
s_editMode = 0;
g_model.beepANACenter ^= ((BeepANACenter)1<<menuHorizontalPosition);
storageDirty(EE_MODEL);
}
}
break;
@@ -2024,7 +2020,7 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_SETUP_USBJOYSTICK_APPLY:
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_APPLY_CHANGES), attr);
if (attr && !READ_ONLY() && event == EVT_KEY_BREAK(KEY_ENTER)) {
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
onUSBJoystickModelChanged();
}
break;
radio/src/gui/212x64/model_special_functions.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
{
int sub = menuVerticalPosition;
uint8_t eeFlags = (functions == g_model.customFn) ? EE_MODEL : EE_GENERAL;
if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
if (menuHorizontalPosition<0 && event==EVT_KEY_LONG(KEY_ENTER)) {
CustomFunctionData *cfn = &functions[sub];
if (!CFN_EMPTY(cfn))
POPUP_MENU_ADD_ITEM(STR_COPY);
radio/src/gui/212x64/radio_calibration.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ void menuRadioCalibration(event_t event)
{
check_submenu_simple(event, 0);
title(STR_MENUCALIBRATION);
menuCommonCalib(READ_ONLY() ? 0 : event);
menuCommonCalib(event);
drawPotsBars();
if (menuEvent) {
menuCalibrationState = CALIB_START;
radio/src/gui/colorlcd/radio_sdmanager.cpp
+45 -47
View File
@@ -271,7 +271,7 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name,
});
}
#if defined(MULTIMODULE) && !defined(DISABLE_MULTI_UPDATE)
if (!READ_ONLY() && !strcasecmp(ext, MULTI_FIRMWARE_EXT)) {
if (!strcasecmp(ext, MULTI_FIRMWARE_EXT)) {
MultiFirmwareInformation information;
if (information.readMultiFirmwareInformation(fullpath) == nullptr) {
#if defined(INTERNAL_MODULE_MULTI)
@@ -287,7 +287,7 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name,
}
}
#endif
else if (!READ_ONLY() && !strcasecmp(ext, ELRS_FIRMWARE_EXT)) {
else if (!strcasecmp(ext, ELRS_FIRMWARE_EXT)) {
menu->addLine(STR_FLASH_EXTERNAL_ELRS, [=]() {
MultiFirmwareUpdate(fullpath, EXTERNAL_MODULE, MULTI_TYPE_ELRS);
});
@@ -318,12 +318,12 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name,
}
});
}
if (!READ_ONLY() && !strcasecmp(ext, FIRMWARE_EXT)) {
if (!strcasecmp(ext, FIRMWARE_EXT)) {
if (isBootloader(fullpath)) {
menu->addLine(STR_FLASH_BOOTLOADER,
[=]() { BootloaderUpdate(fullpath); });
}
} else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
} else if (!strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
auto mod_desc = modulePortGetModuleDescription(SPORT_MODULE);
if (mod_desc && mod_desc->set_pwr) {
@@ -334,7 +334,7 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name,
[=]() { FrSkyFirmwareUpdate(fullpath, INTERNAL_MODULE); });
menu->addLine(STR_FLASH_EXTERNAL_MODULE,
[=]() { FrSkyFirmwareUpdate(fullpath, EXTERNAL_MODULE); });
} else if (!READ_ONLY() && !strcasecmp(ext, FRSKY_FIRMWARE_EXT)) {
} else if (!strcasecmp(ext, FRSKY_FIRMWARE_EXT)) {
FrSkyFirmwareInformation information;
if (readFrSkyFirmwareInformation(fullpath, information) ==
nullptr) {
@@ -422,57 +422,55 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name,
}
#endif
}
if (!READ_ONLY()) {
menu->addLine(STR_COPY_FILE, [=]() {
clipboard.type = CLIPBOARD_TYPE_SD_FILE;
f_getcwd(clipboard.data.sd.directory, CLIPBOARD_PATH_LEN);
strncpy(clipboard.data.sd.filename, name, CLIPBOARD_PATH_LEN - 1);
});
if (clipboard.type == CLIPBOARD_TYPE_SD_FILE) {
menu->addLine(STR_PASTE, [=]() {
static char lfn[FF_MAX_LFN + 1]; // TODO optimize that!
char destFileName[2 * CLIPBOARD_PATH_LEN + 1];
f_getcwd((TCHAR*)lfn, FF_MAX_LFN);
// prevent copying to the same directory with the same name
char* destNamePtr = clipboard.data.sd.filename;
if (!strcmp(clipboard.data.sd.directory, lfn)) {
destNamePtr =
strAppend(destFileName, FILE_COPY_PREFIX, CLIPBOARD_PATH_LEN);
destNamePtr = strAppend(destNamePtr, clipboard.data.sd.filename,
CLIPBOARD_PATH_LEN);
destNamePtr = destFileName;
}
sdCopyFile(clipboard.data.sd.filename, clipboard.data.sd.directory,
destNamePtr, lfn);
clipboard.type = CLIPBOARD_TYPE_NONE;
menu->addLine(STR_COPY_FILE, [=]() {
clipboard.type = CLIPBOARD_TYPE_SD_FILE;
f_getcwd(clipboard.data.sd.directory, CLIPBOARD_PATH_LEN);
strncpy(clipboard.data.sd.filename, name, CLIPBOARD_PATH_LEN - 1);
});
if (clipboard.type == CLIPBOARD_TYPE_SD_FILE) {
menu->addLine(STR_PASTE, [=]() {
static char lfn[FF_MAX_LFN + 1]; // TODO optimize that!
char destFileName[2 * CLIPBOARD_PATH_LEN + 1];
f_getcwd((TCHAR*)lfn, FF_MAX_LFN);
// prevent copying to the same directory with the same name
char* destNamePtr = clipboard.data.sd.filename;
if (!strcmp(clipboard.data.sd.directory, lfn)) {
destNamePtr =
strAppend(destFileName, FILE_COPY_PREFIX, CLIPBOARD_PATH_LEN);
destNamePtr = strAppend(destNamePtr, clipboard.data.sd.filename,
CLIPBOARD_PATH_LEN);
destNamePtr = destFileName;
}
sdCopyFile(clipboard.data.sd.filename, clipboard.data.sd.directory,
destNamePtr, lfn);
clipboard.type = CLIPBOARD_TYPE_NONE;
browser->refresh();
});
}
menu->addLine(STR_RENAME_FILE, [=]() {
uint8_t nameLength;
uint8_t extLength;
}
menu->addLine(STR_RENAME_FILE, [=]() {
uint8_t nameLength;
uint8_t extLength;
const char *ext = getFileExtension(name, 0, 0, &nameLength, &extLength);
const char *ext = getFileExtension(name, 0, 0, &nameLength, &extLength);
const uint8_t maxNameLength = SD_SCREEN_FILE_LENGTH - extLength;
nameLength = min((uint8_t)(nameLength - extLength), maxNameLength);
const uint8_t maxNameLength = SD_SCREEN_FILE_LENGTH - extLength;
nameLength = min((uint8_t)(nameLength - extLength), maxNameLength);
std::string fname(name, nameLength);
std::string extension("");
if (ext) extension = ext;
std::string fname(name, nameLength);
std::string extension("");
if (ext) extension = ext;
new LabelDialog(Layer::back(), fname.c_str(), maxNameLength, STR_RENAME_FILE, [=](std::string label) {
label += extension;
f_rename((const TCHAR *)name, (const TCHAR *)label.c_str());
browser->refresh();
});
});
menu->addLine(STR_DELETE_FILE, [=]() {
f_unlink(fullpath);
new LabelDialog(Layer::back(), fname.c_str(), maxNameLength, STR_RENAME_FILE, [=](std::string label) {
label += extension;
f_rename((const TCHAR *)name, (const TCHAR *)label.c_str());
browser->refresh();
});
}
});
menu->addLine(STR_DELETE_FILE, [=]() {
f_unlink(fullpath);
browser->refresh();
});
}
void RadioSdManagerPage::BootloaderUpdate(const char* fn)
radio/src/gui/common/stdlcd/calibration.cpp
+1 -3
View File
@@ -43,9 +43,7 @@ void menuCommonCalib(event_t event)
switch (reusableBuffer.calib.state) {
case CALIB_START:
// START CALIBRATION
if (!READ_ONLY()) {
lcdDrawText(LCD_W/2, MENU_HEADER_HEIGHT+2*FH, STR_MENUTOSTART, CENTERED);
}
lcdDrawText(LCD_W/2, MENU_HEADER_HEIGHT+2*FH, STR_MENUTOSTART, CENTERED);
break;
case CALIB_SET_MIDPOINT:
radio/src/gui/common/stdlcd/model_curves.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ void menuModelCurvesAll(event_t event)
int8_t sub = menuVerticalPosition - HEADER_LINE;
if (event == EVT_KEY_BREAK(KEY_ENTER) &&
CURVE_SELECTED() && !READ_ONLY()) {
CURVE_SELECTED()) {
s_currIdxSubMenu = sub;
s_currSrcRaw = MIXSRC_NONE;
radio/src/gui/common/stdlcd/model_inputs.cpp
+10 -17
View File
@@ -287,7 +287,7 @@ void menuModelExposAll(event_t event)
}
break;
case EVT_KEY_BREAK(KEY_ENTER):
if ((!s_currCh || (s_copyMode && !s_copyTgtOfs)) && !READ_ONLY()) {
if ((!s_currCh || (s_copyMode && !s_copyTgtOfs))) {
s_copyMode = (s_copyMode == COPY_MODE ? MOVE_MODE : COPY_MODE);
s_copySrcIdx = s_currIdx;
s_copySrcCh = chn;
@@ -301,24 +301,17 @@ void menuModelExposAll(event_t event)
s_copyTgtOfs = 0;
}
else {
if (READ_ONLY()) {
if (!s_currCh) {
pushMenu(menuModelExpoOne);
}
if (s_copyMode) s_currCh = 0;
if (s_currCh) {
if (reachExposLimit()) break;
insertExpo(s_currIdx);
pushMenu(menuModelExpoOne);
s_copyMode = 0;
}
else {
if (s_copyMode) s_currCh = 0;
if (s_currCh) {
if (reachExposLimit()) break;
insertExpo(s_currIdx);
pushMenu(menuModelExpoOne);
s_copyMode = 0;
}
else {
event = 0;
s_copyMode = 0;
POPUP_MENU_START(onExposMenu, 6, STR_EDIT, STR_INSERT_BEFORE, STR_INSERT_AFTER, STR_COPY, STR_MOVE, STR_DELETE);
}
event = 0;
s_copyMode = 0;
POPUP_MENU_START(onExposMenu, 6, STR_EDIT, STR_INSERT_BEFORE, STR_INSERT_AFTER, STR_COPY, STR_MOVE, STR_DELETE);
}
}
break;
radio/src/gui/common/stdlcd/model_mixes.cpp
+10 -17
View File
@@ -203,7 +203,7 @@ void menuModelMixAll(event_t event)
}
break;
case EVT_KEY_BREAK(KEY_ENTER):
if ((!s_currCh || (s_copyMode && !s_copyTgtOfs)) && !READ_ONLY()) {
if ((!s_currCh || (s_copyMode && !s_copyTgtOfs))) {
s_copyMode = (s_copyMode == COPY_MODE ? MOVE_MODE : COPY_MODE);
s_copySrcIdx = s_currIdx;
s_copySrcCh = chn;
@@ -218,24 +218,17 @@ void menuModelMixAll(event_t event)
s_copyTgtOfs = 0;
}
else {
if (READ_ONLY()) {
if (!s_currCh) {
pushMenu(menuModelMixOne);
}
if (s_copyMode) s_currCh = 0;
if (s_currCh) {
if (reachMixesLimit()) break;
insertMix(s_currIdx, s_currCh - 1);
pushMenu(menuModelMixOne);
s_copyMode = 0;
}
else {
if (s_copyMode) s_currCh = 0;
if (s_currCh) {
if (reachMixesLimit()) break;
insertMix(s_currIdx, s_currCh - 1);
pushMenu(menuModelMixOne);
s_copyMode = 0;
}
else {
event = 0;
s_copyMode = 0;
POPUP_MENU_START(onMixesMenu, 6, STR_EDIT, STR_INSERT_BEFORE, STR_INSERT_AFTER, STR_COPY, STR_MOVE, STR_DELETE);
}
event = 0;
s_copyMode = 0;
POPUP_MENU_START(onMixesMenu, 6, STR_EDIT, STR_INSERT_BEFORE, STR_INSERT_AFTER, STR_COPY, STR_MOVE, STR_DELETE);
}
}
break;
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
+14 -16
View File
@@ -306,7 +306,7 @@ void menuRadioSdManager(event_t _event)
#if defined(KEYS_GPIO_REG_MENU)
case EVT_KEY_LONG(KEY_MENU):
if (SD_CARD_PRESENT() && !READ_ONLY() && s_editMode == 0) {
if (SD_CARD_PRESENT() && s_editMode == 0) {
POPUP_MENU_ADD_ITEM(STR_SD_INFO);
POPUP_MENU_START(onSdManagerMenu);
}
@@ -360,7 +360,7 @@ void menuRadioSdManager(event_t _event)
}
#if LCD_DEPTH > 1
else if (isExtensionMatching(ext, BITMAPS_EXT)) {
if (!READ_ONLY() && (ext-line) <= LEN_BITMAP_NAME) {
if ((ext-line) <= LEN_BITMAP_NAME) {
POPUP_MENU_ADD_ITEM(STR_ASSIGN_BITMAP);
}
}
@@ -371,7 +371,7 @@ void menuRadioSdManager(event_t _event)
}
#endif
#if defined(MULTIMODULE) && !defined(DISABLE_MULTI_UPDATE)
if (!READ_ONLY() && !strcasecmp(ext, MULTI_FIRMWARE_EXT)) {
if (!strcasecmp(ext, MULTI_FIRMWARE_EXT)) {
MultiFirmwareInformation information;
if (information.readMultiFirmwareInformation(line) == nullptr) {
#if defined(INTERNAL_MODULE_MULTI)
@@ -381,19 +381,19 @@ void menuRadioSdManager(event_t _event)
}
}
if (!READ_ONLY() && !strcasecmp(ext, ELRS_FIRMWARE_EXT)) {
if (!strcasecmp(ext, ELRS_FIRMWARE_EXT)) {
TCHAR lfn[FF_MAX_LFN + 1];
getSelectionFullPath(lfn);
POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_ELRS);
}
#endif
#if defined(PCBTARANIS)
if (!READ_ONLY() && !strcasecmp(ext, FIRMWARE_EXT)) {
if (!strcasecmp(ext, FIRMWARE_EXT)) {
if (isBootloader(lfn)) {
POPUP_MENU_ADD_ITEM(STR_FLASH_BOOTLOADER);
}
}
else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
else if (!strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
auto mod_desc = modulePortGetModuleDescription(SPORT_MODULE);
if (mod_desc && mod_desc->set_pwr)
POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_DEVICE);
@@ -404,7 +404,7 @@ void menuRadioSdManager(event_t _event)
POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_MODULE);
}
else if (!READ_ONLY() && !strcasecmp(ext, FRSKY_FIRMWARE_EXT)) {
else if (!strcasecmp(ext, FRSKY_FIRMWARE_EXT)) {
FrSkyFirmwareInformation information;
if (readFrSkyFirmwareInformation(line, information) == nullptr) {
@@ -448,15 +448,13 @@ void menuRadioSdManager(event_t _event)
POPUP_MENU_ADD_ITEM(STR_VIEW_TEXT);
}
}
if (!READ_ONLY()) {
if (IS_FILE(line))
POPUP_MENU_ADD_ITEM(STR_COPY_FILE);
if (clipboard.type == CLIPBOARD_TYPE_SD_FILE)
POPUP_MENU_ADD_ITEM(STR_PASTE);
POPUP_MENU_ADD_ITEM(STR_RENAME_FILE);
if (IS_FILE(line))
POPUP_MENU_ADD_ITEM(STR_DELETE_FILE);
}
if (IS_FILE(line))
POPUP_MENU_ADD_ITEM(STR_COPY_FILE);
if (clipboard.type == CLIPBOARD_TYPE_SD_FILE)
POPUP_MENU_ADD_ITEM(STR_PASTE);
POPUP_MENU_ADD_ITEM(STR_RENAME_FILE);
if (IS_FILE(line))
POPUP_MENU_ADD_ITEM(STR_DELETE_FILE);
POPUP_MENU_START(onSdManagerMenu);
}
break;
radio/src/gui/navigation/navigation_9x.cpp
+2 -4
View File
@@ -111,7 +111,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
#endif
}
if (!READ_ONLY() && i_min == 0 && i_max == 1 &&
if (i_min == 0 && i_max == 1 &&
(event == EVT_KEY_BREAK(KEY_ENTER))) {
s_editMode = 0;
newval = !val;
@@ -230,9 +230,7 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
case EVT_KEY_BREAK(KEY_ENTER):
if (!menuTab || l_posVert>0) {
if (READ_ONLY_UNLOCKED()) {
s_editMode = (s_editMode <= 0);
}
s_editMode = (s_editMode <= 0);
}
break;
radio/src/gui/navigation/navigation_x7.cpp
+3 -3
View File
@@ -133,7 +133,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
}
if (!READ_ONLY() && i_min == 0 && i_max == 1 &&
if (i_min == 0 && i_max == 1 &&
event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
newval = !val;
@@ -323,11 +323,11 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
case EVT_KEY_BREAK(KEY_ENTER):
if (s_editMode > 1)
break;
if (menuHorizontalPosition < 0 && maxcol > 0 && READ_ONLY_UNLOCKED()) {
if (menuHorizontalPosition < 0 && maxcol > 0) {
l_posHorz = 0;
AUDIO_KEY_PRESS();
}
else if (READ_ONLY_UNLOCKED()) {
else {
s_editMode = (s_editMode<=0);
AUDIO_KEY_PRESS();
}
radio/src/gui/navigation/navigation_x9d.cpp
+3 -3
View File
@@ -133,7 +133,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
}
if (!READ_ONLY() && i_min == 0 && i_max == 1 &&
if (i_min == 0 && i_max == 1 &&
event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
newval = !val;
@@ -383,11 +383,11 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
case EVT_KEY_BREAK(KEY_ENTER):
if (s_editMode > 1)
break;
if (menuHorizontalPosition < 0 && maxcol > 0 && READ_ONLY_UNLOCKED()) {
if (menuHorizontalPosition < 0 && maxcol > 0) {
l_posHorz = 0;
AUDIO_KEY_PRESS();
}
else if (READ_ONLY_UNLOCKED()) {
else {
s_editMode = (s_editMode<=0);
AUDIO_KEY_PRESS();
}
radio/src/gui/navigation/navigation_xlite.cpp
+2 -4
View File
@@ -123,7 +123,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
}
}
if (!READ_ONLY() && i_min == 0 && i_max == 1 &&
if (i_min == 0 && i_max == 1 &&
event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
newval = !val;
@@ -318,9 +318,7 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
case EVT_KEY_FIRST(KEY_ENTER):
if (!menuTab || l_posVert > 0) {
if (READ_ONLY_UNLOCKED()) {
s_editMode = (s_editMode <= 0);
}
s_editMode = (s_editMode <= 0);
}
break;
radio/src/opentx.h
-4
View File
@@ -351,10 +351,6 @@ void flightReset(uint8_t check=true);
#define RESET_THR_TRACE() s_timeCum16ThrP = s_timeCumThr = 0
#endif
// disabled function (not used anywhere)
#define READ_ONLY() false
#define READ_ONLY_UNLOCKED() true
void checkLowEEPROM();
void checkThrottleStick();
void checkSwitches();