lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor F() fixes.

Browse Source
This commit is contained in:
Blaz Kristan 2021-03-08 07:53:27 +01:00
parent 536be76ecb
commit 0892eb271d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/cfg.cpp
View File

@ -30,8 +30,8 @@ void deserializeConfig() {
return; return;
} }
//int rev_major = doc["rev"][0]; // 1 //int rev_major = doc[F("rev")][0]; // 1
//int rev_minor = doc["rev"][1]; // 0 //int rev_minor = doc[F("rev")][1]; // 0
//long vid = doc[F("vid")]; // 2010020 //long vid = doc[F("vid")]; // 2010020
@ -127,7 +127,7 @@ void deserializeConfig() {
//(this shouldn't have been in ins obj. but remains here for compatibility) //(this shouldn't have been in ins obj. but remains here for compatibility)
skipFirstLed |= skipFirst = (bool) elm[F("skip")]; skipFirstLed |= skipFirst = (bool) elm[F("skip")];
uint8_t ledType = elm[F("type")] | TYPE_WS2812_RGB; uint8_t ledType = elm[F("type")] | TYPE_WS2812_RGB;
bool reversed = elm["rev"]; bool reversed = elm[F("rev")];
//RGBW mode is enabled if at least one of the strips is RGBW //RGBW mode is enabled if at least one of the strips is RGBW
if ((bool)elm[F("rgbw")]) SET_BIT(ledType,7); else UNSET_BIT(ledType,7); // hack bit 7 to indicate RGBW (as an override if necessary) if ((bool)elm[F("rgbw")]) SET_BIT(ledType,7); else UNSET_BIT(ledType,7); // hack bit 7 to indicate RGBW (as an override if necessary)
useRGBW |= (bool)elm[F("rgbw")]; useRGBW |= (bool)elm[F("rgbw")];
@ -176,7 +176,7 @@ void deserializeConfig() {
rlyPin = -1; rlyPin = -1;
} }
if (relay.containsKey("rev")) { if (relay.containsKey("rev")) {
rlyMde = !relay["rev"]; rlyMde = !relay[F("rev")];
} }
//int hw_status_pin = hw[F("status")][F("pin")]; // -1 //int hw_status_pin = hw[F("status")][F("pin")]; // -1

4
wled00/json.cpp
View File

@ -89,7 +89,7 @@ void deserializeSegment(JsonObject elem, byte it)
//if (pal != seg.palette && pal < strip.getPaletteCount()) strip.setPalette(pal); //if (pal != seg.palette && pal < strip.getPaletteCount()) strip.setPalette(pal);
seg.setOption(SEG_OPTION_SELECTED, elem[F("sel")] | seg.getOption(SEG_OPTION_SELECTED)); seg.setOption(SEG_OPTION_SELECTED, elem[F("sel")] | seg.getOption(SEG_OPTION_SELECTED));
seg.setOption(SEG_OPTION_REVERSED, elem["rev"] | seg.getOption(SEG_OPTION_REVERSED)); seg.setOption(SEG_OPTION_REVERSED, elem[F("rev")] | seg.getOption(SEG_OPTION_REVERSED));
seg.setOption(SEG_OPTION_MIRROR , elem[F("mi")] | seg.getOption(SEG_OPTION_MIRROR )); seg.setOption(SEG_OPTION_MIRROR , elem[F("mi")] | seg.getOption(SEG_OPTION_MIRROR ));
//temporary, strip object gets updated via colorUpdated() //temporary, strip object gets updated via colorUpdated()
@ -329,7 +329,7 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id, bool fo
root[F("ix")] = seg.intensity; root[F("ix")] = seg.intensity;
root[F("pal")] = seg.palette; root[F("pal")] = seg.palette;
root[F("sel")] = seg.isSelected(); root[F("sel")] = seg.isSelected();
root["rev"] = seg.getOption(SEG_OPTION_REVERSED); root[F("rev")] = seg.getOption(SEG_OPTION_REVERSED);
root[F("mi")] = seg.getOption(SEG_OPTION_MIRROR); root[F("mi")] = seg.getOption(SEG_OPTION_MIRROR);
} }

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2103074 #define VERSION 2103080
//uncomment this if you have a "my_config.h" file you'd like to use //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG