diff --git a/esp32/lib/ESP32-sveltekit/SystemStatus.cpp b/esp32/lib/ESP32-sveltekit/SystemStatus.cpp index 66b66e0..b559833 100644 --- a/esp32/lib/ESP32-sveltekit/SystemStatus.cpp +++ b/esp32/lib/ESP32-sveltekit/SystemStatus.cpp @@ -14,78 +14,39 @@ #include -String verbosePrintResetReason(int reason) -{ - switch (reason) - { - case 1: - return ("Vbat power on reset"); - break; - case 3: - return ("Software reset digital core"); - break; - case 4: - return ("Legacy watch dog reset digital core"); - break; - case 5: - return ("Deep Sleep reset digital core"); - break; - case 6: - return ("Reset by SLC module, reset digital core"); - break; - case 7: - return ("Timer Group0 Watch dog reset digital core"); - break; - case 8: - return ("Timer Group1 Watch dog reset digital core"); - break; - case 9: - return ("RTC Watch dog Reset digital core"); - break; - case 10: - return ("Intrusion tested to reset CPU"); - break; - case 11: - return ("Time Group reset CPU"); - break; - case 12: - return ("Software reset CPU"); - break; - case 13: - return ("RTC Watch dog Reset CPU"); - break; - case 14: - return ("for APP CPU, reseted by PRO CPU"); - break; - case 15: - return ("Reset when the vdd voltage is not stable"); - break; - case 16: - return ("RTC Watch dog reset digital core and rtc module"); - break; - default: - return ("NO_MEAN"); +String verbosePrintResetReason(int reason) { + switch (reason) { + case 1: return ("Vbat power on reset"); break; + case 3: return ("Software reset digital core"); break; + case 4: return ("Legacy watch dog reset digital core"); break; + case 5: return ("Deep Sleep reset digital core"); break; + case 6: return ("Reset by SLC module, reset digital core"); break; + case 7: return ("Timer Group0 Watch dog reset digital core"); break; + case 8: return ("Timer Group1 Watch dog reset digital core"); break; + case 9: return ("RTC Watch dog Reset digital core"); break; + case 10: return ("Intrusion tested to reset CPU"); break; + case 11: return ("Time Group reset CPU"); break; + case 12: return ("Software reset CPU"); break; + case 13: return ("RTC Watch dog Reset CPU"); break; + case 14: return ("for APP CPU, reseted by PRO CPU"); break; + case 15: return ("Reset when the vdd voltage is not stable"); break; + case 16: return ("RTC Watch dog reset digital core and rtc module"); break; + default: return ("NO_MEAN"); } } -SystemStatus::SystemStatus(PsychicHttpServer *server, - SecurityManager *securityManager) : _server(server), - _securityManager(securityManager) -{ -} +SystemStatus::SystemStatus(PsychicHttpServer *server, SecurityManager *securityManager) + : _server(server), _securityManager(securityManager) {} -void SystemStatus::begin() -{ - _server->on(SYSTEM_STATUS_SERVICE_PATH, - HTTP_GET, +void SystemStatus::begin() { + _server->on(SYSTEM_STATUS_SERVICE_PATH, HTTP_GET, _securityManager->wrapRequest(std::bind(&SystemStatus::systemStatus, this, std::placeholders::_1), AuthenticationPredicates::IS_AUTHENTICATED)); ESP_LOGV("SystemStatus", "Registered GET endpoint: %s", SYSTEM_STATUS_SERVICE_PATH); } -esp_err_t SystemStatus::systemStatus(PsychicRequest *request) -{ +esp_err_t SystemStatus::systemStatus(PsychicRequest *request) { PsychicJsonResponse response = PsychicJsonResponse(request, false); JsonObject root = response.getRoot(); diff --git a/esp32/lib/ESP32-sveltekit/SystemStatus.h b/esp32/lib/ESP32-sveltekit/SystemStatus.h index 7d0c977..1c3df28 100644 --- a/esp32/lib/ESP32-sveltekit/SystemStatus.h +++ b/esp32/lib/ESP32-sveltekit/SystemStatus.h @@ -24,27 +24,27 @@ #include #if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 - #include "esp32/rom/rtc.h" - #ifndef ESP_PLATFORM - #define ESP_PLATFORM "ESP32" - #endif +#include "esp32/rom/rtc.h" +#ifndef ESP_PLATFORM +#define ESP_PLATFORM "ESP32" +#endif #elif CONFIG_IDF_TARGET_ESP32S2 - #include "esp32/rom/rtc.h" - #ifndef ESP_PLATFORM - #define ESP_PLATFORM "ESP32-S2" - #endif +#include "esp32/rom/rtc.h" +#ifndef ESP_PLATFORM +#define ESP_PLATFORM "ESP32-S2" +#endif #elif CONFIG_IDF_TARGET_ESP32C3 - #include "esp32c3/rom/rtc.h" - #ifndef ESP_PLATFORM - #define ESP_PLATFORM "ESP32-C3" - #endif +#include "esp32c3/rom/rtc.h" +#ifndef ESP_PLATFORM +#define ESP_PLATFORM "ESP32-C3" +#endif #elif CONFIG_IDF_TARGET_ESP32S3 - #include "esp32s3/rom/rtc.h" - #ifndef ESP_PLATFORM - #define ESP_PLATFORM "ESP32-S3" - #endif +#include "esp32s3/rom/rtc.h" +#ifndef ESP_PLATFORM +#define ESP_PLATFORM "ESP32-S3" +#endif #else - #error Target CONFIG_IDF_TARGET is not supported +#error Target CONFIG_IDF_TARGET is not supported #endif #ifndef ARDUINO_VERSION @@ -52,20 +52,19 @@ #define STRINGIZE(s) #s #endif #define ARDUINO_VERSION_STR(major, minor, patch) "v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch) -#define ARDUINO_VERSION ARDUINO_VERSION_STR(ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH) +#define ARDUINO_VERSION \ + ARDUINO_VERSION_STR(ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH) #endif - #define SYSTEM_STATUS_SERVICE_PATH "/api/systemStatus" -class SystemStatus -{ -public: +class SystemStatus { + public: SystemStatus(PsychicHttpServer *server, SecurityManager *securityManager); void begin(); -private: + private: PsychicHttpServer *_server; SecurityManager *_securityManager; esp_err_t systemStatus(PsychicRequest *request);