From a5f1438f58d42a452aaeb2df4cc0b4e01b79608e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 4 Jan 2024 06:00:47 +0000 Subject: [PATCH] Migrate RGB Matrix config to info.json - C (#22807) --- keyboards/canary/canary60rgb/info.json | 35 ++++++++- .../canary/canary60rgb/keymaps/via/config.h | 2 +- keyboards/canary/canary60rgb/v1/config.h | 24 +----- keyboards/capsunlocked/cu80/v2/ansi/config.h | 8 -- keyboards/capsunlocked/cu80/v2/iso/config.h | 8 -- keyboards/checkerboards/quark_lp/config.h | 28 ------- keyboards/checkerboards/quark_lp/info.json | 23 +++++- keyboards/cherrybstudio/cb87rgb/config.h | 70 ------------------ keyboards/cherrybstudio/cb87rgb/info.json | 49 +++++++++++- keyboards/chosfox/cf81/config.h | 8 -- keyboards/chosfox/cf81/info.json | 4 +- keyboards/chromatonemini/config.h | 10 +-- keyboards/chromatonemini/info.json | 3 +- keyboards/churrosoft/deck8/rgb/config.h | 74 ------------------- keyboards/churrosoft/deck8/rgb/info.json | 54 +++++++++++++- keyboards/clickety_split/leeloo/rev2/config.h | 22 ------ .../clickety_split/leeloo/rev2/info.json | 6 +- keyboards/clickety_split/leeloo/rev3/config.h | 22 ------ .../clickety_split/leeloo/rev3/info.json | 6 +- keyboards/controllerworks/city42/config.h | 4 +- keyboards/controllerworks/mini36/config.h | 3 - keyboards/controllerworks/mini36/info.json | 3 +- keyboards/controllerworks/mini42/config.h | 1 - keyboards/cxt_studio/config.h | 25 ------- keyboards/cxt_studio/info.json | 49 ++++++++---- 25 files changed, 211 insertions(+), 330 deletions(-) delete mode 100644 keyboards/capsunlocked/cu80/v2/ansi/config.h delete mode 100644 keyboards/capsunlocked/cu80/v2/iso/config.h delete mode 100644 keyboards/cherrybstudio/cb87rgb/config.h delete mode 100644 keyboards/churrosoft/deck8/rgb/config.h delete mode 100644 keyboards/clickety_split/leeloo/rev2/config.h delete mode 100644 keyboards/clickety_split/leeloo/rev3/config.h diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index 7f19520ac3..fc973b8810 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json @@ -30,7 +30,40 @@ "pin": "B6" }, "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, + "flower_blooming": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_fractal": true, + "pixel_flow": true, + "pixel_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/canary/canary60rgb/keymaps/via/config.h b/keyboards/canary/canary60rgb/keymaps/via/config.h index d3256bff33..2546add6da 100644 --- a/keyboards/canary/canary60rgb/keymaps/via/config.h +++ b/keyboards/canary/canary60rgb/keymaps/via/config.h @@ -16,5 +16,5 @@ #pragma once -#define DISABLE_RGB_MATRIX_PIXEL_FLOW +#undef ENABLE_RGB_MATRIX_PIXEL_FLOW #define DYNAMIC_KEYMAP_LAYER_COUNT 5 diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h index 35ce5e53b7..3550dd64d3 100644 --- a/keyboards/canary/canary60rgb/v1/config.h +++ b/keyboards/canary/canary60rgb/v1/config.h @@ -13,26 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once +#pragma once -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_SLEEP // turn off effects when suspended -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define DISABLE_RGB_MATRIX_BAND_SAT -# define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define DISABLE_RGB_MATRIX_SPLASH -# define DISABLE_RGB_MATRIX_MULTISPLASH -# define DISABLE_RGB_MATRIX_SOLID_SPLASH -# define DISABLE_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/capsunlocked/cu80/v2/ansi/config.h b/keyboards/capsunlocked/cu80/v2/ansi/config.h deleted file mode 100644 index 638c9a820f..0000000000 --- a/keyboards/capsunlocked/cu80/v2/ansi/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2021 CapsUnlocked -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 87 -# define RGB_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/capsunlocked/cu80/v2/iso/config.h b/keyboards/capsunlocked/cu80/v2/iso/config.h deleted file mode 100644 index 28086d6195..0000000000 --- a/keyboards/capsunlocked/cu80/v2/iso/config.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2021 CapsUnlocked -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 88 -# define RGB_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h index 1921c408bd..21d76ea1ac 100644 --- a/keyboards/checkerboards/quark_lp/config.h +++ b/keyboards/checkerboards/quark_lp/config.h @@ -21,31 +21,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_MATRIX_ENABLE -#define RGB_MATRIX_LED_COUNT 51 -#define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGB_MATRIX_SLEEP // turn off effects when suspended -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125 // limits maximum brightness of LEDs to 125 out of 255. Higher may cause the controller to crash. - -// 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_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_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_DUAL_BEACON -#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -#define ENABLE_RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_FLOW -#endif diff --git a/keyboards/checkerboards/quark_lp/info.json b/keyboards/checkerboards/quark_lp/info.json index 9712b63a38..006e454886 100644 --- a/keyboards/checkerboards/quark_lp/info.json +++ b/keyboards/checkerboards/quark_lp/info.json @@ -12,10 +12,31 @@ "pin": "C2" }, "rgb_matrix": { + "animations":{ + "alphas_mods": 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_left_right": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "jellybean_raindrops": true, + "hue_wave": true, + "pixel_flow": true + }, "driver": "ws2812", + "max_brightness": 125, "sat_steps": 8, "val_steps": 8, - "speed_steps": 10 + "speed_steps": 10, + "sleep": true }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"], diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h deleted file mode 100644 index 95352f29be..0000000000 --- a/keyboards/cherrybstudio/cb87rgb/config.h +++ /dev/null @@ -1,70 +0,0 @@ -/* -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define RGB_MATRIX_LED_COUNT 92 -#define RGB_MATRIX_SLEEP -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 -#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 - diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json index eefa7e73f0..e5d5299336 100644 --- a/keyboards/cherrybstudio/cb87rgb/info.json +++ b/keyboards/cherrybstudio/cb87rgb/info.json @@ -12,7 +12,54 @@ "pin": "E6" }, "rgb_matrix": { - "driver": "ws2812" + "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 + }, + "driver": "ws2812", + "max_brightness": 200, + "sleep": true }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "F5", "C6", "C7", "F7"], diff --git a/keyboards/chosfox/cf81/config.h b/keyboards/chosfox/cf81/config.h index 7ecf8dd905..71e783f2bc 100644 --- a/keyboards/chosfox/cf81/config.h +++ b/keyboards/chosfox/cf81/config.h @@ -36,12 +36,4 @@ #define I2C1_OPMODE OPMODE_I2C #define I2C1_CLOCK_SPEED 400000 /* 400000 */ -#define DRIVER_1_LED_TOTAL 63 -#define DRIVER_2_LED_TOTAL 20 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + 22) - -#define RGB_MATRIX_SLEEP // turn off effects when suspended #define RGB_TRIGGER_ON_KEYDOWN -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_KEYRELEASES diff --git a/keyboards/chosfox/cf81/info.json b/keyboards/chosfox/cf81/info.json index 5dff610071..de125801b7 100644 --- a/keyboards/chosfox/cf81/info.json +++ b/keyboards/chosfox/cf81/info.json @@ -174,7 +174,9 @@ { "flags": 2, "x":224, "y":51}, { "flags": 2, "x":224, "y":57}, { "flags": 2, "x":224, "y":64} - ] + ], + "react_on_keyup": true, + "sleep": true }, "layouts": { "LAYOUT": { diff --git a/keyboards/chromatonemini/config.h b/keyboards/chromatonemini/config.h index 42e8f0f525..18ae28c211 100644 --- a/keyboards/chromatonemini/config.h +++ b/keyboards/chromatonemini/config.h @@ -19,15 +19,10 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE -/* ws2812 RGB MATRIX */ -# define RGB_MATRIX_LED_COUNT 116 - // reacts to keypresses -# define RGB_MATRIX_KEYPRESSES - // for all fingers used at once. # define LED_HITS_TO_REMEMBER 10 -// the above brighness setting has no effect on rgb_matrix_set_color(). +// the max brightness setting has no effect on rgb_matrix_set_color(). // Use darker colors instead. /* RGB darker COLORS */ # define RGB_DARKWHITE 0x33, 0x33, 0x33 @@ -49,9 +44,6 @@ along with this program. If not, see . # define RGB_DARKMAGENTA 0x33, 0x0, 0x33 # define RGB_DARKPINK 0x33, 0x19, 0x26 -// https://docs.qmk.fm/#/feature_rgb_matrix -// Enable suspend mode. -# define RGB_MATRIX_SLEEP #endif // RGB_MATRIX_ENABLE /* Audio */ diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json index fb4f0c737f..f778018273 100644 --- a/keyboards/chromatonemini/info.json +++ b/keyboards/chromatonemini/info.json @@ -187,7 +187,8 @@ "multisplash": true, "solid_splash": true, "solid_multisplash": true - } + }, + "sleep": true }, "diode_direction": "COL2ROW", "matrix_pins": { diff --git a/keyboards/churrosoft/deck8/rgb/config.h b/keyboards/churrosoft/deck8/rgb/config.h deleted file mode 100644 index e22e1caef3..0000000000 --- a/keyboards/churrosoft/deck8/rgb/config.h +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright 2023 Churrosoft -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . - */ - -#pragma once - -#define RGB_MATRIX_LED_COUNT 8 -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_HUE 152 -#define RGB_MATRIX_DEFAULT_SAT 232 -#define RGB_MATRIX_DEFAULT_VAL 180 -#define RGB_MATRIX_SLEEP - -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_KEYPRESSES - -#define ENABLE_RGB_MATRIX_SOLID_COLOR -#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 diff --git a/keyboards/churrosoft/deck8/rgb/info.json b/keyboards/churrosoft/deck8/rgb/info.json index 546c17ca13..b5b3b21b5a 100644 --- a/keyboards/churrosoft/deck8/rgb/info.json +++ b/keyboards/churrosoft/deck8/rgb/info.json @@ -11,6 +11,57 @@ "rgb_matrix": true }, "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": "solid_color", + "hue": 152, + "sat": 232, + "val": 180 + }, "driver": "ws2812", "max_brightness": 200, "layout": [ @@ -22,6 +73,7 @@ {"flags": 4, "matrix": [1, 1], "x": 90, "y": 42}, {"flags": 4, "matrix": [1, 2], "x": 135, "y": 42}, {"flags": 4, "matrix": [1, 3], "x": 180, "y": 42} - ] + ], + "sleep": true } } \ No newline at end of file diff --git a/keyboards/clickety_split/leeloo/rev2/config.h b/keyboards/clickety_split/leeloo/rev2/config.h deleted file mode 100644 index 8150511acd..0000000000 --- a/keyboards/clickety_split/leeloo/rev2/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2023 Clickety Split Ltd. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -# define RGB_MATRIX_LED_COUNT 74 -# define RGB_MATRIX_SPLIT {37, 37} -# define RGB_MATRIX_SLEEP -# define SPLIT_TRANSPORT_MIRROR diff --git a/keyboards/clickety_split/leeloo/rev2/info.json b/keyboards/clickety_split/leeloo/rev2/info.json index 6db77714a4..cab643aad8 100644 --- a/keyboards/clickety_split/leeloo/rev2/info.json +++ b/keyboards/clickety_split/leeloo/rev2/info.json @@ -99,6 +99,8 @@ {"flags": 4, "matrix": [6, 0], "x": 224, "y": 16}, // R LB72 | SW36 {"flags": 4, "matrix": [7, 0], "x": 224, "y": 32}, // R LB73 | SW42 {"flags": 4, "matrix": [8, 0], "x": 224, "y": 48} // R LB74 | SW48 - ] + ], + "split_count": [37, 37], + "sleep": true } - } +} diff --git a/keyboards/clickety_split/leeloo/rev3/config.h b/keyboards/clickety_split/leeloo/rev3/config.h deleted file mode 100644 index a30477391b..0000000000 --- a/keyboards/clickety_split/leeloo/rev3/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2023 Clickety Split Ltd. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -# define RGB_MATRIX_LED_COUNT 58 -# define RGB_MATRIX_SPLIT {29, 29} -# define RGB_MATRIX_SLEEP -# define SPLIT_TRANSPORT_MIRROR diff --git a/keyboards/clickety_split/leeloo/rev3/info.json b/keyboards/clickety_split/leeloo/rev3/info.json index 2c92f5226e..d738fffe9e 100644 --- a/keyboards/clickety_split/leeloo/rev3/info.json +++ b/keyboards/clickety_split/leeloo/rev3/info.json @@ -83,6 +83,8 @@ {"flags": 4, "matrix": [6, 0], "x": 224, "y": 16}, // R LB56 | SW36 {"flags": 4, "matrix": [7, 0], "x": 224, "y": 32}, // R LB57 | SW42 {"flags": 4, "matrix": [8, 0], "x": 224, "y": 48} // R LB58 | SW48 - ] + ], + "split_count": [29, 29], + "sleep": true } - } +} diff --git a/keyboards/controllerworks/city42/config.h b/keyboards/controllerworks/city42/config.h index 7633a27c40..6c42809eaf 100644 --- a/keyboards/controllerworks/city42/config.h +++ b/keyboards/controllerworks/city42/config.h @@ -17,8 +17,6 @@ #pragma once -#define RGB_MATRIX_LED_COUNT 42 - #define SPI_SCK_PIN GP18 #define SPI_MOSI_PIN GP19 #define SPI_MISO_PIN GP16 @@ -28,4 +26,4 @@ #define CIRQUE_PINNACLE_ATTENUATION EXTREG__TRACK_ADCCONFIG__ADC_ATTENUATE_1X #define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE #define CIRQUE_PINNACLE_TAP_ENABLE -#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE \ No newline at end of file +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h index 4a0c48b1b0..5c22bb2559 100644 --- a/keyboards/controllerworks/mini36/config.h +++ b/keyboards/controllerworks/mini36/config.h @@ -18,9 +18,6 @@ #pragma once #define WS2812_PIO_USE_PIO1 -#define RGB_MATRIX_LED_COUNT 48 -#define RGB_MATRIX_SPLIT \ - { 24, 24 } #define I2C_DRIVER I2CD0 #define I2C1_SCL_PIN GP25 diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json index 3a49b210ac..a3b5365109 100644 --- a/keyboards/controllerworks/mini36/info.json +++ b/keyboards/controllerworks/mini36/info.json @@ -111,7 +111,8 @@ {"flags": 4, "matrix": [6, 4], "x": 217, "y": 41}, {"flags": 4, "matrix": [5, 4], "x": 217, "y": 24}, {"flags": 4, "matrix": [4, 4], "x": 217, "y": 7} - ] + ], + "split_count": [24, 24] }, "community_layouts": ["split_3x5_3"], "layouts": { diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h index 20b6bbac8d..3e5f7fd357 100644 --- a/keyboards/controllerworks/mini42/config.h +++ b/keyboards/controllerworks/mini42/config.h @@ -18,7 +18,6 @@ #pragma once #define WS2812_PIO_USE_PIO1 -#define RGB_MATRIX_LED_COUNT 54 #undef I2C_DRIVER #define I2C_DRIVER I2CD0 diff --git a/keyboards/cxt_studio/config.h b/keyboards/cxt_studio/config.h index 5c60daad9d..e56e07a254 100644 --- a/keyboards/cxt_studio/config.h +++ b/keyboards/cxt_studio/config.h @@ -3,31 +3,6 @@ #pragma once -#define RGB_MATRIX_LED_COUNT 12 - -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP - -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS - -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_DIGITAL_RAIN -#define ENABLE_RGB_MATRIX_MULTISPLASH -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE - -#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_TYPING_HEATMAP_SPREAD 9 /* diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/info.json index 6166ea2296..7ee7b52d50 100644 --- a/keyboards/cxt_studio/info.json +++ b/keyboards/cxt_studio/info.json @@ -31,21 +31,40 @@ }, "processor": "atmega32u4", "rgb_matrix": { - "driver": "ws2812", - "layout": [ - {"flags": 4, "matrix": [0, 3], "x": 3, "y": 0}, - {"flags": 4, "matrix": [0, 2], "x": 2, "y": 0}, - {"flags": 4, "matrix": [0, 1], "x": 1, "y": 0}, - {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}, - {"flags": 4, "matrix": [1, 0], "x": 0, "y": 1}, - {"flags": 4, "matrix": [1, 1], "x": 1, "y": 1}, - {"flags": 4, "matrix": [1, 2], "x": 2, "y": 1}, - {"flags": 4, "matrix": [1, 3], "x": 3, "y": 1}, - {"flags": 4, "matrix": [2, 3], "x": 3, "y": 2}, - {"flags": 4, "matrix": [2, 2], "x": 2, "y": 2}, - {"flags": 4, "matrix": [2, 1], "x": 1, "y": 2}, - {"flags": 4, "matrix": [2, 0], "x": 0, "y": 2} - ] + "animations": { + "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": "typing_heatmap" + }, + "driver": "ws2812", + "layout": [ + {"flags": 4, "matrix": [0, 3], "x": 3, "y": 0}, + {"flags": 4, "matrix": [0, 2], "x": 2, "y": 0}, + {"flags": 4, "matrix": [0, 1], "x": 1, "y": 0}, + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 1}, + {"flags": 4, "matrix": [1, 1], "x": 1, "y": 1}, + {"flags": 4, "matrix": [1, 2], "x": 2, "y": 1}, + {"flags": 4, "matrix": [1, 3], "x": 3, "y": 1}, + {"flags": 4, "matrix": [2, 3], "x": 3, "y": 2}, + {"flags": 4, "matrix": [2, 2], "x": 2, "y": 2}, + {"flags": 4, "matrix": [2, 1], "x": 1, "y": 2}, + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 2} + ] }, "url": "", "usb": {