summary refs log tree commit diff
path: root/keyboards/splitkb
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-06-18 14:39:07 +1000
committerGitHub <noreply@github.com>2023-06-18 14:39:07 +1000
commitb1783db4eacacaf8181cfbce13146db1941486ba (patch)
treed464d835a882fa7b2c205eb0b2d73f7ddf0b7145 /keyboards/splitkb
parent7178645be79510eb623098bccbf1724ff9970edc (diff)
Move `RGBLED_NUM` to data driven (#21278)
Diffstat (limited to 'keyboards/splitkb')
-rw-r--r--keyboards/splitkb/aurora/lily58/rev1/config.h2
-rw-r--r--keyboards/splitkb/aurora/sweep/rev1/config.h2
-rw-r--r--keyboards/splitkb/kyria/rev1/config.h4
-rw-r--r--keyboards/splitkb/kyria/rev1/info.json1
-rw-r--r--keyboards/splitkb/kyria/rev2/config.h4
-rw-r--r--keyboards/splitkb/kyria/rev2/info.json1
-rw-r--r--keyboards/splitkb/kyria/rev3/config.h2
-rw-r--r--keyboards/splitkb/zima/config.h1
-rw-r--r--keyboards/splitkb/zima/info.json1
9 files changed, 8 insertions, 10 deletions
diff --git a/keyboards/splitkb/aurora/lily58/rev1/config.h b/keyboards/splitkb/aurora/lily58/rev1/config.h
index 2e19c5d438..1356c62ea1 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/config.h
+++ b/keyboards/splitkb/aurora/lily58/rev1/config.h
@@ -28,7 +28,7 @@
 
 // Not yet available in `info.json`
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 68
 #    define RGB_MATRIX_SPLIT { 34, 34 }
 #    define SPLIT_TRANSPORT_MIRROR
 #endif
diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
index 5f58760e6a..a3b2cc893e 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/config.h
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -28,7 +28,7 @@
 
 // Not yet available in `info.json`
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 46
 #    define RGB_MATRIX_SPLIT { 23, 23 }
 #    define SPLIT_TRANSPORT_MIRROR
 #endif
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 4ee4e6ae61..6c21b12a84 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -41,8 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SOFT_SERIAL_PIN D2
 #endif
 
-#define RGBLED_NUM 20
-
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
@@ -51,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB matrix support */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
+#    define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
 #    define RGB_MATRIX_SPLIT { 10, 10 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 970f759d23..089ce40216 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -5,6 +5,7 @@
         "device_version": "0.0.1"
     },
     "rgblight": {
+        "led_count": 20,
         "split_count": [10, 10]
     },
     "rgb_matrix": {
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 2b05499965..198688772b 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -47,8 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define SOFT_SERIAL_PIN D2
 #endif
 
-#define RGBLED_NUM 20
-
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
@@ -57,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB matrix support */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
+#    define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
 #    define RGB_MATRIX_SPLIT { 10, 10 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index d37794164a..95910a2651 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -5,6 +5,7 @@
         "device_version": "0.0.2"
     },
     "rgblight": {
+        "led_count": 20,
         "split_count": [10, 10]
     },
     "rgb_matrix": {
diff --git a/keyboards/splitkb/kyria/rev3/config.h b/keyboards/splitkb/kyria/rev3/config.h
index ca97f11eea..5168e8678e 100644
--- a/keyboards/splitkb/kyria/rev3/config.h
+++ b/keyboards/splitkb/kyria/rev3/config.h
@@ -28,7 +28,7 @@
 
 // Not yet available in `info.json`
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#    define RGB_MATRIX_LED_COUNT 62
 #    define RGB_MATRIX_SPLIT { 31, 31 }
 #    define SPLIT_TRANSPORT_MIRROR
 #endif
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index e4d400198c..0f6fbbb8f4 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AUDIO_CLICKY
 #define NO_MUSIC_MODE
 
-#define RGBLED_NUM         5
 #define RGBLIGHT_HUE_STEP  8
 #define RGBLIGHT_SAT_STEP  8
 #define RGBLIGHT_VAL_STEP  8
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index 54de6da046..6fabc14745 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -9,6 +9,7 @@
         "device_version": "0.0.1"
     },
     "rgblight": {
+        "led_count": 5,
         "sleep": true
     },
     "ws2812": {