diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio_hardware.cpp index 2ed8081e1c5..f5e2c16dea7 100644 --- a/radio/src/gui/colorlcd/radio_hardware.cpp +++ b/radio/src/gui/colorlcd/radio_hardware.cpp @@ -61,6 +61,8 @@ RadioHardwarePage::RadioHardwarePage() : enableVBatBridge(); } +void RadioHardwarePage::checkEvents() { enableVBatBridge(); } + void RadioHardwarePage::cleanup() { disableVBatBridge(); @@ -134,11 +136,11 @@ static SetupLineDef setupLines[] = { GET_SET_INVERTED(g_eeGeneral.disableRtcWarning)); // RTC Batt display - std::string s(STR_VALUE); - s += " "; new DynamicNumber( - parent, {x + ToggleSwitch::TOGGLE_W + PAD_SMALL, y + PAD_SMALL + 1, 0, 0}, [] { return getRTCBatteryVoltage(); }, - COLOR_THEME_PRIMARY1 | PREC2, s.c_str(), "V"); + parent, + {x + ToggleSwitch::TOGGLE_W + PAD_LARGE, y + PAD_SMALL + 1, 0, 0}, + [] { return getRTCBatteryVoltage(); }, COLOR_THEME_PRIMARY1 | PREC2, + "", "V"); } }, { diff --git a/radio/src/gui/colorlcd/radio_hardware.h b/radio/src/gui/colorlcd/radio_hardware.h index 11940ffdd52..24417e48f6d 100644 --- a/radio/src/gui/colorlcd/radio_hardware.h +++ b/radio/src/gui/colorlcd/radio_hardware.h @@ -25,6 +25,8 @@ class RadioHardwarePage : public PageTab { + void checkEvents() override; + public: RadioHardwarePage(); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index c689d635c10..a4a72daaf04 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -624,7 +624,7 @@ static void checkFailsafe() #endif #if defined(GUI) -void checkAll() +void checkAll(bool isBootCheck) { #if defined(EEPROM_RLC) && !defined(SDCARD_RAW) && !defined(SDCARD_YAML) checkLowEEPROM(); @@ -640,9 +640,9 @@ void checkAll() checkSwitches(); checkFailsafe(); - - if (isVBatBridgeEnabled() && !g_eeGeneral.disableRtcWarning) { + if (isBootCheck && !g_eeGeneral.disableRtcWarning) { // only done once at board start + enableVBatBridge(); checkRTCBattery(); } disableVBatBridge(); @@ -1533,7 +1533,7 @@ void edgeTxInit() } else if (!(startOptions & OPENTX_START_NO_CHECKS)) { checkAlarm(); - checkAll(); + checkAll(true); PLAY_MODEL_NAME(); } #endif // defined(GUI) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 2522b2540fa..c2a99a9a58b 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -355,7 +355,7 @@ void checkLowEEPROM(); void checkThrottleStick(); void checkSwitches(); void checkAlarm(); -void checkAll(); +void checkAll(bool isBootCheck = false); void getADC();