Minor bug fix for palette label in UI. A few more palette files.

jake-b · Dec 18, 2016 · 9424a13 · 9424a13
1 parent 2b11646
commit 9424a13
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/colormodes.h b/colormodes.h
@@ -207,8 +207,6 @@ void palette_anims() {
 
       // Send current palette name to the UI.
       String name = getPaletteNameWithIndex(currentPaletteIndex);
-//      name.insert(0, "p");
-      //DBG_OUTPUT_PORT.println("p"+name);
       webSocket.broadcastTXT("p"+name);
     }
   }
@@ -230,10 +228,7 @@ void palette_anims() {
 
       // Send current palette name to the UI.
       String name = getPaletteNameWithIndex(currentPaletteIndex);
-      //name.insert(0, "p");
-      //DBG_OUTPUT_PORT.println("p"+name);
-      webSocket.broadcastTXT("p"+name);
-
+      webSocket.broadcastTXT("p"+name);      
       FillLEDsFromPaletteColors(targetPalette,startIndex);
     } else {
       FillLEDsFromPaletteColors(targetPalette,startIndex, wipePos);

diff --git a/data/palettes/Green_White_Red.bin b/data/palettes/Green_White_Red.bin
diff --git a/data/palettes/bhw1_greenie.bin b/data/palettes/bhw1_greenie.bin
diff --git a/data/palettes/bhw2_xmas.bin b/data/palettes/bhw2_xmas.bin
diff --git a/request_handlers.h b/request_handlers.h
@@ -379,10 +379,16 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length
             if (settings.palette_ndx >= numberOfPalettes) {
               settings.palette_ndx = 0;              
             }
-            currentPaletteIndex = settings.palette_ndx;
-            DBG_OUTPUT_PORT.printf("Next palette: %d\n", settings.palette_ndx);            
+
+            targetPaletteIndex = settings.palette_ndx;
             loadPaletteFromFile(settings.palette_ndx, &targetPalette);
-            currentPalette = targetPalette;          
+
+            if (settings.glitter_wipe_on) {
+              wipeInProgress = true;
+            }
+
+            DBG_OUTPUT_PORT.printf("Next palette: %d\n", settings.palette_ndx);            
+
           } else if (payload[1] == 'r') {
             DBG_OUTPUT_PORT.printf("Randomize palette.\n");
             settings.palette_ndx = -1;