🪄 Formats SystemStatus

This commit is contained in:
Rune Harlyk
2024-07-09 20:00:28 +02:00
committed by Rune Harlyk
parent 0ba9ad75b0
commit 03e21beddd
2 changed files with 45 additions and 85 deletions
+23 -62
View File
@@ -14,78 +14,39 @@
#include <SystemStatus.h> #include <SystemStatus.h>
String verbosePrintResetReason(int reason) String verbosePrintResetReason(int reason) {
{ switch (reason) {
switch (reason) case 1: return ("Vbat power on reset"); break;
{ case 3: return ("Software reset digital core"); break;
case 1: case 4: return ("Legacy watch dog reset digital core"); break;
return ("Vbat power on reset"); case 5: return ("Deep Sleep reset digital core"); break;
break; case 6: return ("Reset by SLC module, reset digital core"); break;
case 3: case 7: return ("Timer Group0 Watch dog reset digital core"); break;
return ("Software reset digital core"); case 8: return ("Timer Group1 Watch dog reset digital core"); break;
break; case 9: return ("RTC Watch dog Reset digital core"); break;
case 4: case 10: return ("Intrusion tested to reset CPU"); break;
return ("Legacy watch dog reset digital core"); case 11: return ("Time Group reset CPU"); break;
break; case 12: return ("Software reset CPU"); break;
case 5: case 13: return ("RTC Watch dog Reset CPU"); break;
return ("Deep Sleep reset digital core"); case 14: return ("for APP CPU, reseted by PRO CPU"); break;
break; case 15: return ("Reset when the vdd voltage is not stable"); break;
case 6: case 16: return ("RTC Watch dog reset digital core and rtc module"); break;
return ("Reset by SLC module, reset digital core"); default: return ("NO_MEAN");
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, SystemStatus::SystemStatus(PsychicHttpServer *server, SecurityManager *securityManager)
SecurityManager *securityManager) : _server(server), : _server(server), _securityManager(securityManager) {}
_securityManager(securityManager)
{
}
void SystemStatus::begin() void SystemStatus::begin() {
{ _server->on(SYSTEM_STATUS_SERVICE_PATH, HTTP_GET,
_server->on(SYSTEM_STATUS_SERVICE_PATH,
HTTP_GET,
_securityManager->wrapRequest(std::bind(&SystemStatus::systemStatus, this, std::placeholders::_1), _securityManager->wrapRequest(std::bind(&SystemStatus::systemStatus, this, std::placeholders::_1),
AuthenticationPredicates::IS_AUTHENTICATED)); AuthenticationPredicates::IS_AUTHENTICATED));
ESP_LOGV("SystemStatus", "Registered GET endpoint: %s", SYSTEM_STATUS_SERVICE_PATH); 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); PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot(); JsonObject root = response.getRoot();
+22 -23
View File
@@ -24,27 +24,27 @@
#include <esp32-hal.h> #include <esp32-hal.h>
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 #if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
#include "esp32/rom/rtc.h" #include "esp32/rom/rtc.h"
#ifndef ESP_PLATFORM #ifndef ESP_PLATFORM
#define ESP_PLATFORM "ESP32" #define ESP_PLATFORM "ESP32"
#endif #endif
#elif CONFIG_IDF_TARGET_ESP32S2 #elif CONFIG_IDF_TARGET_ESP32S2
#include "esp32/rom/rtc.h" #include "esp32/rom/rtc.h"
#ifndef ESP_PLATFORM #ifndef ESP_PLATFORM
#define ESP_PLATFORM "ESP32-S2" #define ESP_PLATFORM "ESP32-S2"
#endif #endif
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3
#include "esp32c3/rom/rtc.h" #include "esp32c3/rom/rtc.h"
#ifndef ESP_PLATFORM #ifndef ESP_PLATFORM
#define ESP_PLATFORM "ESP32-C3" #define ESP_PLATFORM "ESP32-C3"
#endif #endif
#elif CONFIG_IDF_TARGET_ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S3
#include "esp32s3/rom/rtc.h" #include "esp32s3/rom/rtc.h"
#ifndef ESP_PLATFORM #ifndef ESP_PLATFORM
#define ESP_PLATFORM "ESP32-S3" #define ESP_PLATFORM "ESP32-S3"
#endif #endif
#else #else
#error Target CONFIG_IDF_TARGET is not supported #error Target CONFIG_IDF_TARGET is not supported
#endif #endif
#ifndef ARDUINO_VERSION #ifndef ARDUINO_VERSION
@@ -52,20 +52,19 @@
#define STRINGIZE(s) #s #define STRINGIZE(s) #s
#endif #endif
#define ARDUINO_VERSION_STR(major, minor, patch) "v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch) #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 #endif
#define SYSTEM_STATUS_SERVICE_PATH "/api/systemStatus" #define SYSTEM_STATUS_SERVICE_PATH "/api/systemStatus"
class SystemStatus class SystemStatus {
{ public:
public:
SystemStatus(PsychicHttpServer *server, SecurityManager *securityManager); SystemStatus(PsychicHttpServer *server, SecurityManager *securityManager);
void begin(); void begin();
private: private:
PsychicHttpServer *_server; PsychicHttpServer *_server;
SecurityManager *_securityManager; SecurityManager *_securityManager;
esp_err_t systemStatus(PsychicRequest *request); esp_err_t systemStatus(PsychicRequest *request);