From f6c6f87d90980451695b2798c1e4f15a91a840a6 Mon Sep 17 00:00:00 2001 From: Arthur Tazhitdinov Date: Wed, 28 Jan 2026 01:21:28 +0500 Subject: [PATCH] fix: cleanup --- lib/hal/HalGPIO.cpp | 8 ++------ lib/hal/HalGPIO.h | 7 +------ src/main.cpp | 41 ----------------------------------------- 3 files changed, 3 insertions(+), 53 deletions(-) diff --git a/lib/hal/HalGPIO.cpp b/lib/hal/HalGPIO.cpp index e603eccf..89ce13ba 100644 --- a/lib/hal/HalGPIO.cpp +++ b/lib/hal/HalGPIO.cpp @@ -54,14 +54,10 @@ HalGPIO::WakeupReason HalGPIO::getWakeupReason() const { (wakeupCause == ESP_SLEEP_WAKEUP_GPIO && resetReason == ESP_RST_DEEPSLEEP && usbConnected)) { return WakeupReason::PowerButton; } - if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && - resetReason == ESP_RST_UNKNOWN && - usbConnected) { + if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_UNKNOWN && usbConnected) { return WakeupReason::AfterFlash; } - if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && - resetReason == ESP_RST_POWERON && - usbConnected) { + if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON && usbConnected) { return WakeupReason::AfterUSBPower; } return WakeupReason::Other; diff --git a/lib/hal/HalGPIO.h b/lib/hal/HalGPIO.h index 53ef8785..615a8d63 100644 --- a/lib/hal/HalGPIO.h +++ b/lib/hal/HalGPIO.h @@ -47,12 +47,7 @@ class HalGPIO { // Check if USB is connected bool isUsbConnected() const; - enum class WakeupReason { - PowerButton, - AfterFlash, - AfterUSBPower, - Other - }; + enum class WakeupReason { PowerButton, AfterFlash, AfterUSBPower, Other }; WakeupReason getWakeupReason() const; diff --git a/src/main.cpp b/src/main.cpp index e1d7a6c0..5d11b04b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -316,47 +316,6 @@ void setup() { Serial.printf("[%lu] [ ] Starting CrossPoint version " CROSSPOINT_VERSION "\n", millis()); setupDisplayAndFonts(); - - // log reset reason and wakeup cause - // log enum names as strings for easier reading in logs - // Convert enum values to readable strings for logs - auto resetReasonStr = [resetReason]() { - switch (resetReason) { - case ESP_RST_UNKNOWN: return "UNKNOWN"; - case ESP_RST_POWERON: return "POWERON"; - case ESP_RST_EXT: return "EXT"; - case ESP_RST_SW: return "SW"; - case ESP_RST_PANIC: return "PANIC"; - case ESP_RST_INT_WDT: return "INT_WDT"; - case ESP_RST_TASK_WDT:return "TASK_WDT"; - case ESP_RST_WDT: return "WDT"; - case ESP_RST_DEEPSLEEP: return "DEEPSLEEP"; - case ESP_RST_BROWNOUT: return "BROWNOUT"; - case ESP_RST_SDIO: return "SDIO"; - default: return "OTHER"; - } - }(); - - auto wakeupCauseStr = [wakeupCause]() { - switch (wakeupCause) { - case ESP_SLEEP_WAKEUP_UNDEFINED: return "UNDEFINED"; - case ESP_SLEEP_WAKEUP_EXT0: return "EXT0"; - case ESP_SLEEP_WAKEUP_EXT1: return "EXT1"; - case ESP_SLEEP_WAKEUP_TIMER: return "TIMER"; - case ESP_SLEEP_WAKEUP_TOUCHPAD: return "TOUCHPAD"; - case ESP_SLEEP_WAKEUP_ULP: return "ULP"; - case ESP_SLEEP_WAKEUP_GPIO: return "GPIO"; - case ESP_SLEEP_WAKEUP_UART: return "UART"; - default: return "OTHER"; - } - }(); - - const std::string resetInfo = - std::string("Reset: ") + resetReasonStr + " Wakeup: " + wakeupCauseStr + " USB: " + (usbConnected ? "Yes" : "No"); - enterNewActivity( - new FullScreenMessageActivity(renderer, mappedInputManager, resetInfo, EpdFontFamily::REGULAR)); - delay(10000); - exitActivity(); enterNewActivity(new BootActivity(renderer, mappedInputManager));