aboutsummaryrefslogtreecommitdiff
path: root/keyboards/dztech
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2024-02-28 21:47:37 +1100
committerNick Brassel <[email protected]>2024-02-28 21:47:37 +1100
commit4e369d405af6bba1adce6337b2e1b1ea1788566c (patch)
treeb0f020feff1809e37c9e7795d344929ff0bb290a /keyboards/dztech
parent4e04da397ef643f8fcf4afbe1d19f63aee1fc561 (diff)
parentdd1706e468bb18dd7f7ae143de735a5d3be1bfb8 (diff)
downloadqmk_firmware-0.24.0.tar.gz
qmk_firmware-0.24.0.zip
Merge branch 'develop'0.24.0
Diffstat (limited to 'keyboards/dztech')
-rw-r--r--keyboards/dztech/duo_s/config.h1
-rw-r--r--keyboards/dztech/duo_s/info.json3
-rw-r--r--keyboards/dztech/dz60rgb/dz60rgb.c128
-rw-r--r--keyboards/dztech/dz60rgb/v1/config.h59
-rw-r--r--keyboards/dztech/dz60rgb/v1/info.json50
-rw-r--r--keyboards/dztech/dz60rgb/v2/config.h57
-rw-r--r--keyboards/dztech/dz60rgb/v2/info.json33
-rw-r--r--keyboards/dztech/dz60rgb/v2_1/config.h57
-rw-r--r--keyboards/dztech/dz60rgb/v2_1/info.json32
-rw-r--r--keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c124
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v1/config.h59
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v1/info.json50
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v2/config.h57
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v2/info.json35
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v2_1/config.h57
-rw-r--r--keyboards/dztech/dz60rgb_ansi/v2_1/info.json32
-rw-r--r--keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c126
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v1/config.h59
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v1/info.json50
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v2/config.h54
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v2/info.json31
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v2_1/config.h57
-rw-r--r--keyboards/dztech/dz60rgb_wkl/v2_1/info.json32
-rw-r--r--keyboards/dztech/dz64rgb/config.h35
-rw-r--r--keyboards/dztech/dz64rgb/dz64rgb.c130
-rw-r--r--keyboards/dztech/dz64rgb/info.json34
-rw-r--r--keyboards/dztech/dz65rgb/v1/config.h63
-rw-r--r--keyboards/dztech/dz65rgb/v1/info.json40
-rw-r--r--keyboards/dztech/dz65rgb/v1/v1.c2
-rw-r--r--keyboards/dztech/dz65rgb/v2/config.h63
-rw-r--r--keyboards/dztech/dz65rgb/v2/info.json40
-rw-r--r--keyboards/dztech/dz65rgb/v2/v2.c2
-rwxr-xr-xkeyboards/dztech/dz65rgb/v3/config.h59
-rw-r--r--keyboards/dztech/dz65rgb/v3/info.json53
-rwxr-xr-xkeyboards/dztech/dz65rgb/v3/v3.c138
-rw-r--r--keyboards/dztech/endless80/config.h1
-rw-r--r--keyboards/dztech/endless80/info.json3
-rw-r--r--keyboards/dztech/tofu/ii/v1/config.h63
-rw-r--r--keyboards/dztech/tofu/ii/v1/info.json54
-rw-r--r--keyboards/dztech/tofu/ii/v1/v1.c134
-rw-r--r--keyboards/dztech/tofu/jr/v1/config.h64
-rw-r--r--keyboards/dztech/tofu/jr/v1/info.json54
-rw-r--r--keyboards/dztech/tofu/jr/v1/v1.c138
43 files changed, 1096 insertions, 1317 deletions
diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index 361706e576..14d66caf12 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -17,7 +17,6 @@
#pragma once
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
-#define RGBLIGHT_DEFAULT_SPD 15
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json
index 0277675018..ef5af799be 100644
--- a/keyboards/dztech/duo_s/info.json
+++ b/keyboards/dztech/duo_s/info.json
@@ -25,6 +25,9 @@
"rgb_test": true,
"alternating": true,
"twinkle": true
+ },
+ "default": {
+ "speed": 15
}
},
"ws2812": {
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index 826e3502eb..207fccd4f9 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -1,74 +1,74 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_14, D_14, F_14 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_14, A_14, C_14 },
- { 0, B_13, A_13, C_13 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
- { 0, B_15, A_15, C_15 },
- { 0, E_13, D_13, F_13 },
- { 0, B_12, A_12, C_12 },
- { 0, E_15, D_15, F_15 },
- { 0, H_15, G_15, I_15 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 },
- { 0, H_16, G_16, I_16 },
- { 0, K_16, J_16, L_16 }
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index af72678922..130f99d7b7 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -1,60 +1,3 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 63
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json
index 0033c3acc7..8a9801c4f3 100644
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ b/keyboards/dztech/dz60rgb/v1/info.json
@@ -4,7 +4,55 @@
"device_version": "1.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3733",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "sleep": true
},
"matrix_pins": {
"cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 2470e7b3f9..130f99d7b7 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -1,58 +1,3 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 63
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json
index 4801792d98..c3e1837dbd 100644
--- a/keyboards/dztech/dz60rgb/v2/info.json
+++ b/keyboards/dztech/dz60rgb/v2/info.json
@@ -4,7 +4,38 @@
"device_version": "2.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
},
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index 05cfa7d4e1..5d2ea692ed 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -16,59 +16,4 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 63
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json
index 9028f69d4f..1d97037c31 100644
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb/v2_1/info.json
@@ -4,7 +4,37 @@
"device_version": "2.1.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations":{
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
},
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index 5c06922028..cdc5148e11 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -1,72 +1,72 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_14, D_14, F_14 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_13, A_13, C_13 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
- { 0, B_15, A_15, C_15 },
- { 0, E_13, D_13, F_13 },
- { 0, B_12, A_12, C_12 },
- { 0, E_15, D_15, F_15 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 },
- { 0, H_16, G_16, I_16 },
- { 0, K_16, J_16, L_16 }
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 674871ec49..130f99d7b7 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -1,60 +1,3 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 61
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json
index 9c8b271cc9..d09c967d00 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json
@@ -4,7 +4,55 @@
"device_version": "1.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3733",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "sleep": true
},
"matrix_pins": {
"cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index 0b458818bc..130f99d7b7 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -1,58 +1,3 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 61
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json
index cc239f74b3..5769daefef 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json
@@ -4,7 +4,40 @@
"device_version": "2.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_splash": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
},
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index 75ccef8193..7cc462cbae 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -16,59 +16,4 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-// # define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 61
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
index edd27d4577..649ea2e261 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
@@ -4,7 +4,37 @@
"device_version": "2.1.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
},
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index d6506389a6..b5af34be38 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -1,73 +1,73 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
- { 0, H_15, G_15, I_15 },
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_14, D_14, F_14 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_14, A_14, C_14 },
- { 0, B_13, A_13, C_13 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
- { 0, B_15, A_15, C_15 },
- { 0, E_13, D_13, F_13 },
- { 0, B_12, A_12, C_12 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 },
- { 0, H_16, G_16, I_16 },
- { 0, K_16, J_16, L_16 }
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index ac79efd26c..130f99d7b7 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -1,60 +1,3 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 62
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json
index 0a61ae0d83..320d412aae 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json
@@ -4,7 +4,55 @@
"device_version": "1.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3733",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "sleep": true
},
"matrix_pins": {
"cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index a341a18e0d..130f99d7b7 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -1,55 +1,3 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 62
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json
index adc6fb3b4c..f7d6acff0c 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json
@@ -4,7 +4,36 @@
"device_version": "2.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_splash": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
},
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index 13169e21f5..c83555d730 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -16,59 +16,4 @@
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// # define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-# define RGB_MATRIX_LED_COUNT 62
-#endif
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
index cea77d59cf..5a3cc63602 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
@@ -4,7 +4,37 @@
"device_version": "2.1.0"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_splash": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
},
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index edfc7b7171..970fce9d72 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -16,39 +16,8 @@
#pragma once
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+
#define USB_SUSPEND_WAKEUP_DELAY 5000
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define RGB_MATRIX_LED_COUNT 64
-#endif
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
index 561a9727e5..e2512c72a5 100644
--- a/keyboards/dztech/dz64rgb/dz64rgb.c
+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
@@ -17,75 +17,75 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_14, D_14, F_14 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_14, A_14, C_14 },
- { 0, B_13, A_13, C_13 },
- { 0, B_12, A_12, C_12 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
- { 0, B_15, A_15, C_15 },
- { 0, E_13, D_13, F_13 },
- { 0, K_15, J_15, L_15 },
- { 0, E_15, D_15, F_15 },
- { 0, H_15, G_15, I_15 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 },
- { 0, H_16, G_16, I_16 },
- { 0, K_16, J_16, L_16 }
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json
index ca2dd46bd2..b568170e14 100644
--- a/keyboards/dztech/dz64rgb/info.json
+++ b/keyboards/dztech/dz64rgb/info.json
@@ -9,7 +9,39 @@
"device_version": "0.0.2"
},
"rgb_matrix": {
- "driver": "is31fl3733"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3733",
+ "sleep": true
},
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index b9203346dd..9cf952815d 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -15,64 +15,5 @@
*/
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-# define DRIVER_1_LED_TOTAL 35
-# define DRIVER_2_LED_TOTAL 33
-# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json
index 6b418b8cd6..98c69134eb 100644
--- a/keyboards/dztech/dz65rgb/v1/info.json
+++ b/keyboards/dztech/dz65rgb/v1/info.json
@@ -4,7 +4,45 @@
"device_version": "1.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3731"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3731",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "max_brightness": 200,
+ "sleep": true
},
"matrix_pins": {
"cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"],
diff --git a/keyboards/dztech/dz65rgb/v1/v1.c b/keyboards/dztech/dz65rgb/v1/v1.c
index a0a355e120..6e8cf96e4c 100644
--- a/keyboards/dztech/dz65rgb/v1/v1.c
+++ b/keyboards/dztech/dz65rgb/v1/v1.c
@@ -16,7 +16,7 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{ 0, C8_8, C7_8, C6_8 },
{ 0, C9_8, C7_7, C6_7 },
{ 0, C9_7, C8_7, C6_6 },
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index 600687c245..911d21179d 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -15,64 +15,5 @@
*/
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-# define DRIVER_1_LED_TOTAL 35
-# define DRIVER_2_LED_TOTAL 33
-# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-#endif
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json
index e52584f724..16919905d8 100644
--- a/keyboards/dztech/dz65rgb/v2/info.json
+++ b/keyboards/dztech/dz65rgb/v2/info.json
@@ -4,7 +4,45 @@
"device_version": "2.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3731"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3731",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "max_brightness": 200,
+ "sleep": true
},
"matrix_pins": {
"cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/dztech/dz65rgb/v2/v2.c b/keyboards/dztech/dz65rgb/v2/v2.c
index 7754bc4ee5..a9f7fc104f 100644
--- a/keyboards/dztech/dz65rgb/v2/v2.c
+++ b/keyboards/dztech/dz65rgb/v2/v2.c
@@ -16,7 +16,7 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{ 0, C8_8, C7_8, C6_8 },
{ 0, C9_8, C7_7, C6_7 },
{ 0, C9_7, C8_7, C6_6 },
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index 1398a378f8..0c4d1c9d27 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -16,63 +16,8 @@
#pragma once
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define USB_SUSPEND_WAKEUP_DELAY 5000
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-# define ENABLE_RGB_MATRIX_SPLASH
-# define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-# define RGB_MATRIX_LED_COUNT 68
-# define DRIVER_INDICATOR_LED_TOTAL 0
#endif
diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json
index ccc24b724e..ea7390ee9e 100644
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ b/keyboards/dztech/dz65rgb/v3/info.json
@@ -4,7 +4,58 @@
"device_version": "3.0.0"
},
"rgb_matrix": {
- "driver": "is31fl3741"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3741",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "sleep": true
},
"matrix_pins": {
"cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
index 0fb8ba49de..bf54a8cdfc 100755
--- a/keyboards/dztech/dz65rgb/v3/v3.c
+++ b/keyboards/dztech/dz65rgb/v3/v3.c
@@ -18,79 +18,79 @@
#ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
- {0, CS21_SW8, CS20_SW8, CS19_SW8},
- {0, CS24_SW1, CS23_SW1, CS22_SW1},
- {0, CS24_SW2, CS23_SW2, CS22_SW2},
- {0, CS24_SW3, CS23_SW3, CS22_SW3},
- {0, CS24_SW4, CS23_SW4, CS22_SW4},
- {0, CS24_SW5, CS23_SW5, CS22_SW5},
- {0, CS24_SW6, CS23_SW6, CS22_SW6},
- {0, CS24_SW7, CS23_SW7, CS22_SW7},
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
+ {0, SW8_CS21, SW8_CS20, SW8_CS19},
+ {0, SW1_CS24, SW1_CS23, SW1_CS22},
+ {0, SW2_CS24, SW2_CS23, SW2_CS22},
+ {0, SW3_CS24, SW3_CS23, SW3_CS22},
+ {0, SW4_CS24, SW4_CS23, SW4_CS22},
+ {0, SW5_CS24, SW5_CS23, SW5_CS22},
+ {0, SW6_CS24, SW6_CS23, SW6_CS22},
+ {0, SW7_CS24, SW7_CS23, SW7_CS22},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS30_SW1, CS29_SW1, CS28_SW1},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
- {0, CS30_SW5, CS29_SW5, CS28_SW5},
- {0, CS30_SW6, CS29_SW6, CS28_SW6},
- {0, CS30_SW7, CS29_SW7, CS28_SW7},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW1_CS30, SW1_CS29, SW1_CS28},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
+ {0, SW5_CS30, SW5_CS29, SW5_CS28},
+ {0, SW6_CS30, SW6_CS29, SW6_CS28},
+ {0, SW7_CS30, SW7_CS29, SW7_CS28},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS33_SW1, CS32_SW1, CS31_SW1},
- {0, CS33_SW2, CS32_SW2, CS31_SW2},
- {0, CS33_SW3, CS32_SW3, CS31_SW3},
- {0, CS33_SW4, CS32_SW4, CS31_SW4},
- {0, CS33_SW5, CS32_SW5, CS31_SW5},
- {0, CS33_SW7, CS32_SW7, CS31_SW7},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW1_CS33, SW1_CS32, SW1_CS31},
+ {0, SW2_CS33, SW2_CS32, SW2_CS31},
+ {0, SW3_CS33, SW3_CS32, SW3_CS31},
+ {0, SW4_CS33, SW4_CS32, SW4_CS31},
+ {0, SW5_CS33, SW5_CS32, SW5_CS31},
+ {0, SW7_CS33, SW7_CS32, SW7_CS31},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS36_SW1, CS35_SW1, CS34_SW1},
- {0, CS36_SW2, CS35_SW2, CS34_SW2},
- {0, CS36_SW3, CS35_SW3, CS34_SW3},
- {0, CS36_SW4, CS35_SW4, CS34_SW4},
- {0, CS36_SW5, CS35_SW5, CS34_SW5},
- {0, CS36_SW7, CS35_SW7, CS34_SW7},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW1_CS36, SW1_CS35, SW1_CS34},
+ {0, SW2_CS36, SW2_CS35, SW2_CS34},
+ {0, SW3_CS36, SW3_CS35, SW3_CS34},
+ {0, SW4_CS36, SW4_CS35, SW4_CS34},
+ {0, SW5_CS36, SW5_CS35, SW5_CS34},
+ {0, SW7_CS36, SW7_CS35, SW7_CS34},
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS39_SW1, CS38_SW1, CS37_SW1},
- {0, CS39_SW2, CS38_SW2, CS37_SW2},
- {0, CS39_SW3, CS38_SW3, CS37_SW3},
- {0, CS39_SW4, CS38_SW4, CS37_SW4},
- {0, CS39_SW5, CS38_SW5, CS37_SW5},
- {0, CS39_SW7, CS38_SW7, CS37_SW7}
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW1_CS39, SW1_CS38, SW1_CS37},
+ {0, SW2_CS39, SW2_CS38, SW2_CS37},
+ {0, SW3_CS39, SW3_CS38, SW3_CS37},
+ {0, SW4_CS39, SW4_CS38, SW4_CS37},
+ {0, SW5_CS39, SW5_CS38, SW5_CS37},
+ {0, SW7_CS39, SW7_CS38, SW7_CS37}
};
led_config_t g_led_config = { {
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index a8851d8913..8d6b35eae4 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -16,4 +16,3 @@
#pragma once
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
-#define RGBLIGHT_DEFAULT_SPD 10
diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json
index 2391faf495..4572b091fa 100644
--- a/keyboards/dztech/endless80/info.json
+++ b/keyboards/dztech/endless80/info.json
@@ -37,6 +37,9 @@
"rgb_test": true,
"alternating": true,
"twinkle": true
+ },
+ "default": {
+ "speed": 10
}
},
"processor": "atmega32u4",
diff --git a/keyboards/dztech/tofu/ii/v1/config.h b/keyboards/dztech/tofu/ii/v1/config.h
index 36741e1168..45576fcdac 100644
--- a/keyboards/dztech/tofu/ii/v1/config.h
+++ b/keyboards/dztech/tofu/ii/v1/config.h
@@ -22,66 +22,9 @@
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
+
#ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define USB_SUSPEND_WAKEUP_DELAY 5000
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-# define ENABLE_RGB_MATRIX_SPLASH
-# define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-# define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
-# define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
-# define DRIVER_1_LED_TOTAL 46
-# define DRIVER_2_LED_TOTAL 20
-# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#endif
diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json
index 2eac06f6fd..60ccc5ec9b 100644
--- a/keyboards/dztech/tofu/ii/v1/info.json
+++ b/keyboards/dztech/tofu/ii/v1/info.json
@@ -16,6 +16,54 @@
},
"processor": "RP2040",
"rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
"driver": "is31fl3737",
"layout": [
{"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
@@ -84,7 +132,11 @@
{"flags": 1, "matrix": [4, 12], "x": 195, "y": 64},
{"flags": 1, "matrix": [4, 13], "x": 210, "y": 64},
{"flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
- ]
+ ],
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "max_brightness": 180,
+ "sleep": true
},
"usb": {
"device_version": "1.0.0",
diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c
index 8baf0235bd..15589096df 100644
--- a/keyboards/dztech/tofu/ii/v1/v1.c
+++ b/keyboards/dztech/tofu/ii/v1/v1.c
@@ -17,77 +17,77 @@
#ifdef RGB_MATRIX_ENABLE
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
- { 1, K_12, J_12, L_12 },
- { 1, K_11, J_11, L_11 },
- { 1, K_10, J_10, L_10 },
- { 1, K_9, J_9, L_9 },
- { 1, K_8, J_8, L_8 },
- { 1, K_7, J_7, L_7 },
- { 1, K_6, J_6, L_6 },
- { 1, K_5, J_5, L_5 },
- { 1, K_4, J_4, L_4 },
- { 1, K_3, J_3, L_3 },
- { 1, K_2, J_2, L_2 },
- { 1, K_1, J_1, L_1 },
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
+ { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
- { 0, B_12, A_12, C_12 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
- { 1, H_6, G_6, I_6 },
- { 1, H_5, G_5, I_5 },
- { 1, H_4, G_4, I_4 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
- { 0, K_9, J_9, L_9 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_7, J_7, L_7 },
- { 0, K_4, J_4, L_4 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
};
bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/dztech/tofu/jr/v1/config.h b/keyboards/dztech/tofu/jr/v1/config.h
index 74e5ed0848..bc559ee6f3 100644
--- a/keyboards/dztech/tofu/jr/v1/config.h
+++ b/keyboards/dztech/tofu/jr/v1/config.h
@@ -15,6 +15,7 @@
*/
#pragma once
+
#define I2C1_SDA_PIN GP2
#define I2C1_SCL_PIN GP3
#define I2C_DRIVER I2CD1
@@ -22,66 +23,9 @@
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
+
#ifdef RGB_MATRIX_ENABLE
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define USB_SUSPEND_WAKEUP_DELAY 5000
-# define RGB_MATRIX_KEYPRESSES
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-# define ENABLE_RGB_MATRIX_SPLASH
-# define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-# define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
-# define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
-# define DRIVER_1_LED_TOTAL 48
-# define DRIVER_2_LED_TOTAL 20
-# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#endif
diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json
index 1460350d73..12930f65d0 100644
--- a/keyboards/dztech/tofu/jr/v1/info.json
+++ b/keyboards/dztech/tofu/jr/v1/info.json
@@ -16,6 +16,54 @@
"rows": ["GP29", "GP28", "GP27", "GP26", "GP22"]
},
"rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
"driver": "is31fl3737",
"layout": [
{"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
@@ -86,7 +134,11 @@
{"flags": 1, "matrix": [4, 12], "x": 195, "y": 64},
{"flags": 1, "matrix": [4, 13], "x": 210, "y": 64},
{"flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
- ]
+ ],
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "max_brightness": 180,
+ "sleep": true
},
"usb": {
"device_version": "1.0.0",
diff --git a/keyboards/dztech/tofu/jr/v1/v1.c b/keyboards/dztech/tofu/jr/v1/v1.c
index 474134cb5e..046c46458e 100644
--- a/keyboards/dztech/tofu/jr/v1/v1.c
+++ b/keyboards/dztech/tofu/jr/v1/v1.c
@@ -18,79 +18,79 @@
#ifdef RGB_MATRIX_ENABLE
-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
- { 1, K_12, J_12, L_12 },
- { 1, K_11, J_11, L_11 },
- { 1, K_10, J_10, L_10 },
- { 1, K_9, J_9, L_9 },
- { 1, K_8, J_8, L_8 },
- { 1, K_7, J_7, L_7 },
- { 1, K_6, J_6, L_6 },
- { 1, K_5, J_5, L_5 },
- { 1, K_4, J_4, L_4 },
- { 1, K_3, J_3, L_3 },
- { 1, K_2, J_2, L_2 },
- { 1, K_1, J_1, L_1 },
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
+ { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
- { 0, B_12, A_12, C_12 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
- { 1, H_6, G_6, I_6 },
- { 1, H_5, G_5, I_5 },
- { 1, H_4, G_4, I_4 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_7, J_7, L_7 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
};
bool rgb_matrix_indicators_kb(void) {