diff --git a/radio/src/gui/128x64/model_module_options.cpp b/radio/src/gui/128x64/model_module_options.cpp index 0191f092c..48ad2e296 100644 --- a/radio/src/gui/128x64/model_module_options.cpp +++ b/radio/src/gui/128x64/model_module_options.cpp @@ -210,6 +210,6 @@ void menuModelModuleOptions(event_t event) } } else { - lcdDrawText(4 * FW, 4 * FH, "Waiting for TX..."); + lcdDrawCenteredText(LCD_H/2, "Waiting for TX..."); } } diff --git a/radio/src/gui/128x64/model_receiver_options.cpp b/radio/src/gui/128x64/model_receiver_options.cpp index b1eae6f10..212695328 100644 --- a/radio/src/gui/128x64/model_receiver_options.cpp +++ b/radio/src/gui/128x64/model_receiver_options.cpp @@ -151,6 +151,6 @@ void menuModelReceiverOptions(event_t event) } } else { - lcdDrawText(4 * FW, 4 * FH, "Waiting for RX..."); + lcdDrawCenteredText(LCD_H/2, "Waiting for RX..."); } } diff --git a/radio/src/gui/128x64/radio_trainer.cpp b/radio/src/gui/128x64/radio_trainer.cpp index a4644f682..63d295335 100644 --- a/radio/src/gui/128x64/radio_trainer.cpp +++ b/radio/src/gui/128x64/radio_trainer.cpp @@ -28,7 +28,7 @@ void menuRadioTrainer(event_t event) MENU(STR_MENUTRAINER, menuTabGeneral, MENU_RADIO_TRAINER, (slave ? HEADER_LINE : HEADER_LINE+6), { HEADER_LINE_COLUMNS 2, 2, 2, 2, 0/*, 0*/ }); if (slave) { - lcdDrawText(7*FW, 4*FH, STR_SLAVE); + lcdDrawCenteredText(LCD_H/2, STR_SLAVE); } else { uint8_t attr; diff --git a/radio/src/gui/common/stdlcd/radio_power_meter.cpp b/radio/src/gui/common/stdlcd/radio_power_meter.cpp index 78dd2df78..8398fb00d 100644 --- a/radio/src/gui/common/stdlcd/radio_power_meter.cpp +++ b/radio/src/gui/common/stdlcd/radio_power_meter.cpp @@ -24,6 +24,8 @@ extern uint8_t g_moduleIdx; void menuRadioPowerMeter(event_t event) { + SIMPLE_SUBMENU("POWER METER", 1); + if (TELEMETRY_STREAMING()) { lcdDrawCenteredText(LCD_H/2, "Turn off receiver"); if (event == EVT_KEY_FIRST(KEY_EXIT)) { @@ -33,11 +35,8 @@ void menuRadioPowerMeter(event_t event) return; } - SIMPLE_SUBMENU("POWER METER", 1); - if (menuEvent) { - const char * message = "Stopping..."; - lcdDrawText(LCD_W / 2 - getTextWidth(message) / 2, 4*FH, message); + lcdDrawCenteredText(LCD_H/2, "Stopping..."); lcdRefresh(); pausePulses(); moduleSettings[g_moduleIdx].mode = MODULE_MODE_NORMAL; diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index ef652d316..c430e6be0 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -435,6 +435,6 @@ void menuRadioSdManager(event_t _event) #endif } else { - lcdDrawText(6*FW+3, 4*FH, STR_NO_SDCARD); + lcdDrawCenteredText(LCD_H/2, STR_NO_SDCARD); } } diff --git a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp index c3575ebe0..97e8e74c2 100644 --- a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp +++ b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp @@ -30,8 +30,10 @@ enum SpektrumFields { void menuRadioSpectrumAnalyser(event_t event) { + SUBMENU("SPECTRUM ANALYSER", 1, {1}); + if (TELEMETRY_STREAMING()) { - lcdDrawCenteredText(15, "Turn off receiver"); + lcdDrawCenteredText(LCD_H/2, "Turn off receiver"); if (event == EVT_KEY_FIRST(KEY_EXIT)) { killEvents(event); popMenu(); @@ -39,11 +41,8 @@ void menuRadioSpectrumAnalyser(event_t event) return; } - SUBMENU("SPECTRUM ANALYSER", 1, {1}); - if (menuEvent) { - const char * message = "Stopping..."; - lcdDrawText(LCD_W / 2 - getTextWidth(message) / 2, 4*FH, message); + lcdDrawCenteredText(LCD_H/2, "Stopping..."); lcdRefresh(); pausePulses(); moduleSettings[g_moduleIdx].mode = MODULE_MODE_NORMAL;