jiang/xiaozhi-esp32
1
0
Fork 0
mirror of https://github.com/78/xiaozhi-esp32.git synced 2026-06-30 01:34:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp32-s3-touch-amoled-1.8): keep PowerSaveTimer ticking while charging

Browse Source 
The previous patch disabled PowerSaveTimer entirely on the charger,
which also disabled the screen dim and sleep emoji that fire from
OnEnterSleepMode after 60s of idle. Since this board constructs the
timer with cpu_max_freq=-1, it never enters CPU light sleep nor
disables wake word detection in OnEnterSleepMode anyway — the only
charger-incompatible action is the 5-minute pmic_->PowerOff() in
OnShutdownRequest.

Keep the timer running unconditionally and gate just the shutdown
callback on last_discharging_. Also call WakeUp() on the
charging→battery transition so an unplug after 5+ idle minutes
doesn't trigger an immediate power-off.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Aleksei Savin
2026-05-08 11:11:16 +03:00
parent d8c5c93398
commit d7a9b619eb
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/boards/waveshare/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc
View File

@@ -138,12 +138,14 @@ private:
GetBacklight()->RestoreBrightness();
});
power_save_timer_->OnShutdownRequest([this]() {
// Block auto power-off while plugged into the charger so the device
// stays "always-on" for wake word detection. Display dim and the
// sleep emoji from OnEnterSleepMode still kick in after 60s as usual.
if (last_discharging_ == 0) {
return;
}
pmic_->PowerOff();
});
// pmic_ is initialized later (InitializeAxp2101 runs after this), so we
// can't read charging state here. Default to enabled and let the first
// GetBatteryLevel() tick reconcile the always-on state.
power_save_timer_->SetEnabled(true);
}
@@ -338,11 +340,13 @@ public:
discharging = pmic_->IsDischarging();
int discharging_state = discharging ? 1 : 0;
if (discharging_state != last_discharging_) {
power_save_timer_->SetEnabled(discharging);
if (discharging) {
ESP_LOGI(TAG, "Always-on disabled (battery)");
ESP_LOGI(TAG, "Always-on disabled (battery, auto power-off armed)");
// Reset the timer so we don't shut down immediately if the
// charger is unplugged after the device has been idle a while.
power_save_timer_->WakeUp();
} else {
ESP_LOGI(TAG, "Always-on enabled (charging)");
ESP_LOGI(TAG, "Always-on enabled (charging, auto power-off blocked)");
}
last_discharging_ = discharging_state;
}