diff --git a/patches/AsyncWeb_Prometheus.patch b/patches/AsyncWeb_Prometheus.patch deleted file mode 100644 index f8e02c87..00000000 --- a/patches/AsyncWeb_Prometheus.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/AsyncWebSocket.cpp b/src/AsyncWebSocket.cpp -index 88d88ec..cb06fe0 100644 ---- a/src/AsyncWebSocket.cpp -+++ b/src/AsyncWebSocket.cpp -@@ -745,7 +745,7 @@ void AsyncWebSocketClient::binary(const __FlashStringHelper* data, size_t len) { - - IPAddress AsyncWebSocketClient::remoteIP() const { - if (!_client) -- return IPAddress((uint32_t)0U); -+ return IPAddress(); - - return _client->remoteIP(); - } -diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp -index 86aa947..9d0ee00 100644 ---- a/src/WebResponses.cpp -+++ b/src/WebResponses.cpp -@@ -447,7 +447,7 @@ size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest* request, size_t len, u - free(buf); - return 0; - } -- outLen = sprintf_P((char*)buf + headLen, PSTR("%x"), readLen) + headLen; -+ outLen = sprintf_P((char*)buf + headLen, PSTR("%04x"), readLen) + headLen; - while (outLen < headLen + 4) - buf[outLen++] = ' '; - buf[outLen++] = '\r'; diff --git a/scripts/applyPatches.py b/scripts/applyPatches.py index b6d86be7..1ef36963 100644 --- a/scripts/applyPatches.py +++ b/scripts/applyPatches.py @@ -26,8 +26,6 @@ def applyPatch(libName, patchFile): # list of patches to apply (relative to /src) -applyPatch("ESPAsyncWebServer", "../patches/AsyncWeb_Prometheus.patch") - if (env['PIOENV'][:5] == "esp32") or (env['PIOENV'][:13] == "opendtufusion"): applyPatch("GxEPD2", "../patches/GxEPD2_HAL.patch") diff --git a/src/CHANGES.md b/src/CHANGES.md index aef37af8..1b733050 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,10 @@ # Development Changes +## 0.8.150 - 2024-10-02 +* fix nullptr exception +* modified MqTT to not publish while not connected +* removed patch for Webserver library - obsolete + ## 0.8.149 - 2024-10-01 * fixed send power limit #1757 * merged: Fix minor typos #1758 diff --git a/src/defines.h b/src/defines.h index 186e4d91..19e4e6d2 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 8 -#define VERSION_PATCH 149 +#define VERSION_PATCH 150 //------------------------------------- typedef struct { uint8_t ch; diff --git a/src/hm/Communication.h b/src/hm/Communication.h index 1b2a6a7a..4043f610 100644 --- a/src/hm/Communication.h +++ b/src/hm/Communication.h @@ -208,11 +208,11 @@ class Communication : public CommQueue<> { mHeu.setIvRetriesGood(q->iv,p->millis < LIMIT_VERYFAST_IV); } } else if (p->packet[0] == (TX_REQ_DEVCONTROL + ALL_FRAMES)) { // response from dev control command + q->iv->radio->mBufCtrl.pop(); if(parseDevCtrl(p, q)) closeRequest(q, true); else closeRequest(q, false); - q->iv->radio->mBufCtrl.pop(); return; // don't wait for empty buffer } else if(IV_MI == q->iv->ivGen) { parseMiFrame(p, q); diff --git a/src/platformio.ini b/src/platformio.ini index d67d6091..8553d824 100644 --- a/src/platformio.ini +++ b/src/platformio.ini @@ -37,6 +37,7 @@ lib_deps = build_flags = -std=c++17 -std=gnu++17 + -DEMC_ALLOW_NOT_CONNECTED_PUBLISH build_unflags = -std=gnu++11 @@ -51,6 +52,7 @@ lib_deps = https://github.com/me-no-dev/ESPAsyncUDP build_flags = ${env.build_flags} -DEMC_MIN_FREE_MEMORY=4096 + -D CONFIG_ASYNC_TCP_STACK_SIZE=4096 ;-Wl,-Map,output.map monitor_filters =