diff --git a/interface/src/api/system.ts b/interface/src/api/system.ts index 04e65484d..7b5e46c7b 100644 --- a/interface/src/api/system.ts +++ b/interface/src/api/system.ts @@ -7,9 +7,9 @@ import type { HardwareStatus, LogSettings, SystemStatus } from 'types'; import { alovaInstance, alovaInstanceGH } from './endpoints'; -// HardwareStatus - also used to ping in Restart monitor for pinging +// hardwareStatus - also used to ping in Restart monitor for pinging export const readHardwareStatus = () => - alovaInstance.Get('/rest/HardwareStatus'); + alovaInstance.Get('/rest/hardwareStatus'); // SystemStatus export const readSystemStatus = () => diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp index d306085a7..dca2642fd 100644 --- a/src/web/WebStatusService.cpp +++ b/src/web/WebStatusService.cpp @@ -24,9 +24,9 @@ namespace emsesp { -// /rest/HardwareStatus +// /rest/hardwareStatus WebStatusService::WebStatusService(AsyncWebServer * server, SecurityManager * securityManager) { - server->on(HARDWARE_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { HardwareStatus(request); }); + server->on(HARDWARE_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { hardwareStatus(request); }); server->on(SYSTEM_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { systemStatus(request); }); } @@ -85,7 +85,7 @@ void WebStatusService::systemStatus(AsyncWebServerRequest * request) { request->send(response); } -void WebStatusService::HardwareStatus(AsyncWebServerRequest * request) { +void WebStatusService::hardwareStatus(AsyncWebServerRequest * request) { EMSESP::system_.refreshHeapMem(); // refresh free heap and max alloc heap auto * response = new AsyncJsonResponse(false); @@ -121,6 +121,7 @@ void WebStatusService::HardwareStatus(AsyncWebServerRequest * request) { root["fs_free"] = EMSESP::system_.FStotal() - FSused; root["free_caps"] = heap_caps_get_free_size(MALLOC_CAP_8BIT) / 1024; // includes heap and psram + root["psram"] = EMSESP::system_.PSram(); if (EMSESP::system_.PSram()) { root["psram_size"] = EMSESP::system_.PSram(); root["free_psram"] = ESP.getFreePsram() / 1024; diff --git a/src/web/WebStatusService.h b/src/web/WebStatusService.h index 4fe30f450..e3fe28083 100644 --- a/src/web/WebStatusService.h +++ b/src/web/WebStatusService.h @@ -1,7 +1,7 @@ #ifndef WebStatusService_h #define WebStatusService_h -#define HARDWARE_STATUS_SERVICE_PATH "/rest/HardwareStatus" +#define HARDWARE_STATUS_SERVICE_PATH "/rest/hardwareStatus" #define SYSTEM_STATUS_SERVICE_PATH "/rest/systemStatus" namespace emsesp { @@ -12,7 +12,7 @@ class WebStatusService { private: void systemStatus(AsyncWebServerRequest * request); - void HardwareStatus(AsyncWebServerRequest * request); + void hardwareStatus(AsyncWebServerRequest * request); }; } // namespace emsesp