From 04d59322520b37fc3ca3de76976971c531e176e8 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Fri, 4 Feb 2022 10:10:37 +0100 Subject: [PATCH] Un-F()-ed some strings (that were either occuring at least 4 times, or were F()-ed in some places and not in others) --- wled00/cfg.cpp | 36 ++++++++++++++++++------------------ wled00/json.cpp | 12 ++++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index f033909c..7c7fbc4d 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -76,7 +76,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { JsonObject hw = doc[F("hw")]; // initialize LED pins and lengths prior to other HW (except for ethernet) - JsonObject hw_led = hw[F("led")]; + JsonObject hw_led = hw["led"]; CJSON(strip.ablMilliampsMax, hw_led[F("maxpwr")]); CJSON(strip.milliampsPerLed, hw_led[F("ledma")]); @@ -105,7 +105,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { if (i>4) break; } - uint16_t length = elm[F("len")] | 1; + uint16_t length = elm["len"] | 1; uint8_t colorOrder = (int)elm[F("order")]; uint8_t skipFirst = elm[F("skip")]; uint16_t start = elm["start"] | 0; @@ -130,8 +130,8 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { uint8_t s = 0; for (JsonObject entry : hw_com) { if (s > WLED_MAX_COLOR_ORDER_MAPPINGS) break; - uint16_t start = entry[F("start")] | 0; - uint16_t len = entry[F("len")] | 0; + uint16_t start = entry["start"] | 0; + uint16_t len = entry["len"] | 0; uint8_t colorOrder = (int)entry[F("order")]; com.add(start, len, colorOrder); s++; @@ -229,29 +229,29 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { if (light_gc_col > 1.5) strip.gammaCorrectCol = true; else if (light_gc_col > 0.5) strip.gammaCorrectCol = false; - JsonObject light_tr = light[F("tr")]; - CJSON(fadeTransition, light_tr[F("mode")]); + JsonObject light_tr = light["tr"]; + CJSON(fadeTransition, light_tr["mode"]); int tdd = light_tr["dur"] | -1; if (tdd >= 0) transitionDelayDefault = tdd * 100; CJSON(strip.paletteFade, light_tr["pal"]); JsonObject light_nl = light["nl"]; - CJSON(nightlightMode, light_nl[F("mode")]); + CJSON(nightlightMode, light_nl["mode"]); byte prev = nightlightDelayMinsDefault; - CJSON(nightlightDelayMinsDefault, light_nl[F("dur")]); + CJSON(nightlightDelayMinsDefault, light_nl["dur"]); if (nightlightDelayMinsDefault != prev) nightlightDelayMins = nightlightDelayMinsDefault; CJSON(nightlightTargetBri, light_nl[F("tbri")]); CJSON(macroNl, light_nl["macro"]); - JsonObject def = doc[F("def")]; + JsonObject def = doc["def"]; CJSON(bootPreset, def["ps"]); CJSON(turnOnAtBoot, def["on"]); // true CJSON(briS, def["bri"]); // 128 JsonObject interfaces = doc["if"]; - JsonObject if_sync = interfaces[F("sync")]; + JsonObject if_sync = interfaces["sync"]; CJSON(udpPort, if_sync[F("port0")]); // 21324 CJSON(udpPort2, if_sync[F("port1")]); // 65506 @@ -289,7 +289,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { CJSON(e131Universe, if_live_dmx[F("uni")]); CJSON(e131SkipOutOfSequence, if_live_dmx[F("seqskip")]); CJSON(DMXAddress, if_live_dmx[F("addr")]); - CJSON(DMXMode, if_live_dmx[F("mode")]); + CJSON(DMXMode, if_live_dmx["mode"]); tdd = if_live[F("timeout")] | -1; if (tdd >= 0) realtimeTimeoutMs = tdd * 100; @@ -581,7 +581,7 @@ void serializeConfig() { if (!bus || bus->getLength()==0) break; JsonObject ins = hw_led_ins.createNestedObject(); ins["start"] = bus->getStart(); - ins[F("len")] = bus->getLength(); + ins["len"] = bus->getLength(); JsonArray ins_pin = ins.createNestedArray("pin"); uint8_t pins[5]; uint8_t nPins = bus->getPins(pins); @@ -591,7 +591,7 @@ void serializeConfig() { ins[F("skip")] = bus->skippedLeds(); ins["type"] = bus->getType() & 0x7F; ins["ref"] = bus->isOffRefreshRequired(); - ins[F("rgbw")] = bus->isRgbw(); + //ins[F("rgbw")] = bus->isRgbw(); } JsonArray hw_com = hw.createNestedArray(F("com")); @@ -601,8 +601,8 @@ void serializeConfig() { if (!entry) break; JsonObject co = hw_com.createNestedObject(); - co[F("start")] = entry->start; - co[F("len")] = entry->len; + co["start"] = entry->start; + co["len"] = entry->len; co[F("order")] = entry->colorOrder; } @@ -649,12 +649,12 @@ void serializeConfig() { light_gc["col"] = (strip.gammaCorrectCol) ? 2.8 : 1.0; JsonObject light_tr = light.createNestedObject("tr"); - light_tr[F("mode")] = fadeTransition; + light_tr["mode"] = fadeTransition; light_tr["dur"] = transitionDelayDefault / 100; light_tr["pal"] = strip.paletteFade; JsonObject light_nl = light.createNestedObject("nl"); - light_nl[F("mode")] = nightlightMode; + light_nl["mode"] = nightlightMode; light_nl["dur"] = nightlightDelayMinsDefault; light_nl[F("tbri")] = nightlightTargetBri; light_nl["macro"] = macroNl; @@ -699,7 +699,7 @@ void serializeConfig() { if_live_dmx[F("uni")] = e131Universe; if_live_dmx[F("seqskip")] = e131SkipOutOfSequence; if_live_dmx[F("addr")] = DMXAddress; - if_live_dmx[F("mode")] = DMXMode; + if_live_dmx["mode"] = DMXMode; if_live[F("timeout")] = realtimeTimeoutMs / 100; if_live[F("maxbri")] = arlsForceMaxBri; diff --git a/wled00/json.cpp b/wled00/json.cpp index 58ce9195..eb3c092c 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -33,7 +33,7 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId) uint16_t start = elem["start"] | seg.start; int stop = elem["stop"] | -1; if (stop < 0) { - uint16_t len = elem[F("len")]; + uint16_t len = elem["len"]; stop = (len > 0) ? start + len : seg.stop; } @@ -281,8 +281,8 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId) JsonObject nl = root["nl"]; nightlightActive = nl["on"] | nightlightActive; - nightlightDelayMins = nl[F("dur")] | nightlightDelayMins; - nightlightMode = nl[F("mode")] | nightlightMode; + nightlightDelayMins = nl["dur"] | nightlightDelayMins; + nightlightMode = nl["mode"] | nightlightMode; nightlightTargetBri = nl[F("tbri")] | nightlightTargetBri; JsonObject udpn = root["udpn"]; @@ -403,7 +403,7 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id, bool fo root["start"] = seg.start; root["stop"] = seg.stop; } - if (!forPreset) root[F("len")] = seg.stop - seg.start; + if (!forPreset) root["len"] = seg.stop - seg.start; root["grp"] = seg.grouping; root[F("spc")] = seg.spacing; root[F("of")] = seg.offset; @@ -465,8 +465,8 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme JsonObject nl = root.createNestedObject("nl"); nl["on"] = nightlightActive; - nl[F("dur")] = nightlightDelayMins; - nl[F("mode")] = nightlightMode; + nl["dur"] = nightlightDelayMins; + nl["mode"] = nightlightMode; nl[F("tbri")] = nightlightTargetBri; if (nightlightActive) { nl[F("rem")] = (nightlightDelayMs - (millis() - nightlightStartTime)) / 1000; // seconds remaining