aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox_ez/config.h2
-rw-r--r--keyboards/ergodox_ez/info.json3
-rw-r--r--keyboards/ergodox_ez/shine/rgblight_custom.c4
-rw-r--r--keyboards/handwired/tennie/config.h2
-rw-r--r--keyboards/handwired/tennie/keyboard.json3
-rw-r--r--keyboards/oddforge/vea/ws2812_custom.c2
-rw-r--r--keyboards/rgbkb/pan/pan.c2
-rw-r--r--keyboards/westfoxtrot/aanzee/config.h2
-rw-r--r--keyboards/westfoxtrot/aanzee/keyboard.json3
9 files changed, 10 insertions, 13 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 8209c21dba..3688e00785 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -73,8 +73,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* fix space cadet rollover issue */
#define DISABLE_SPACE_CADET_ROLLOVER
-#define RGBW
-
/*
* The debounce filtering reports a key/switch change directly,
* without any extra delay. After that the debounce logic will filter
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index f2495a409c..a560e97a0b 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -27,7 +27,8 @@
"debounce_type": "sym_eager_pr"
},
"ws2812": {
- "pin": "D7"
+ "pin": "D7",
+ "rgbw": true
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/ergodox_ez/shine/rgblight_custom.c b/keyboards/ergodox_ez/shine/rgblight_custom.c
index feac50cba0..29060e76fc 100644
--- a/keyboards/ergodox_ez/shine/rgblight_custom.c
+++ b/keyboards/ergodox_ez/shine/rgblight_custom.c
@@ -25,7 +25,7 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) {
uint16_t length = 0;
int i = 0;
int j = 0;
-# ifdef RGBW
+# ifdef WS2812_RGBW
int bytes_per_led = 4;
# else
int bytes_per_led = 3;
@@ -52,7 +52,7 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) {
data[j++] = data_byte[0];
data[j++] = data_byte[1];
data[j++] = data_byte[2];
-#ifdef RGBW
+#ifdef WS2812_RGBW
data[j++] = data_byte[3];
#endif
}
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index 7c77f53a82..dcbcfeaaa8 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define RGBW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/handwired/tennie/keyboard.json b/keyboards/handwired/tennie/keyboard.json
index 34e6676c95..36c1266d50 100644
--- a/keyboards/handwired/tennie/keyboard.json
+++ b/keyboards/handwired/tennie/keyboard.json
@@ -26,7 +26,8 @@
}
},
"ws2812": {
- "pin": "D1"
+ "pin": "D1",
+ "rgbw": true
},
"features": {
"bootmagic": true,
diff --git a/keyboards/oddforge/vea/ws2812_custom.c b/keyboards/oddforge/vea/ws2812_custom.c
index a037b88b3e..317f98130b 100644
--- a/keyboards/oddforge/vea/ws2812_custom.c
+++ b/keyboards/oddforge/vea/ws2812_custom.c
@@ -1,7 +1,7 @@
#include "ws2812.h"
#include "i2c_master.h"
-#ifdef RGBW
+#ifdef WS2812_RGBW
# error "RGBW not supported"
#endif
diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c
index 191ff1ac1f..401831e0e2 100644
--- a/keyboards/rgbkb/pan/pan.c
+++ b/keyboards/rgbkb/pan/pan.c
@@ -42,7 +42,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
rgb_matrix_ws2812_array[i].g = g;
rgb_matrix_ws2812_array[i].b = b;
}
-# ifdef RGBW
+# ifdef WS2812_RGBW
convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]);
# endif
}
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index c024f9d8d9..cd1f84bc1f 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define RGBW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/westfoxtrot/aanzee/keyboard.json b/keyboards/westfoxtrot/aanzee/keyboard.json
index 7a12a3e52e..898fe9e62b 100644
--- a/keyboards/westfoxtrot/aanzee/keyboard.json
+++ b/keyboards/westfoxtrot/aanzee/keyboard.json
@@ -52,7 +52,8 @@
}
},
"ws2812": {
- "pin": "E6"
+ "pin": "E6",
+ "rgbw": true
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",