Merge branch 'async-psave' into dev

jeremypoulter · Oct 13, 2022 · 3841780 · 3841780
2 parents 2440d8e + 5012418
commit 3841780
Show file tree

Hide file tree

Showing 14 changed files with 1,161 additions and 1,117 deletions.
diff --git a/usermods/multi_relay/usermod_multi_relay.h b/usermods/multi_relay/usermod_multi_relay.h
@@ -293,8 +293,8 @@ class MultiRelay : public Usermod {
 
           json[F("stat_t")]  = "~";
           json[F("cmd_t")]   = F("~/command");
-          json[F("pl_off")]  = F("off");
-          json[F("pl_on")]   = F("on");
+          json[F("pl_off")]  = "off";
+          json[F("pl_on")]   = "on";
           json[F("uniq_id")] = uid;
 
           strcpy(buf, mqttDeviceTopic); //max length: 33 + 7 = 40

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
@@ -4106,54 +4106,54 @@ uint16_t mode_dancing_shadows(void)
 
     if (spotlights[i].width <= 1) {
       if (start >= 0 && start < SEGLEN) {
-        SEGMENT.blendPixelColor(start, color, 128); // TODO
+        SEGMENT.blendPixelColor(start, color, 128);
       }
     } else {
       switch (spotlights[i].type) {
         case SPOT_TYPE_SOLID:
           for (size_t j = 0; j < spotlights[i].width; j++) {
             if ((start + j) >= 0 && (start + j) < SEGLEN) {
-              SEGMENT.blendPixelColor(start + j, color, 128); // TODO
+              SEGMENT.blendPixelColor(start + j, color, 128);
             }
           }
         break;
 
         case SPOT_TYPE_GRADIENT:
           for (size_t j = 0; j < spotlights[i].width; j++) {
             if ((start + j) >= 0 && (start + j) < SEGLEN) {
-              SEGMENT.blendPixelColor(start + j, color, cubicwave8(map(j, 0, spotlights[i].width - 1, 0, 255))); // TODO
+              SEGMENT.blendPixelColor(start + j, color, cubicwave8(map(j, 0, spotlights[i].width - 1, 0, 255)));
             }
           }
         break;
 
         case SPOT_TYPE_2X_GRADIENT:
           for (size_t j = 0; j < spotlights[i].width; j++) {
             if ((start + j) >= 0 && (start + j) < SEGLEN) {
-              SEGMENT.blendPixelColor(start + j, color, cubicwave8(2 * map(j, 0, spotlights[i].width - 1, 0, 255))); // TODO
+              SEGMENT.blendPixelColor(start + j, color, cubicwave8(2 * map(j, 0, spotlights[i].width - 1, 0, 255)));
             }
           }
         break;
 
         case SPOT_TYPE_2X_DOT:
           for (size_t j = 0; j < spotlights[i].width; j += 2) {
             if ((start + j) >= 0 && (start + j) < SEGLEN) {
-              SEGMENT.blendPixelColor(start + j, color, 128); // TODO
+              SEGMENT.blendPixelColor(start + j, color, 128);
             }
           }
         break;
 
         case SPOT_TYPE_3X_DOT:
           for (size_t j = 0; j < spotlights[i].width; j += 3) {
             if ((start + j) >= 0 && (start + j) < SEGLEN) {
-              SEGMENT.blendPixelColor(start + j, color, 128); // TODO
+              SEGMENT.blendPixelColor(start + j, color, 128);
             }
           }
         break;
 
         case SPOT_TYPE_4X_DOT:
           for (size_t j = 0; j < spotlights[i].width; j += 4) {
             if ((start + j) >= 0 && (start + j) < SEGLEN) {
-              SEGMENT.blendPixelColor(start + j, color, 128); // TODO
+              SEGMENT.blendPixelColor(start + j, color, 128);
             }
           }
         break;
@@ -4163,7 +4163,7 @@ uint16_t mode_dancing_shadows(void)
 
   return FRAMETIME;
 }
-static const char _data_FX_MODE_DANCING_SHADOWS[] PROGMEM = "Dancing Shadows@!,# of shadows;!,,;!;1d";
+static const char _data_FX_MODE_DANCING_SHADOWS[] PROGMEM = "Dancing Shadows@!,# of shadows;!,!,!;!;1d";
 
 
 /*
@@ -4524,7 +4524,7 @@ uint16_t mode_perlinmove(void) {
 
   return FRAMETIME;
 } // mode_perlinmove()
-static const char _data_FX_MODE_PERLINMOVE[] PROGMEM = "Perlin Move@!,# of pixels,fade rate;,!;!;1d";
+static const char _data_FX_MODE_PERLINMOVE[] PROGMEM = "Perlin Move@!,# of pixels,fade rate;!,!;!;1d";
 
 
 /////////////////////////