Merge branch 'master' into dev

This commit is contained in:
Blaz Kristan 2021-11-10 16:50:39 +01:00
commit ff84f2b2f7

View File

@ -401,11 +401,9 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
CJSON(DMXStartLED,dmx[F("start-led")]); CJSON(DMXStartLED,dmx[F("start-led")]);
JsonArray dmx_fixmap = dmx[F("fixmap")]; JsonArray dmx_fixmap = dmx[F("fixmap")];
it = 0; for (int i = 0; i < dmx_fixmap.size(); i++) {
for (int i : dmx_fixmap) { if (i > 14) break;
if (it > 14) break;
CJSON(DMXFixtureMap[i],dmx_fixmap[i]); CJSON(DMXFixtureMap[i],dmx_fixmap[i]);
it++;
} }
#endif #endif