diff --git a/src/CHANGES.md b/src/CHANGES.md index 8a41bd80..77a03b4a 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,10 @@ # Development Changes +## 0.8.111 - 2024-04-17 +* fix MqTT discovery field `ALARM_MES_ID` #1591 +* fix Wifi reconnect for ESP32 #1589 #1575 +* open link from `index.html` in new tab #1588 #1587 + ## 0.8.110 - 2024-04-11 * revert CMT2300A changes #1553 * merged PR: fix closing tag #1584 diff --git a/src/defines.h b/src/defines.h index e7eecc00..cab8676d 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 8 -#define VERSION_PATCH 110 +#define VERSION_PATCH 111 //------------------------------------- typedef struct { uint8_t ch; diff --git a/src/network/AhoyWifiEsp32.h b/src/network/AhoyWifiEsp32.h index 98b7053c..b3e12b3a 100644 --- a/src/network/AhoyWifiEsp32.h +++ b/src/network/AhoyWifiEsp32.h @@ -43,8 +43,8 @@ class AhoyWifi : public AhoyNetwork { if(mConnected) { mConnected = false; mOnNetworkCB(false); - mAp.enable(); MDNS.end(); + begin(); } break; @@ -59,7 +59,6 @@ class AhoyWifi : public AhoyNetwork { mConnected = true; ah::welcome(WiFi.localIP().toString(), F("Station")); MDNS.begin(mConfig->sys.deviceName); - //MDNS.addServiceTxt("http", "tcp", "path", "/"); mOnNetworkCB(true); } break; diff --git a/src/publisher/pubMqtt.h b/src/publisher/pubMqtt.h index 8506a87c..bd34a519 100644 --- a/src/publisher/pubMqtt.h +++ b/src/publisher/pubMqtt.h @@ -443,7 +443,8 @@ class PubMqtt { snprintf(topic.data(), topic.size(), "%s/sensor/%s/total_%s/config", MQTT_DISCOVERY_PREFIX, node_id.c_str(), fields[fldTotal[mDiscovery.sub]]); size_t size = measureJson(doc2) + 1; serializeJson(doc2, buf.data(), size); - publish(topic.data(), buf.data(), true, false); + if(FLD_EVT != rec->assign[mDiscovery.sub].fieldId) + publish(topic.data(), buf.data(), true, false); if(++mDiscovery.sub == ((!total) ? (rec->length) : 4)) { mDiscovery.sub = 0; diff --git a/src/web/html/index.html b/src/web/html/index.html index 954ee012..70a9cd26 100644 --- a/src/web/html/index.html +++ b/src/web/html/index.html @@ -23,9 +23,9 @@

{#SUPPORT}: