From 70b16efa4ad3ecd0559195e0bf1772b9b09df02f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nidecki?= Date: Thu, 18 Feb 2021 20:45:40 +0100 Subject: [PATCH] Mem info in json response --- src/taskWebServer.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/taskWebServer.cpp b/src/taskWebServer.cpp index 8eb3959..f349f0f 100644 --- a/src/taskWebServer.cpp +++ b/src/taskWebServer.cpp @@ -36,6 +36,9 @@ String jsonLineFromPreferenceBool(const char *preferenceName, bool last=false){ String jsonLineFromPreferenceInt(const char *preferenceName, bool last=false){ return String("\"") + preferenceName + "\":" + (preferences.getInt(preferenceName)) + (last ? + R"()" : + R"(,)"); } +String jsonLineFromString(const char *name, const char *value, bool last=false){ + return String("\"") + name + "\":" + jsonEscape(value) + (last ? + R"()" : + R"(,)"); +} void handle_NotFound(){ sendCacheHeader(); @@ -114,7 +117,11 @@ void handle_Cfg() { jsonData += jsonLineFromPreferenceInt(PREF_APRS_FIXED_BEACON_INTERVAL_PRESET); jsonData += jsonLineFromPreferenceBool(PREF_APRS_SHOW_BATTERY); jsonData += jsonLineFromPreferenceBool(PREF_APRS_FIXED_BEACON_PRESET); - jsonData += jsonLineFromPreferenceBool(PREF_APRS_SHOW_ALTITUDE, true); + jsonData += jsonLineFromPreferenceBool(PREF_APRS_SHOW_ALTITUDE); + jsonData += jsonLineFromString("FreeHeap", String(ESP.getFreeHeap()).c_str()); + jsonData += jsonLineFromString("HeapSize", String(ESP.getHeapSize()).c_str()); + jsonData += jsonLineFromString("FreeSketchSpace", String(ESP.getFreeSketchSpace()).c_str(), true); + jsonData += "}"; server.send(200,"application/json", jsonData); }