eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One more safety net

Browse Source
This commit is contained in:
jpirnay
2026-04-20 17:42:27 +02:00
parent 9f95567212
commit 5b31d49036
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/hal/HalGPIO.cpp
+5 -4
View File
@@ -339,17 +339,18 @@ HalGPIO::WakeupReason HalGPIO::getWakeupReason() const {
const auto wakeupCause = esp_sleep_get_wakeup_cause(); const auto wakeupCause = esp_sleep_get_wakeup_cause();
const auto resetReason = esp_reset_reason(); const auto resetReason = esp_reset_reason();
const bool usbConnected = isUsbConnected();
LOG_DBG("GPIO", "getWakeupReason: wakeupCause=%d, resetReason=%d, usbConnected=%d", static_cast<int>(wakeupCause),
static_cast<int>(resetReason), usbConnected);
// X3: USB alone cannot cold-boot the MCU — the battery-latch MOSFET must be // X3: USB alone cannot cold-boot the MCU — the battery-latch MOSFET must be
// closed by a physical power-button press. So any POWERON reset on X3 is a // closed by a physical power-button press. So any POWERON reset on X3 is a
// button press, regardless of whether USB happens to be plugged in as well. // button press, regardless of whether USB happens to be plugged in as well.
// Short-circuit before isUsbConnected() to skip the BQ27220 I2C probe/retry.
if (deviceIsX3() && wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON) { if (deviceIsX3() && wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON) {
return WakeupReason::PowerButton; return WakeupReason::PowerButton;
} }
const bool usbConnected = isUsbConnected();
LOG_DBG("GPIO", "getWakeupReason: wakeupCause=%d, resetReason=%d, usbConnected=%d", static_cast<int>(wakeupCause),
static_cast<int>(resetReason), usbConnected);
if ((wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON && !usbConnected) || if ((wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON && !usbConnected) ||
(wakeupCause == ESP_SLEEP_WAKEUP_GPIO && resetReason == ESP_RST_DEEPSLEEP && usbConnected)) { (wakeupCause == ESP_SLEEP_WAKEUP_GPIO && resetReason == ESP_RST_DEEPSLEEP && usbConnected)) {
return WakeupReason::PowerButton; return WakeupReason::PowerButton;