From a745aa4fd83b1467889e11fef5a7192f7d71e3f0 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 28 Nov 2020 23:34:14 +0100 Subject: [PATCH] rename json sizes --- src/WebAPIService.cpp | 6 +++--- src/WebDevicesService.cpp | 2 +- src/WebStatusService.cpp | 2 +- src/WebStatusService.h | 1 - src/console.cpp | 2 +- src/emsesp.h | 12 ++++++------ 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/WebAPIService.cpp b/src/WebAPIService.cpp index 9d1938c4a..e986adbf9 100644 --- a/src/WebAPIService.cpp +++ b/src/WebAPIService.cpp @@ -71,7 +71,7 @@ void WebAPIService::webAPIService(AsyncWebServerRequest * request) { id = "-1"; } - DynamicJsonDocument doc(EMSESP_MAX_JSON_SIZE_DYN); + DynamicJsonDocument doc(EMSESP_MAX_JSON_SIZE_MEDIUM_DYN); JsonObject json = doc.to(); bool ok = false; @@ -109,9 +109,9 @@ void WebAPIService::webAPIService(AsyncWebServerRequest * request) { // if we have returned data in JSON format, send this to the WEB if (json.size()) { - char buffer[EMSESP_MAX_JSON_SIZE_DYN]; + std::string buffer; serializeJsonPretty(doc, buffer); - request->send(200, "text/plain", buffer); + request->send(200, "text/plain", buffer.c_str()); } else { request->send(200, "text/plain", ok ? F("OK") : F("Invalid")); } diff --git a/src/WebDevicesService.cpp b/src/WebDevicesService.cpp index cd910fc1b..0c6448645 100644 --- a/src/WebDevicesService.cpp +++ b/src/WebDevicesService.cpp @@ -45,7 +45,7 @@ void WebDevicesService::scan_devices(AsyncWebServerRequest * request) { } void WebDevicesService::all_devices(AsyncWebServerRequest * request) { - AsyncJsonResponse * response = new AsyncJsonResponse(false, EMSESP_MAX_JSON_SIZE_LARGE_DYN); + AsyncJsonResponse * response = new AsyncJsonResponse(false, EMSESP_MAX_JSON_SIZE_LARGE); JsonObject root = response->getRoot(); JsonArray devices = root.createNestedArray("devices"); diff --git a/src/WebStatusService.cpp b/src/WebStatusService.cpp index c50db160e..dc812e499 100644 --- a/src/WebStatusService.cpp +++ b/src/WebStatusService.cpp @@ -57,7 +57,7 @@ void WebStatusService::onStationModeGotIP(const WiFiEventStationModeGotIP & even #endif void WebStatusService::webStatusService(AsyncWebServerRequest * request) { - AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_EMSESP_STATUS_SIZE); + AsyncJsonResponse * response = new AsyncJsonResponse(false, EMSESP_MAX_JSON_SIZE_LARGE); JsonObject root = response->getRoot(); root["status"] = EMSESP::bus_status(); // 0, 1 or 2 diff --git a/src/WebStatusService.h b/src/WebStatusService.h index f16253542..353413dc3 100644 --- a/src/WebStatusService.h +++ b/src/WebStatusService.h @@ -25,7 +25,6 @@ #include #include -#define MAX_EMSESP_STATUS_SIZE 1024 #define EMSESP_STATUS_SERVICE_PATH "/rest/emsespStatus" namespace emsesp { diff --git a/src/console.cpp b/src/console.cpp index a811e343e..f2b54c692 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -387,7 +387,7 @@ void EMSESPShell::add_console_commands() { return; } - DynamicJsonDocument doc(EMSESP_MAX_JSON_SIZE_DYN); + DynamicJsonDocument doc(EMSESP_MAX_JSON_SIZE_MEDIUM_DYN); JsonObject json = doc.to(); bool ok = false; diff --git a/src/emsesp.h b/src/emsesp.h index 771443e8f..c537c039e 100644 --- a/src/emsesp.h +++ b/src/emsesp.h @@ -52,12 +52,12 @@ #define WATCH_ID_NONE 0 // no watch id set -#define EMSESP_MAX_JSON_SIZE_HA_CONFIG 384 // for small HA config payloads -#define EMSESP_MAX_JSON_SIZE_SMALL 256 // for smaller json docs when using StaticJsonDocument -#define EMSESP_MAX_JSON_SIZE_MEDIUM 768 // for medium json docs from ems devices, when using StaticJsonDocument -#define EMSESP_MAX_JSON_SIZE_LARGE 1024 // for large json docs from ems devices, like boiler or thermostat data. Using StaticJsonDocument -#define EMSESP_MAX_JSON_SIZE_DYN 2048 // for large json docs from web. Using DynamicJsonDocument -#define EMSESP_MAX_JSON_SIZE_LARGE_DYN 4098 // for very large json docs. Using DynamicJsonDocument +#define EMSESP_MAX_JSON_SIZE_HA_CONFIG 384 // for small HA config payloads, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_SMALL 256 // for smaller json docs, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_MEDIUM 768 // for medium json docs from ems devices, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_LARGE 1024 // for large json docs from ems devices, like boiler or thermostat data, using StaticJsonDocument +#define EMSESP_MAX_JSON_SIZE_MEDIUM_DYN 1024 // for large json docs, using DynamicJsonDocument +#define EMSESP_MAX_JSON_SIZE_LARGE_DYN 2048 // for very large json docs, using DynamicJsonDocument namespace emsesp {