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

updates strings to use F()

Browse Source
This commit is contained in:
Dustin Miller 2022-12-31 15:24:35 -06:00 committed by GitHub
parent 4101d7664d
commit 1b4d92007e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
usermods/Analog_Clock/Analog_Clock.h
View File

@ -56,7 +56,7 @@ private:
// runtime // runtime
bool initDone = false; bool initDone = false;
uint32_t lastOverlayDraw = 0; uint32_t lastOverlayDraw = 0;
void validateAndUpdate() { void validateAndUpdate() {
mainSegment.validateAndUpdate(); mainSegment.validateAndUpdate();
@ -110,9 +110,9 @@ private:
static inline uint32_t qadd32(uint32_t c1, uint32_t c2) { static inline uint32_t qadd32(uint32_t c1, uint32_t c2) {
return RGBW32( return RGBW32(
qadd8(R(c1), R(c2)), qadd8(R(c1), R(c2)),
qadd8(G(c1), G(c2)), qadd8(G(c1), G(c2)),
qadd8(B(c1), B(c2)), qadd8(B(c1), B(c2)),
qadd8(W(c1), W(c2)) qadd8(W(c1), W(c2))
); );
} }
@ -166,7 +166,7 @@ public:
double secondP = second(localTime) / 60.0; double secondP = second(localTime) / 60.0;
double minuteP = minute(localTime) / 60.0; double minuteP = minute(localTime) / 60.0;
double hourP = (hour(localTime) % 12) / 12.0 + minuteP / 12.0; double hourP = (hour(localTime) % 12) / 12.0 + minuteP / 12.0;
if (hourMarksEnabled) { if (hourMarksEnabled) {
for (int Led = 0; Led <= 55; Led = Led + 5) for (int Led = 0; Led <= 55; Led = Led + 5)
{ {
@ -174,7 +174,7 @@ public:
setPixelColor(hourmarkled, hourMarkColor); setPixelColor(hourmarkled, hourMarkColor);
} }
} }
if (secondsEnabled) { if (secondsEnabled) {
int16_t secondLed = adjustToSegment(secondP, secondsSegment); int16_t secondLed = adjustToSegment(secondP, secondsSegment);
@ -203,45 +203,45 @@ public:
void addToConfig(JsonObject& root) override { void addToConfig(JsonObject& root) override {
validateAndUpdate(); validateAndUpdate();
JsonObject top = root.createNestedObject("Analog Clock"); JsonObject top = root.createNestedObject(F("Analog Clock"));
top["Overlay Enabled"] = enabled; top[F("Overlay Enabled")] = enabled;
top["First LED (Main Ring)"] = mainSegment.firstLed; top[F("First LED (Main Ring)")] = mainSegment.firstLed;
top["Last LED (Main Ring)"] = mainSegment.lastLed; top[F("Last LED (Main Ring)")] = mainSegment.lastLed;
top["Center/12h LED (Main Ring)"] = mainSegment.centerLed; top[F("Center/12h LED (Main Ring)")] = mainSegment.centerLed;
top["Hour Marks Enabled"] = hourMarksEnabled; top[F("Hour Marks Enabled")] = hourMarksEnabled;
top["Hour Mark Color (RRGGBB)"] = colorToHexString(hourMarkColor); top[F("Hour Mark Color (RRGGBB)")] = colorToHexString(hourMarkColor);
top["Hour Color (RRGGBB)"] = colorToHexString(hourColor); top[F("Hour Color (RRGGBB)")] = colorToHexString(hourColor);
top["Minute Color (RRGGBB)"] = colorToHexString(minuteColor); top[F("Minute Color (RRGGBB)")] = colorToHexString(minuteColor);
top["Show Seconds"] = secondsEnabled; top[F("Show Seconds")] = secondsEnabled;
top["First LED (Seconds Ring)"] = secondsSegment.firstLed; top[F("First LED (Seconds Ring)")] = secondsSegment.firstLed;
top["Last LED (Seconds Ring)"] = secondsSegment.lastLed; top[F("Last LED (Seconds Ring)")] = secondsSegment.lastLed;
top["Center/12h LED (Seconds Ring)"] = secondsSegment.centerLed; top[F("Center/12h LED (Seconds Ring)")] = secondsSegment.centerLed;
top["Second Color (RRGGBB)"] = colorToHexString(secondColor); top[F("Second Color (RRGGBB)")] = colorToHexString(secondColor);
top["Seconds Effect (0-1)"] = secondsEffect; top[F("Seconds Effect (0-1)")] = secondsEffect;
top["Blend Colors"] = blendColors; top[F("Blend Colors")] = blendColors;
} }
bool readFromConfig(JsonObject& root) override { bool readFromConfig(JsonObject& root) override {
JsonObject top = root["Analog Clock"]; JsonObject top = root[F("Analog Clock")];
bool configComplete = !top.isNull(); bool configComplete = !top.isNull();
String color; String color;
configComplete &= getJsonValue(top["Overlay Enabled"], enabled, false); configComplete &= getJsonValue(top[F("Overlay Enabled")], enabled, false);
configComplete &= getJsonValue(top["First LED (Main Ring)"], mainSegment.firstLed, 0); configComplete &= getJsonValue(top[F("First LED (Main Ring)")], mainSegment.firstLed, 0);
configComplete &= getJsonValue(top["Last LED (Main Ring)"], mainSegment.lastLed, 59); configComplete &= getJsonValue(top[F("Last LED (Main Ring)")], mainSegment.lastLed, 59);
configComplete &= getJsonValue(top["Center/12h LED (Main Ring)"], mainSegment.centerLed, 0); configComplete &= getJsonValue(top[F("Center/12h LED (Main Ring)")], mainSegment.centerLed, 0);
configComplete &= getJsonValue(top["Hour Marks Enabled"], hourMarksEnabled, false); configComplete &= getJsonValue(top[F("Hour Marks Enabled")], hourMarksEnabled, false);
configComplete &= getJsonValue(top["Hour Mark Color (RRGGBB)"], color, "FF0000") && hexStringToColor(color, hourMarkColor, 0x0000FF); configComplete &= getJsonValue(top[F("Hour Mark Color (RRGGBB)")], color, F("161616")) && hexStringToColor(color, hourMarkColor, 0x161616);
configComplete &= getJsonValue(top["Hour Color (RRGGBB)"], color, "0000FF") && hexStringToColor(color, hourColor, 0x0000FF); configComplete &= getJsonValue(top[F("Hour Color (RRGGBB)")], color, F("0000FF")) && hexStringToColor(color, hourColor, 0x0000FF);
configComplete &= getJsonValue(top["Minute Color (RRGGBB)"], color, "00FF00") && hexStringToColor(color, minuteColor, 0x00FF00); configComplete &= getJsonValue(top[F("Minute Color (RRGGBB)")], color, F("00FF00")) && hexStringToColor(color, minuteColor, 0x00FF00);
configComplete &= getJsonValue(top["Show Seconds"], secondsEnabled, true); configComplete &= getJsonValue(top[F("Show Seconds")], secondsEnabled, true);
configComplete &= getJsonValue(top["First LED (Seconds Ring)"], secondsSegment.firstLed, 0); configComplete &= getJsonValue(top[F("First LED (Seconds Ring)")], secondsSegment.firstLed, 0);
configComplete &= getJsonValue(top["Last LED (Seconds Ring)"], secondsSegment.lastLed, 59); configComplete &= getJsonValue(top[F("Last LED (Seconds Ring)")], secondsSegment.lastLed, 59);
configComplete &= getJsonValue(top["Center/12h LED (Seconds Ring)"], secondsSegment.centerLed, 0); configComplete &= getJsonValue(top[F("Center/12h LED (Seconds Ring)")], secondsSegment.centerLed, 0);
configComplete &= getJsonValue(top["Second Color (RRGGBB)"], color, "FF0000") && hexStringToColor(color, secondColor, 0xFF0000); configComplete &= getJsonValue(top[F("Second Color (RRGGBB)")], color, F("FF0000")) && hexStringToColor(color, secondColor, 0xFF0000);
configComplete &= getJsonValue(top["Seconds Effect (0-1)"], secondsEffect, 0); configComplete &= getJsonValue(top[F("Seconds Effect (0-1)")], secondsEffect, 0);
configComplete &= getJsonValue(top["Blend Colors"], blendColors, true); configComplete &= getJsonValue(top[F("Blend Colors")], blendColors, true);
if (initDone) { if (initDone) {
validateAndUpdate(); validateAndUpdate();