andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 09:19:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

Browse Source
This commit is contained in:
MichaelDvP
2024-07-26 18:30:14 +02:00
parent a83bca995b 8f082dfd68
commit 7703ca15dc
13 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/web/WebSettingsService.cpp
View File

@@ -32,7 +32,6 @@ WebSettingsService::WebSettingsService(AsyncWebServer * server, FS * fs, Securit
}
void WebSettings::read(WebSettings & settings, JsonObject root) {
root["version"] = settings.version;
root["locale"] = settings.locale;
root["tx_mode"] = settings.tx_mode;
root["ems_bus_id"] = settings.ems_bus_id;

7
src/web/WebStatusService.cpp
View File

@@ -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;

4
src/web/WebStatusService.h
View File

@@ -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