From f66c28a1bca36ced44666621e0b4f2b3fcc7a8fa Mon Sep 17 00:00:00 2001 From: cschwinne Date: Tue, 29 Sep 2020 21:41:52 +0200 Subject: [PATCH] Fix MQTT bootloop (no F() macro, #1199 ) --- CHANGELOG.md | 4 ++++ wled00/mqtt.cpp | 4 ++-- wled00/src/dependencies/e131/ESPAsyncE131.cpp | 4 ---- wled00/wled.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50e55ed84..6652af1a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ### Development versions after the 0.10.2 release +#### Build 2009291 + +- Fixed MQTT bootloop (no F() macro, #1199) + #### Build 2009290 - Added basic DDP protocol support diff --git a/wled00/mqtt.cpp b/wled00/mqtt.cpp index 6d8a3b95a..46f49e19e 100644 --- a/wled00/mqtt.cpp +++ b/wled00/mqtt.cpp @@ -100,7 +100,7 @@ void publishMqtt() strcpy(subuf, mqttDeviceTopic); strcat(subuf, "/status"); - mqtt->publish(subuf, 0, true, (const char*)F("online")); + mqtt->publish(subuf, 0, true, "online"); char apires[1024]; XML_response(nullptr, apires); @@ -137,7 +137,7 @@ bool initMqtt() strcpy(mqttStatusTopic, mqttDeviceTopic); strcat(mqttStatusTopic, "/status"); - mqtt->setWill(mqttStatusTopic, 0, true, (const char*)F("offline")); + mqtt->setWill(mqttStatusTopic, 0, true, "offline"); mqtt->setKeepAlive(MQTT_KEEP_ALIVE_TIME); mqtt->connect(); return true; diff --git a/wled00/src/dependencies/e131/ESPAsyncE131.cpp b/wled00/src/dependencies/e131/ESPAsyncE131.cpp index cda4f11ea..12f6ab3c5 100644 --- a/wled00/src/dependencies/e131/ESPAsyncE131.cpp +++ b/wled00/src/dependencies/e131/ESPAsyncE131.cpp @@ -123,12 +123,8 @@ void ESPAsyncE131::parsePacket(AsyncUDPPacket _packet) { } if (error && _packet.localPort() == DDP_DEFAULT_PORT) { //DDP packet - int pushSeq = 0; error = false; protocol = P_DDP; - //bool push = sbuff->flags & DDP_PUSH_FLAG; - //if (push) pushSeq = sbuff->sequenceNum; - //else if (sbuff->sequenceNum > pushSeq -5) error = true; } if (!error) { diff --git a/wled00/wled.h b/wled00/wled.h index 297d1ab43..932d89822 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2009290 +#define VERSION 2009291 // ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).