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

Fix some b&w target compilation

Browse Source
This commit is contained in:
Raphael Coeffic
2021-11-10 11:07:00 +01:00
parent f8ab3770e4
commit 4b79cdc795
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+3 -3
View File
@@ -1111,7 +1111,7 @@ void menuModelSetup(event_t event)
break;
#endif
#if defined(AFHDS3)
#if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE)
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS_PROTOCOL:
lcdDrawText(INDENT_WIDTH, y, STR_PROTOCOL);
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_AFHDS3_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType, attr);
@@ -1787,7 +1787,7 @@ void menuModelSetup(event_t event)
break;
#endif
#if defined(AFHDS3)
#if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE)
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_RX_FREQ:
lcdDrawText(INDENT_WIDTH, y, STR_AFHDS3_RX_FREQ);
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[EXTERNAL_MODULE].afhds3.rxFreq(), attr | LEFT);
@@ -1831,7 +1831,7 @@ void menuModelSetup(event_t event)
}
#endif
#if defined(AFHDS3)
#if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE)
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS: {
lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS);
radio/src/gui/common/stdlcd/model_notes.cpp
+1 -5
View File
@@ -25,12 +25,8 @@ void menuModelNotes(event_t event)
{
if (event == EVT_ENTRY) {
strcpy(reusableBuffer.viewText.filename, MODELS_PATH "/");
#if defined(EEPROM)
char *buf = strcat_modelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], g_eeGeneral.currModel);
char *buf = strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], 0);
strcpy(buf, TEXT_EXT);
#else
strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)]);
#endif
}
menuTextView(event);
radio/src/gui/common/stdlcd/view_text.cpp
+1 -5
View File
@@ -34,12 +34,8 @@ void readModelNotes()
LED_ERROR_BEGIN();
strcpy(reusableBuffer.viewText.filename, MODELS_PATH "/");
#if defined(EEPROM)
char *buf = strcat_modelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], g_eeGeneral.currModel);
char *buf = strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], 0);
strcpy(buf, TEXT_EXT);
#else
strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)]);
#endif
waitKeysReleased();
event_t event = EVT_ENTRY;