Merge remote-tracking branch 'upstream/main' into mdev
Some additions: pio.ini: add debug entries cfg.cpp, set.cpp, xml/cpp: keep storing basic 2D setup index.js: use ledmapFileNames settings_2D.htm: keep using basic and advanced FX_2Dfcn.cpp: use gaptable and also MM ledmaps FX_fcn.cpp: extend enumerateledmaps with AC ledmapNames (but not used in UI)
This commit is contained in:
@@ -105,11 +105,6 @@ void WLED::loop()
|
||||
yield();
|
||||
#endif
|
||||
|
||||
#ifndef WLED_DISABLE_BLYNK
|
||||
handleBlynk();
|
||||
yield();
|
||||
#endif
|
||||
|
||||
handlePresets();
|
||||
yield();
|
||||
|
||||
@@ -183,9 +178,10 @@ void WLED::loop()
|
||||
yield();
|
||||
serializeConfig();
|
||||
}
|
||||
//WLEDMM refactored
|
||||
|
||||
//WLEDMM refactored (to be done: setUpMatrix is called in finalizeInit and also in deserializeMap, deserializeMap is called in finalizeInit and also here)
|
||||
if (loadLedmap) {
|
||||
strip.deserializeMap(loadedLedmap);
|
||||
if (!strip.deserializeMap(loadedLedmap) && strip.isMatrix && loadedLedmap == 0) strip.setUpMatrix();
|
||||
strip.enumerateLedmaps(); //WLEDMM
|
||||
loadLedmap = false;
|
||||
}
|
||||
@@ -887,9 +883,6 @@ void WLED::initInterfaces()
|
||||
if (ntpEnabled)
|
||||
ntpConnected = ntpUdp.begin(ntpLocalPort);
|
||||
|
||||
#ifndef WLED_DISABLE_BLYNK
|
||||
initBlynk(blynkApiKey, blynkHost, blynkPort);
|
||||
#endif
|
||||
e131.begin(e131Multicast, e131Port, e131Universe, E131_MAX_UNIVERSE_COUNT);
|
||||
ddp.begin(false, DDP_DEFAULT_PORT);
|
||||
reconnectHue();
|
||||
|
||||
Reference in New Issue
Block a user