Fixed pressed color for LEDs

thnikk · Oct 7, 2022 · 0159beb · 0159beb
1 parent 6b0b32c
commit 0159beb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -59,10 +59,18 @@ build_flags = -Dnumkeys=6 -Dnumleds=1 -Dneopin=PIN_NEOPIXEL -DTOUCH -DQTPY
 ## New xiao based models
 [env:mini-xiao]
 board = seeed_xiao
+build_flags = -Dnumkeys=2 -Dnumleds=2 -Dneopin=10 -DTOUCH -DXIAO -DLED_TYPE=NEO_RGB
+
+[env:mini-xiao-w]
+board = seeed_xiao
 build_flags = -Dnumkeys=2 -Dnumleds=2 -Dneopin=10 -DTOUCH -DXIAO -DLED_TYPE=NEO_RGBW 
 
 [env:mega-xiao]
 board = seeed_xiao
+build_flags = -Dnumkeys=4 -Dnumleds=2 -Dneopin=10 -DTOUCH -DXIAO -DLED_TYPE=NEO_GRB
+
+[env:mega-xiao-w]
+board = seeed_xiao
 build_flags = -Dnumkeys=4 -Dnumleds=2 -Dneopin=10 -DTOUCH -DXIAO -DLED_TYPE=NEO_GRBW
 
 [env:4k-mega-xiao]

diff --git a/src/main.cpp b/src/main.cpp
@@ -277,11 +277,11 @@ void wheel(){
     static uint8_t hue;
 #if numleds == 1
     if (anyPressed == 0) pixels.setPixelColor(0, pixels.ColorHSV(hue*hsv_mult, 255, b));
-    else pixels.setPixelColor(0, pixels.Color(255, 255, b));
+    else pixels.setPixelColor(0, pixels.ColorHSV(255, 0, b));
 #else
     for(uint8_t i = 0; i < numleds; i++) {
         if (pressed[i]) pixels.setPixelColor(i, pixels.ColorHSV((hue+(i*20))*hsv_mult, 255, b));
-        else pixels.setPixelColor(i, pixels.Color(255, 255, b));
+        else pixels.setPixelColor(i, pixels.ColorHSV(255, 0, b));
     }
 #endif
     hue--;
@@ -294,7 +294,7 @@ void highlightSelected(){
     uint8_t hue = (255/numkeys);
     for(uint8_t i = 0; i < numkeys; i++) {
         pixels.setPixelColor(i, pixels.ColorHSV(hue*hsv_mult, 255, b));
-        if (i == selected) pixels.setPixelColor(i, pixels.Color(255, 255, b)); 
+        if (i == selected) pixels.setPixelColor(i, pixels.ColorHSV(255, 0, b)); 
     }
 #if numleds == 1
     if (anyPressed == 0) pixels.setPixelColor(0, pixels.ColorHSV(hue*hsv_mult, 255, b));
@@ -345,11 +345,11 @@ void custom(){
     for(int i = 0; i < numkeys; i++) {
         // adjust LED order for special keypads
         if (pressed[i]) pixels.setPixelColor(i, pixels.ColorHSV(custColor[i]*hsv_mult, 255, b));
-        else pixels.setPixelColor(i, pixels.Color(255, 255, 255));
+        else pixels.setPixelColor(i, pixels.ColorHSV(255, 0, b));
     }
 #if numleds == 1
     if (anyPressed == 0) pixels.setPixelColor(0, pixels.ColorHSV(custColor[0]*hsv_mult, 255, b));
-    else pixels.setPixelColor(0, pixels.Color(255, 255, 255));
+    else pixels.setPixelColor(0, pixels.ColorHSV(255, 0, b));
 #endif
     pixels.show();
 }
@@ -382,11 +382,11 @@ void bps(){
 
     for(int i = 0; i < numleds; i++) {
         if (pressed[i]) pixels.setPixelColor(i, pixels.ColorHSV((finalColor+100)*hsv_mult, 255, b));
-        else pixels.setPixelColor(i, pixels.Color(255, 255, b));
+        else pixels.setPixelColor(i, pixels.ColorHSV(255, 0, b));
     }
 #if numleds == 1
     if (anyPressed == 0) pixels.setPixelColor(0, pixels.ColorHSV((finalColor+100)*hsv_mult, 255, b));
-    else pixels.setPixelColor(0, pixels.Color(255, 255, b));
+    else pixels.setPixelColor(0, pixels.ColorHSV(255, 0, b));
 #endif
     //FastLED.show();
     pixels.show();