From b1b4bddcbca70d3c6947d827a0f63aef26c30af4 Mon Sep 17 00:00:00 2001 From: Florian Date: Sun, 23 Jun 2024 15:28:52 -0500 Subject: [PATCH] [SYS] Improve max buffer (#1981) * [SYS] Reduce the usage scope of json maximum buffer usage * Reduce procBLETask stack size --- main/ZgatewayBT.ino | 2 +- main/main.ino | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino index 97d59e4..7fdb9b5 100644 --- a/main/ZgatewayBT.ino +++ b/main/ZgatewayBT.ino @@ -902,7 +902,7 @@ void setupBTTasksAndBLE() { procBLETask, /* Function to implement the task */ "procBLETask", /* Name of the task */ # ifdef USE_BLUFI - 13500, + 12000, # else 8500, /* Stack size in bytes */ # endif diff --git a/main/main.ino b/main/main.ino index 81b819c..09e4187 100644 --- a/main/main.ino +++ b/main/main.ino @@ -80,7 +80,7 @@ bool ready_to_sleep = false; #include struct JsonBundle { - StaticJsonDocument doc; + StaticJsonDocument doc; }; std::queue jsonQueue; @@ -416,7 +416,7 @@ void pubMainCore(JsonObject& data) { } // Add a document to the queue -void enqueueJsonObject(const StaticJsonDocument& jsonDoc) { +void enqueueJsonObject(const StaticJsonDocument& jsonDoc) { if (jsonDoc.size() == 0) { Log.error(F("Empty JSON, skipping" CR)); return; @@ -435,7 +435,7 @@ void enqueueJsonObject(const StaticJsonDocument& jsonDoc) { #ifdef ESP32 // Semaphore check before enqueueing a document -bool handleJsonEnqueue(const StaticJsonDocument& jsonDoc, int timeout) { +bool handleJsonEnqueue(const StaticJsonDocument& jsonDoc, int timeout) { if (xSemaphoreTake(xQueueMutex, pdMS_TO_TICKS(timeout))) { enqueueJsonObject(jsonDoc); xSemaphoreGive(xQueueMutex);