andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-06-14 11:56:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

use PSRAM in AsyncJsonResponse

Browse Source
This commit is contained in:
proddy
2026-05-17 16:19:54 +02:00
parent 144d6589ef
commit 90894898c2
18 changed files with 179 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/web/WebAPIService.cpp
View File

@@ -108,7 +108,7 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject input) {
EMSESP::system_.refreshHeapMem();
// output json buffer
auto response = new AsyncJsonResponse();
auto response = new PsramAsyncJsonResponse();
// add more mem if needed - won't be needed in ArduinoJson 7
// while (!response->getSize()) {

2
src/web/WebActivityService.cpp
View File

@@ -27,7 +27,7 @@ WebActivityService::WebActivityService(AsyncWebServer * server, SecurityManager
}
void WebActivityService::webActivityService(AsyncWebServerRequest * request) {
auto * response = new AsyncJsonResponse(false);
auto * response = new PsramAsyncJsonResponse(false);
JsonObject root = response->getRoot();
JsonArray statsJson = root["stats"].to<JsonArray>();

13
src/web/WebDataService.cpp
View File

@@ -58,7 +58,7 @@ WebDataService::WebDataService(AsyncWebServer * server, SecurityManager * securi
// this is used in the Devices page and contains all EMS device information
// /coreData endpoint
void WebDataService::core_data(AsyncWebServerRequest * request) {
auto * response = new AsyncJsonResponse(false);
auto * response = new PsramAsyncJsonResponse(false);
JsonObject root = response->getRoot();
// list is already sorted by device type
@@ -70,7 +70,7 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
obj["id"] = emsdevice->unique_id(); // a unique id
obj["tn"] = emsdevice->device_type_2_device_name_translated(); // translated device type name
obj["t"] = emsdevice->device_type(); // device type number
obj["b"] = emsdevice->brand_to_cstr(); // brand
obj["b"] = emsdevice->brand_to_char(); // brand (std::string → copied into doc, safe across async serialize)
obj["n"] = emsdevice->name(); // custom name
obj["d"] = emsdevice->device_id(); // deviceid
obj["p"] = emsdevice->product_id(); // productid
@@ -104,7 +104,7 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
// sensor data - sends back to web
// /sensorData endpoint
void WebDataService::sensor_data(AsyncWebServerRequest * request) {
auto * response = new AsyncJsonResponse(false);
auto * response = new PsramAsyncJsonResponse(false);
JsonObject root = response->getRoot();
// temperature sensors
@@ -176,7 +176,7 @@ void WebDataService::device_data(AsyncWebServerRequest * request) {
if (request->hasParam(F_(id))) {
id = Helpers::atoint(request->getParam(F_(id))->value().c_str()); // get id from url
auto * response = new AsyncMessagePackResponse();
auto * response = new PsramAsyncMessagePackResponse();
// check size
// while (!response) {
@@ -217,6 +217,9 @@ void WebDataService::device_data(AsyncWebServerRequest * request) {
return;
}
#endif
// no matching device and not CUSTOM_UID: we never called request->send(response),
// so AsyncWebServer never took ownership. Delete it ourselves to avoid leaking.
delete response;
}
// invalid
@@ -269,7 +272,7 @@ void WebDataService::write_device_value(AsyncWebServerRequest * request, JsonVar
return;
}
// create JSON for output
auto * response = new AsyncJsonResponse(false);
auto * response = new PsramAsyncJsonResponse(false);
JsonObject output = response->getRoot();
// the data could be in any format, but we need string
// authenticated is always true

2
src/web/WebLogService.cpp
View File

@@ -193,7 +193,7 @@ void WebLogService::transmit(const QueuedLogMessage & message) {
void WebLogService::getSetValues(AsyncWebServerRequest * request, JsonVariant json) {
if ((request->method() == HTTP_GET) || (!json.is<JsonObject>())) {
// GET - return the values
auto * response = new AsyncJsonResponse(false);
auto * response = new PsramAsyncJsonResponse(false);
JsonObject root = response->getRoot();
root["level"] = level_;
root["max_messages"] = maximum_log_messages_;

2
src/web/WebSettingsService.cpp
View File

@@ -414,7 +414,7 @@ void WebSettingsService::board_profile(AsyncWebServerRequest * request) {
if (request->hasParam("boardProfile")) {
std::string board_profile = request->getParam("boardProfile")->value().c_str();
auto * response = new AsyncJsonResponse(false);
auto * response = new PsramAsyncJsonResponse(false);
JsonObject root = response->getRoot();
// 0=led, 1=dallas, 2=rx, 3=tx, 4=button, 5=phy_type, 6=eth_power, 7=eth_phy_addr, 8=eth_clock_mode, 9=led_type

4
src/web/WebStatusService.cpp
View File

@@ -47,7 +47,7 @@ WebStatusService::WebStatusService(AsyncWebServer * server, SecurityManager * se
void WebStatusService::systemStatus(AsyncWebServerRequest * request) {
EMSESP::system_.refreshHeapMem(); // refresh free heap and max alloc heap
auto * response = new AsyncJsonResponse(false);
auto * response = new PsramAsyncJsonResponse(false);
JsonObject root = response->getRoot();
//
@@ -187,7 +187,7 @@ void WebStatusService::systemStatus(AsyncWebServerRequest * request) {
// generic action handler - as a POST
void WebStatusService::action(AsyncWebServerRequest * request, JsonVariant json) {
auto * response = new AsyncJsonResponse();
auto * response = new PsramAsyncJsonResponse();
JsonObject root = response->getRoot();
// param is optional - https://arduinojson.org/news/2024/09/18/arduinojson-7-2/