NRF52: disable autoshutdown if powered, add auto-shutdown warning for oled

This commit is contained in:
taco
2026-06-02 00:55:25 +10:00
parent f701b58b4b
commit 3ce1cf404e
2 changed files with 26 additions and 19 deletions
+13 -15
View File
@@ -832,22 +832,20 @@ void UITask::loop() {
if (millis() > next_batt_chck) { if (millis() > next_batt_chck) {
uint16_t milliVolts = getBattMilliVolts(); uint16_t milliVolts = getBattMilliVolts();
if (milliVolts > 0 && milliVolts < AUTO_SHUTDOWN_MILLIVOLTS) { if (milliVolts > 0 && milliVolts < AUTO_SHUTDOWN_MILLIVOLTS) {
if(!board.isExternalPowered()) {
// show low battery shutdown alert if (_display != NULL) {
// we should only do this for eink displays, which will persist after power loss _display->startFrame();
#if defined(THINKNODE_M1) || defined(LILYGO_TECHO) _display->setTextSize(2);
if (_display != NULL) { _display->setColor(DisplayDriver::RED);
_display->startFrame(); _display->drawTextCentered(_display->width() / 2, 20, "Low Battery.");
_display->setTextSize(2); _display->drawTextCentered(_display->width() / 2, 40, "Shutting Down!");
_display->setColor(DisplayDriver::RED); _display->endFrame();
_display->drawTextCentered(_display->width() / 2, 20, "Low Battery."); #if !defined(THINKNODE_M1) && !defined(LILYGO_TECHO) // TODO: refactor eink variants to use EINK_DISPLAY macros to gate this properly
_display->drawTextCentered(_display->width() / 2, 40, "Shutting Down!"); delay(3000);
_display->endFrame(); #endif
}
shutdown();
} }
#endif
shutdown();
} }
next_batt_chck = millis() + 8000; next_batt_chck = millis() + 8000;
} }
+13 -4
View File
@@ -727,14 +727,23 @@ void UITask::loop() {
if (millis() > next_batt_chck) { if (millis() > next_batt_chck) {
_cached_batt_mv = getBattMilliVolts(); _cached_batt_mv = getBattMilliVolts();
if (_cached_batt_mv > 0 && _cached_batt_mv < AUTO_SHUTDOWN_MILLIVOLTS) { if (_cached_batt_mv > 0 && _cached_batt_mv < AUTO_SHUTDOWN_MILLIVOLTS) {
if(!board.isExternalPowered()) {
shutdown(); if (_display != NULL) {
_display->startFrame();
_display->setTextSize(2);
_display->drawTextCentered(_display->width() / 2, 6, "Low battery!");
_display->setTextSize(1);
_display->drawTextCentered(_display->width() / 2, 18, "Shutting down!");
_display->endFrame();
delay(3000); // TODO: refactor eink variants to use EINK_DISPLAY macros to gate this properly
}
shutdown();
}
} }
next_batt_chck = millis() + 8000; next_batt_chck = millis() + 8000;
} }
#else #else
if (_display != NULL && _display->isOn() && millis >= next_batt_chck) { if (_display != NULL && _display->isOn() && millis() >= next_batt_chck) {
_cached_batt_mv = getBattMilliVolts(); _cached_batt_mv = getBattMilliVolts();
next_batt_chck = millis() + 8000; next_batt_chck = millis() + 8000;
} }