Sternenlabor/WLED
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

MQTT unification and cleanup

Browse Source
This commit is contained in:
Blaz Kristan
2024-08-15 16:18:34 +02:00
parent fe7fb6c7a9
commit 577fce69e2
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/cfg.cpp
View File

@@ -537,7 +537,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
CJSON(alexaNumPresets, interfaces["va"]["p"]);
#ifdef WLED_ENABLE_MQTT
#ifndef WLED_DISABLE_MQTT
JsonObject if_mqtt = interfaces["mqtt"];
CJSON(mqttEnabled, if_mqtt["en"]);
getStringFromJson(mqttServer, if_mqtt[F("broker")], MQTT_MAX_SERVER_LEN+1);
@@ -1019,7 +1019,7 @@ void serializeConfig() {
if_va["p"] = alexaNumPresets;
#endif
#ifdef WLED_ENABLE_MQTT
#ifndef WLED_DISABLE_MQTT
JsonObject if_mqtt = interfaces.createNestedObject("mqtt");
if_mqtt["en"] = mqttEnabled;
if_mqtt[F("broker")] = mqttServer;
@@ -1165,7 +1165,7 @@ bool deserializeConfigSec() {
[[maybe_unused]] JsonObject interfaces = root["if"];
#ifdef WLED_ENABLE_MQTT
#ifndef WLED_DISABLE_MQTT
JsonObject if_mqtt = interfaces["mqtt"];
getStringFromJson(mqttPass, if_mqtt["psk"], 65);
#endif
@@ -1206,7 +1206,7 @@ void serializeConfigSec() {
ap["psk"] = apPass;
[[maybe_unused]] JsonObject interfaces = root.createNestedObject("if");
#ifdef WLED_ENABLE_MQTT
#ifndef WLED_DISABLE_MQTT
JsonObject if_mqtt = interfaces.createNestedObject("mqtt");
if_mqtt["psk"] = mqttPass;
#endif