Merge remote-tracking branch 'upstream/main' into mdev

2023-06-07 20:54:04 +02:00
parent 74f75b1124 999bec19f1
commit b95ff2d74f
37 changed files with 6133 additions and 5775 deletions
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -592,6 +592,7 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
    sappends('s',"MD",mqttDeviceTopic);
    sappends('s',SET_F("MG"),mqttGroupTopic);
    sappend('c',SET_F("BM"),buttonPublishMqtt);
+    sappend('c',SET_F("RT"),retainMqttMsg);
    #else
    oappend(SET_F("toggle('MQTT');"));    // hide MQTT settings
    #endif