Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ac_main' into mdev

Browse Source
This commit is contained in:
Ewoud
2022-11-15 12:47:32 +01:00
parent 3b21f02442 f104fb0586
commit ede08cedf2
30 changed files with 3841 additions and 3545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wled00/xml.cpp
View File

@@ -516,18 +516,15 @@ void getSettingsJS(byte subPage, char* dest)
sappends('s',SET_F("AI"),alexaInvocationName);
sappend('c',SET_F("SA"),notifyAlexa);
sappend('v',SET_F("AP"),alexaNumPresets);
#ifndef WLED_DISABLE_ALEXA
oappend(SET_F("hideNoALEXA();")); // hide "not compiled in" message
#else
oappend(SET_F("hideALEXA();")); // hide Alexa settings if not compiled in
#ifdef WLED_DISABLE_ALEXA
oappend(SET_F("toggle('Alexa');")); // hide Alexa settings
#endif
sappends('s',SET_F("BK"),(char*)((blynkEnabled)?SET_F("Hidden"):""));
#ifndef WLED_DISABLE_BLYNK
sappends('s',SET_F("BH"),blynkHost);
sappend('v',SET_F("BP"),blynkPort);
oappend(SET_F("hideNoBLYNK();")); // hide "not compiled in" message
#else
oappend(SET_F("hideBLYNK();")); // hide BLYNK settings if not compiled in
oappend(SET_F("toggle('Blynk');")); // hide BLYNK settings
#endif
#ifdef WLED_ENABLE_MQTT
@@ -544,9 +541,8 @@ void getSettingsJS(byte subPage, char* dest)
sappends('s',"MD",mqttDeviceTopic);
sappends('s',SET_F("MG"),mqttGroupTopic);
sappend('c',SET_F("BM"),buttonPublishMqtt);
oappend(SET_F("hideNoMQTT();")); // hide "not compiled in" message
#else
oappend(SET_F("hideMQTT();")); // hide MQTT settings if not compiled in
oappend(SET_F("toggle('MQTT');")); // hide MQTT settings
#endif
#ifndef WLED_DISABLE_HUESYNC
@@ -574,9 +570,8 @@ void getSettingsJS(byte subPage, char* dest)
}
sappends('m',SET_F("(\"sip\")[0]"),hueErrorString);
oappend(SET_F("hideNoHUE();")); // hide "not compiled in" message
#else
oappend(SET_F("hideHUE();")); // hide Hue Sync settings if not compiled in
oappend(SET_F("toggle('Hue');")); // hide Hue Sync settings
#endif
sappend('v',SET_F("BD"),serialBaud);
@@ -725,17 +720,17 @@ void getSettingsJS(byte subPage, char* dest)
oappend(versionString);
oappend(SET_F("_"));
oappend(releaseString);
oappend(SET_F(".bin"));
oappend(SET_F(".bin<br>("));
#if defined(CONFIG_IDF_TARGET_ESP32C3)
oappend(SET_F("<br>(ESP32-C3"));
oappend(SET_F("ESP32-C3"));
#elif defined(CONFIG_IDF_TARGET_ESP32S3)
oappend(SET_F("<br>(ESP32-S3"));
oappend(SET_F("ESP32-S3"));
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
oappend(SET_F("<br>(ESP32-S2"));
oappend(SET_F("ESP32-S2"));
#elif defined(ARDUINO_ARCH_ESP32)
oappend(SET_F("<br>(ESP32"));
oappend(ESP.getChipModel());
#else
oappend(SET_F("<br>(ESP8266"));
oappend("esp8266");
#endif
oappend(SET_F(" build "));
oappendi(VERSION);