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/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;