diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h index 47830a9f1d0..1d317a945b7 100644 --- a/keyboards/bandominedoni/config.h +++ b/keyboards/bandominedoni/config.h @@ -24,18 +24,10 @@ #define SPLIT_USB_DETECT #ifdef RGB_MATRIX_ENABLE - -/* ws2812 RGB MATRIX */ -# define RGB_MATRIX_LED_COUNT 76 - - // reacts to keypresses -# define RGB_MATRIX_KEYPRESSES - // for all fingers used at once. # define LED_HITS_TO_REMEMBER 10 -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 -// 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 @@ -58,8 +50,6 @@ # define RGB_DARKPINK 0x33, 0x19, 0x26 // https://docs.qmk.fm/#/feature_rgb_matrix -// Enable suspend mode. -# define RGB_MATRIX_SLEEP # ifdef CONSOLE_ENABLE # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE @@ -84,7 +74,7 @@ // RAINDROPS don't match well with layer LED indicator (oc) using rgb_matrix_set_color(). // #define ENABLE_RGB_MATRIX_RAINDROPS // #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -// Recommendend not to use these. +// Recommended not to use these. # ifndef VIA_ENABLE # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT # define ENABLE_RGB_MATRIX_BAND_VAL diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json index aa5b2f9a2f2..deea0f3e5ef 100644 --- a/keyboards/bandominedoni/info.json +++ b/keyboards/bandominedoni/info.json @@ -9,7 +9,9 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "ws2812" + "driver": "ws2812", + "max_brightness": 50, + "sleep": true }, "matrix_pins": { "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"], diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h index 18f189cbea3..9ae699656b3 100644 --- a/keyboards/basekeys/trifecta/config.h +++ b/keyboards/basekeys/trifecta/config.h @@ -16,8 +16,6 @@ #pragma once -#define RGB_MATRIX_LED_COUNT 80 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -26,65 +24,3 @@ /* EEPROM for via */ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 - -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -//# define RGB_MATRIX_SLEEP // turn off effects when suspended -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) -# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. - -/* Disable the animations you don't want/need. You will need to disable a good number of these * - * because they take up a lot of space. Disable until you can successfully compile your firmware. */ -// 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 - -#endif diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json index 338eb1ae900..d9afe40a0c9 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/info.json @@ -46,11 +46,57 @@ "rgb_matrix": { "sat_steps": 8, "val_steps": 8, - "speed_steps": 10 + "speed_steps": 10, + "max_brightness": 150, + "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 + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ {"matrix": [1, 0], "x": 0, "y": 0}, diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h index e373627d51c..1c952759a76 100644 --- a/keyboards/bastardkb/charybdis/3x5/config.h +++ b/keyboards/bastardkb/charybdis/3x5/config.h @@ -20,10 +20,3 @@ /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 - -/* RGB settings. */ -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 36 -# define RGB_MATRIX_SPLIT \ - { 18, 18 } -#endif diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json index cc233f35681..9627b9852f4 100644 --- a/keyboards/bastardkb/charybdis/3x5/info.json +++ b/keyboards/bastardkb/charybdis/3x5/info.json @@ -5,6 +5,9 @@ "pid": "0x1832", "vid": "0xA8F8" }, + "rgb_matrix": { + "split_count": [18, 18] + }, "layout_aliases": { "LAYOUT_charybdis_3x5": "LAYOUT" }, diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h index ba729aee3ec..1c952759a76 100644 --- a/keyboards/bastardkb/charybdis/3x6/config.h +++ b/keyboards/bastardkb/charybdis/3x6/config.h @@ -20,10 +20,3 @@ /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 - -/* RGB settings. */ -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 42 -# define RGB_MATRIX_SPLIT \ - { 21, 21 } -#endif diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json index 787e3bdf14c..3597e72534e 100644 --- a/keyboards/bastardkb/charybdis/3x6/info.json +++ b/keyboards/bastardkb/charybdis/3x6/info.json @@ -3,10 +3,13 @@ "usb": { "pid": "0x1834" }, + "rgb_matrix": { + "split_count": [21, 21] + }, "layout_aliases": { "LAYOUT_charybdis_3x6": "LAYOUT" }, - "layouts": { + "layouts": { "LAYOUT": { "layout": [ {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index 64b5158698b..1c952759a76 100644 --- a/keyboards/bastardkb/charybdis/4x6/config.h +++ b/keyboards/bastardkb/charybdis/4x6/config.h @@ -20,10 +20,3 @@ /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 - -/* RGB settings. */ -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 58 -# define RGB_MATRIX_SPLIT \ - { 29, 29 } -#endif diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json index 8259e961410..54bb564306e 100644 --- a/keyboards/bastardkb/charybdis/4x6/info.json +++ b/keyboards/bastardkb/charybdis/4x6/info.json @@ -5,6 +5,9 @@ "pid": "0x1833", "vid": "0xA8F8" }, + "rgb_matrix": { + "split_count": [29, 29] + }, "layout_aliases": { "LAYOUT_charybdis_4x6": "LAYOUT" }, diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h index 7da14beb8d0..32ab7b0ebbf 100644 --- a/keyboards/bastardkb/charybdis/config.h +++ b/keyboards/bastardkb/charybdis/config.h @@ -18,7 +18,6 @@ #pragma once - /* Pointing device configuration. */ // Enable use of pointing device on slave split. @@ -35,21 +34,6 @@ /* RGB matrix support. */ #ifdef RGB_MATRIX_ENABLE -# define SPLIT_TRANSPORT_MIRROR -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 -# define RGB_MATRIX_SLEEP -# define RGB_MATRIX_KEYPRESSES - -// Startup values. -# define RGB_MATRIX_DEFAULT_VAL 64 - -// Rainbow swirl as startup mode. -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT - -// Slow swirl at startup. -# define RGB_MATRIX_DEFAULT_SPD 32 - # ifndef __arm__ // Disable control of RGB matrix by keycodes (must use firmware implementation // to control the feature). diff --git a/keyboards/bastardkb/charybdis/info.json b/keyboards/bastardkb/charybdis/info.json new file mode 100644 index 00000000000..6a4ed7c9f76 --- /dev/null +++ b/keyboards/bastardkb/charybdis/info.json @@ -0,0 +1,19 @@ +{ + "rgb_matrix": { + "animations": { + "cycle_left_right": true + }, + "default": { + "speed": 32, + "val": 64 + }, + "sleep": true + }, + "split": { + "transport": { + "sync": { + "matrix_state": true + } + } + } +} \ No newline at end of file diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index 5488579dee8..7276c6181fa 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/config.h @@ -42,15 +42,3 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U - -/* RGB matrix support. */ -#ifdef RGB_MATRIX_ENABLE -# define SPLIT_TRANSPORT_MIRROR -# define RGB_MATRIX_SLEEP -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS - -// Startup values. -# define RGB_MATRIX_DEFAULT_VAL 128 -# define RGB_MATRIX_DEFAULT_SPD 32 -#endif diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index f3a39613302..861a15e6369 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -17,6 +17,11 @@ "soft_serial_pin": "GP1", "bootmagic": { "matrix": [4, 0] + }, + "transport":{ + "sync": { + "matrix_state": true + } } }, "encoder": { @@ -90,6 +95,10 @@ "solid_splash": true, "solid_multisplash": true }, + "default": { + "speed": 32, + "val": 128 + }, "layout": [ {"x": 82, "y": 0, "flags": 2}, {"x": 60, "y": 0, "flags": 2}, @@ -180,7 +189,8 @@ {"matrix": [7, 2], "x": 179, "y": 51, "flags": 4}, {"matrix": [7, 0], "x": 160, "y": 53, "flags": 4}, {"matrix": [7, 1], "x": 143, "y": 60, "flags": 4} - ] + ], + "sleep": true }, "community_layouts": ["split_3x5_3"], "layouts": { diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h index bd595385b09..549965444d4 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/config.h +++ b/keyboards/bastardkb/dilemma/4x6_4/config.h @@ -44,11 +44,4 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U /* RGB matrix support. */ -#define SPLIT_TRANSPORT_MIRROR -#define RGB_MATRIX_SLEEP -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS - -// Startup values. -#define RGB_MATRIX_DEFAULT_VAL 64 -#define RGB_MATRIX_DEFAULT_SPD 32 +#define SPLIT_TRANSPORT_MIRROR \ No newline at end of file diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/info.json index ba07a7fccf2..23ccd533aaa 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/info.json +++ b/keyboards/bastardkb/dilemma/4x6_4/info.json @@ -17,6 +17,11 @@ "soft_serial_pin": "GP1", "bootmagic": { "matrix": [5, 0] + }, + "transport":{ + "sync": { + "matrix_state": true + } } }, "encoder": { @@ -91,6 +96,10 @@ "solid_splash": true, "solid_multisplash": true }, + "default": { + "speed": 32, + "val": 128 + }, "layout": [ {"x": 81, "y": 4, "flags": 2}, {"x": 65, "y": 2, "flags": 2}, @@ -199,7 +208,8 @@ {"matrix": [9, 2], "x": 156, "y": 53, "flags": 4}, {"matrix": [9, 1], "x": 143, "y": 57, "flags": 4}, {"matrix": [9, 3], "x": 132, "y": 64, "flags": 4} - ] + ], + "sleep": true }, "layouts": { "LAYOUT": { diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h deleted file mode 100644 index bc3bcb4833e..00000000000 --- a/keyboards/bastardkb/scylla/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 - -/* RGB matrix support. */ -#ifdef RGB_MATRIX_ENABLE -# define SPLIT_TRANSPORT_MIRROR -# define RGB_MATRIX_LED_COUNT 58 -# define RGB_MATRIX_SPLIT { 29, 29 } -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 -# define RGB_MATRIX_SLEEP -# define RGB_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json index 24a0262beeb..6508c15b5af 100644 --- a/keyboards/bastardkb/scylla/info.json +++ b/keyboards/bastardkb/scylla/info.json @@ -3,10 +3,22 @@ "usb": { "pid": "0x1829" }, + "rgb_matrix": { + "max_brightness": 50, + "sleep": true, + "split_count": [29, 29] + }, "rgblight": { "led_count": 58, "split_count": [29, 29] }, + "split": { + "transport": { + "sync": { + "matrix_state": true + } + } + }, "layouts": { "LAYOUT_split_4x6_5": { "layout": [ diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h deleted file mode 100644 index 48254935cb8..00000000000 --- a/keyboards/bastardkb/skeletyl/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 - -/* RGB matrix support. */ -#ifdef RGB_MATRIX_ENABLE -# define SPLIT_TRANSPORT_MIRROR -# define RGB_MATRIX_LED_COUNT 36 -# define RGB_MATRIX_SPLIT { 18, 18 } -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 -# define RGB_MATRIX_SLEEP -# define RGB_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json index b4bb9ea78e5..e4ac29207d2 100644 --- a/keyboards/bastardkb/skeletyl/info.json +++ b/keyboards/bastardkb/skeletyl/info.json @@ -3,10 +3,22 @@ "usb": { "pid": "0x1830" }, + "rgb_matrix": { + "max_brightness": 50, + "sleep": true, + "split_count": [18, 18] + }, "rgblight": { "led_count": 36, "split_count": [18, 18] }, + "split": { + "transport": { + "sync": { + "matrix_state": true + } + } + }, "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h deleted file mode 100644 index 6705619ee3d..00000000000 --- a/keyboards/bastardkb/tbkmini/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 - -/* RGB matrix support. */ -#ifdef RGB_MATRIX_ENABLE -# define SPLIT_TRANSPORT_MIRROR -# define RGB_MATRIX_LED_COUNT 42 -# define RGB_MATRIX_SPLIT { 21, 21 } -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 -# define RGB_MATRIX_SLEEP -# define RGB_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json index ec0433d3873..ff2df9cdd6e 100644 --- a/keyboards/bastardkb/tbkmini/info.json +++ b/keyboards/bastardkb/tbkmini/info.json @@ -3,10 +3,22 @@ "usb": { "pid": "0x1828" }, + "rgb_matrix": { + "max_brightness": 50, + "sleep": true, + "split_count": [21, 21] + }, "rgblight": { "led_count": 42, "split_count": [21, 21] }, + "split": { + "transport": { + "sync": { + "matrix_state": true + } + } + }, "community_layouts": ["split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { diff --git a/keyboards/binepad/bn006/config.h b/keyboards/binepad/bn006/config.h index 9ca25f2d9ef..01b94d6baa5 100755 --- a/keyboards/binepad/bn006/config.h +++ b/keyboards/binepad/bn006/config.h @@ -3,68 +3,4 @@ #pragma once -/* - * RGB Matrix - */ - -#ifdef RGB_MATRIX_ENABLE - /* =========================================================================================== - * PLEASE NOTE: Because the BN006 only has 6 keys, not all the animations are visually viable - * =========================================================================================== */ - - #define RGB_MATRIX_LED_COUNT 6 - #define RGB_MATRIX_KEYPRESSES // reacts to keypresses - #define RGB_MATRIX_SLEEP // turn off effects when suspended - #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // 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_BREATHING // Sets the default mode, if none has been set - #define RGB_TRIGGER_ON_KEYDOWN // Triggers RGB keypress events on key down. This makes RGB control feel more responsive. This may cause RGB to not function properly on some boards - - // 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_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 -#endif +#define RGB_TRIGGER_ON_KEYDOWN // Triggers RGB keypress events on key down. This makes RGB control feel more responsive. This may cause RGB to not function properly on some boards diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/info.json index 81e68d2e0c6..e5e25b4b90c 100755 --- a/keyboards/binepad/bn006/info.json +++ b/keyboards/binepad/bn006/info.json @@ -33,6 +33,18 @@ "pin": "B15" }, "rgb_matrix": { + "animations": { + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "splash": true, + "solid_splash": true + }, + "default": { + "animation": "breathing" + }, "driver": "ws2812", "layout": [ {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}, @@ -41,7 +53,9 @@ {"flags": 4, "matrix": [1, 0], "x": 0, "y": 64}, {"flags": 4, "matrix": [1, 1], "x": 112, "y": 64}, {"flags": 4, "matrix": [1, 2], "x": 224, "y": 64} - ] + ], + "max_brightness": 200, + "sleep": true }, "community_layouts": ["ortho_2x3"], "layouts": { diff --git a/keyboards/black_hellebore/config.h b/keyboards/black_hellebore/config.h index ae0bc0aedb6..53910fed097 100644 --- a/keyboards/black_hellebore/config.h +++ b/keyboards/black_hellebore/config.h @@ -13,70 +13,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - + #pragma once - -#ifdef RGB_MATRIX_ENABLE - - #define WS2812_PWM_DRIVER PWMD1 - #define WS2812_PWM_CHANNEL 1 - #define WS2812_PWM_PAL_MODE 1 //TIM1_CH1N (AF1) - #define WS2812_PWM_COMPLEMENTARY_OUTPUT - #define WS2812_DMA_STREAM STM32_DMA1_STREAM6 - #define WS2812_DMA_CHANNEL 7 //7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298) - - #define RGB_MATRIX_LED_COUNT 61 // The number of LEDs connected - - #define RGB_MATRIX_KEYPRESSES // reacts to keypresses - #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) - #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects - - #define ENABLE_RGB_MATRIX_SOLID_COLOR // Static single color - #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue - #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes - #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes - #define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation - #define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right - #define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right - #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation - #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness - #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation - #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness - #define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient - #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right - #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom - #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in - #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in - #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradient Chevron shaped scrolling left to right - #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard - #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard - #define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard - #define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard - #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard - #define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue - #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation - #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight amount at the same time, then shifts back - #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight amount in a wave to the right, then back to the left - #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight amount and then back down in a wave to the right - - /* RGB_MATRIX_FRAMEBUFFER_EFFECTS) */ - #define ENABLE_RGB_MATRIX_TYPING_HEATMAP - #define ENABLE_RGB_MATRIX_DIGITAL_RAIN - - /* RGB_MATRIX_KEYPRESSES) | defined(RGB_MATRIX_KEYRELEASES) */ - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out - #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out - #define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out - #define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out - #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out - #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out - -#endif - +#define WS2812_PWM_DRIVER PWMD1 +#define WS2812_PWM_CHANNEL 1 +#define WS2812_PWM_PAL_MODE 1 //TIM1_CH1N (AF1) +#define WS2812_PWM_COMPLEMENTARY_OUTPUT +#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_DMA_CHANNEL 7 //7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298) diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/info.json index bc70e3eb984..b59cb8f7b97 100644 --- a/keyboards/black_hellebore/info.json +++ b/keyboards/black_hellebore/info.json @@ -29,6 +29,48 @@ "vid": "0x3141" }, "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, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": 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, + "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", "layout": [ {"flags": 4, "matrix": [0, 0], "x": 7, "y": 5}, @@ -92,7 +134,8 @@ {"flags": 4, "matrix": [4, 10], "x": 177, "y": 54}, {"flags": 4, "matrix": [4, 11], "x": 196, "y": 54}, {"flags": 4, "matrix": [4, 13], "x": 215, "y": 54} - ] + ], + "react_on_keyup": true }, "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/blockboy/ac980mini/config.h b/keyboards/blockboy/ac980mini/config.h deleted file mode 100644 index 0734d9beaff..00000000000 --- a/keyboards/blockboy/ac980mini/config.h +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2022 rooski15 (@rooski15) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// RGB configuration -// The number of LEDs connected -#define RGB_MATRIX_LED_COUNT 81 - -#ifdef RGB_MATRIX_ENABLE -//# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) -# define RGB_MATRIX_SLEEP // turn off effects when suspended -//# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) -// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. - -/* Enable the animations you want/need. You may need to enable only a small number of these because * - * they take up a lot of space. Enable and confirm that you can still successfully compile your firmware. */ -// 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 if 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 -#endif - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json index 36d6fe5ba9e..4bc05236bcc 100644 --- a/keyboards/blockboy/ac980mini/info.json +++ b/keyboards/blockboy/ac980mini/info.json @@ -19,9 +19,56 @@ "pin": "B7" }, "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 + }, "driver": "ws2812", "sat_steps": 8, "val_steps": 8, + "max_brightness": 150, + "sleep": true, "speed_steps": 10 }, "layouts": { diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h deleted file mode 100644 index 75b5888bc34..00000000000 --- a/keyboards/boardsource/beiwagon/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2022 Boardsource - -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 18 -#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_PINWHEEL_SAT -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#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_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 ENABLE_RGB_MATRIX_DIGITAL_RAIN -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_RGB_MATRIX_SPLASH -#define ENABLE_RGB_MATRIX_MULTISPLASH -#define ENABLE_RGB_MATRIX_SOLID_SPLASH diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json index b02c5288678..39a9006b85c 100644 --- a/keyboards/boardsource/beiwagon/info.json +++ b/keyboards/boardsource/beiwagon/info.json @@ -25,6 +25,40 @@ "vid": "0x4273" }, "rgb_matrix": { + "animations":{ + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_pinwheel_sat": true, + "band_spiral_sat": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": 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": true, + "solid_reactive_wide": true, + "solid_reactive_cross": true, + "solid_reactive_nexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true + }, "driver": "ws2812", "layout": [ {"flags": 2, "x": 16, "y": 38}, diff --git a/keyboards/boardsource/equals/48/config.h b/keyboards/boardsource/equals/48/config.h index 952fa269c6e..39d114872fb 100644 --- a/keyboards/boardsource/equals/48/config.h +++ b/keyboards/boardsource/equals/48/config.h @@ -1,11 +1,10 @@ // Copyright 2023 Cole Smith (@boardsource) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once + #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U -#define RGB_MATRIX_LED_COUNT 58 - #define AUDIO_PIN GP29 #define AUDIO_PWM_DRIVER PWMD6 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B diff --git a/keyboards/boardsource/equals/60/config.h b/keyboards/boardsource/equals/60/config.h index ee4bc6b1e85..39d114872fb 100644 --- a/keyboards/boardsource/equals/60/config.h +++ b/keyboards/boardsource/equals/60/config.h @@ -1,11 +1,10 @@ // Copyright 2023 Cole Smith (@boardsource) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once + #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U -#define RGB_MATRIX_LED_COUNT 70 - #define AUDIO_PIN GP29 #define AUDIO_PWM_DRIVER PWMD6 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B diff --git a/keyboards/boardsource/equals/avr/config.h b/keyboards/boardsource/equals/avr/config.h deleted file mode 100644 index 68754cbe528..00000000000 --- a/keyboards/boardsource/equals/avr/config.h +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2023 Cole Smith (@boardsource) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once -#define RGB_MATRIX_LED_COUNT 70 diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h deleted file mode 100644 index 537bf0da1ce..00000000000 --- a/keyboards/boardsource/lulu/config.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2022 Cole Smith -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once -#define RGB_MATRIX_LED_COUNT 70 diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h deleted file mode 100644 index 34bf18fcc81..00000000000 --- a/keyboards/boardsource/microdox/v2/config.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 -#define RGB_MATRIX_LED_COUNT 44 -#define RGB_MATRIX_SPLIT { 22, 22 } -#define RGB_MATRIX_SLEEP -#define ENABLE_RGB_MATRIX_ALPHAS_MODS -#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_BREATHING -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json index dccecb4980e..94577059c52 100644 --- a/keyboards/boardsource/microdox/v2/info.json +++ b/keyboards/boardsource/microdox/v2/info.json @@ -35,6 +35,14 @@ } }, "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_left_right": true, + "breathing": true, + "cycle_left_right": true, + "cycle_spiral": true, + "jellybean_raindrops": true + }, "driver": "ws2812", "layout": [ {"flags": 2, "x": 12, "y": 11}, @@ -81,6 +89,9 @@ {"flags": 1, "matrix": [7, 4], "x": 124, "y": 64}, {"flags": 1, "matrix": [7, 3], "x": 149, "y": 64}, {"flags": 1, "matrix": [7, 2], "x": 174, "y": 64} - ] + ], + "max_brightness": 150, + "sleep": true, + "split_count": [22, 22] } } diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h deleted file mode 100644 index 4d7d053cfbc..00000000000 --- a/keyboards/boardsource/technik_o/config.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -Copyright 2022 Boardsource - -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_MAXIMUM_BRIGHTNESS 120 -#define RGB_MATRIX_LED_COUNT 58 -#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_PINWHEEL_SAT -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#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_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 ENABLE_RGB_MATRIX_DIGITAL_RAIN -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -// #define ENABLE_RGB_MATRIX_SPLASH -// #define ENABLE_RGB_MATRIX_MULTISPLASH -// #define ENABLE_RGB_MATRIX_SOLID_SPLASH diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/info.json index 91840eeb4fc..65d46a8b62e 100644 --- a/keyboards/boardsource/technik_o/info.json +++ b/keyboards/boardsource/technik_o/info.json @@ -26,6 +26,31 @@ "vid": "0x4273" }, "rgb_matrix": { + "animations":{ + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_pinwheel_sat": true, + "band_spiral_sat": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": 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 + }, "driver": "ws2812", "layout": [ {"flags": 2, "x": 220, "y": 17}, @@ -86,7 +111,8 @@ {"flags": 1, "matrix": [3, 9], "x": 183, "y": 64}, {"flags": 1, "matrix": [3, 10], "x": 203, "y": 64}, {"flags": 1, "matrix": [3, 11], "x": 224, "y": 64} - ] + ], + "max_brightness": 120 }, "community_layouts": [ "ortho_4x12" diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h deleted file mode 100644 index b01542d77b7..00000000000 --- a/keyboards/boardsource/technik_s/config.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -Copyright 2022 Boardsource - -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_MAXIMUM_BRIGHTNESS 120 -#define RGB_MATRIX_LED_COUNT 55 -#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_PINWHEEL_SAT -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#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_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 ENABLE_RGB_MATRIX_DIGITAL_RAIN -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -// #define ENABLE_RGB_MATRIX_SPLASH -// #define ENABLE_RGB_MATRIX_MULTISPLASH -// #define ENABLE_RGB_MATRIX_SOLID_SPLASH diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/info.json index 0c8b101b20e..ffb8cb09ec2 100644 --- a/keyboards/boardsource/technik_s/info.json +++ b/keyboards/boardsource/technik_s/info.json @@ -26,6 +26,31 @@ "vid": "0x4273" }, "rgb_matrix": { + "animations":{ + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_pinwheel_sat": true, + "band_spiral_sat": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": 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 + }, "driver": "ws2812", "layout": [ {"flags": 2, "x": 220, "y": 17}, @@ -83,7 +108,8 @@ {"flags": 4, "matrix": [3, 9], "x": 183, "y": 64}, {"flags": 4, "matrix": [3, 10], "x": 203, "y": 64}, {"flags": 1, "matrix": [3, 11], "x": 224, "y": 64} - ] + ], + "max_brightness": 120 }, "layouts": { "LAYOUT": { diff --git a/keyboards/boardsource/the_mark/config.h b/keyboards/boardsource/the_mark/config.h deleted file mode 100644 index b87d7af2e5f..00000000000 --- a/keyboards/boardsource/the_mark/config.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2022 Boardsource - -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 -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 24 -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 -# define RGB_MATRIX_SLEEP -# 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_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# 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_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 ENABLE_RGB_MATRIX_DIGITAL_RAIN -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -#endif diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json index c574f7ab66f..8dc08e4fc45 100644 --- a/keyboards/boardsource/the_mark/info.json +++ b/keyboards/boardsource/the_mark/info.json @@ -43,6 +43,40 @@ "pin": "C6" }, "rgb_matrix": { + "animations":{ + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_pinwheel_sat": true, + "band_spiral_sat": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": 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": true, + "solid_reactive_wide": true, + "solid_reactive_cross": true, + "solid_reactive_nexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true + }, "driver": "ws2812", "layout": [ {"flags": 2, "x": 224, "y": 42}, @@ -69,7 +103,9 @@ {"flags": 2, "x": 209, "y": 85}, {"flags": 2, "x": 224, "y": 85}, {"flags": 2, "x": 224, "y": 64} - ] + ], + "max_brightness": 200, + "sleep": true }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/boardsource/unicorne/config.h b/keyboards/boardsource/unicorne/config.h index 68172deb695..e79c00f14d3 100644 --- a/keyboards/boardsource/unicorne/config.h +++ b/keyboards/boardsource/unicorne/config.h @@ -2,10 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define RGB_MATRIX_LED_COUNT 54 -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS -#define RGB_MATRIX_SLEEP - #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define I2C_DRIVER I2CD1 diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/info.json index 4184c870fe4..299ca6cd00b 100644 --- a/keyboards/boardsource/unicorne/info.json +++ b/keyboards/boardsource/unicorne/info.json @@ -54,6 +54,9 @@ "gradient_left_right": true, "gradient_up_down": true }, + "default": { + "animation": "alphas_mods" + }, "max_brightness": 150, "split_count": [27, 27], "driver": "ws2812", @@ -112,7 +115,8 @@ {"matrix": [4, 0], "x": 0, "y": 7, "flags": 1}, {"matrix": [5, 0], "x": 0, "y": 24, "flags": 1}, {"matrix": [6, 0], "x": 0, "y": 41, "flags": 1} - ] + ], + "sleep": true }, "community_layouts": ["split_3x6_3"], "layouts": { diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h index 657c373c7b6..de1b75d0d66 100644 --- a/keyboards/bubble75/hotswap/config.h +++ b/keyboards/bubble75/hotswap/config.h @@ -21,73 +21,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* WS2812 RGB */ -#ifdef RGB_MATRIX_ENABLE -#define RGB_MATRIX_LED_COUNT 81 -#define RGBLIGHT_LAYERS -//#define RGBLIGHT_LAYER_BLINK -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF - -#define RGB_MATRIX_KEYPRESSES - -#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 -//#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT - - - - -// 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_KEYPRESSES -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#endif diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json index c9757847b03..99cfc4064e0 100644 --- a/keyboards/bubble75/hotswap/info.json +++ b/keyboards/bubble75/hotswap/info.json @@ -13,7 +13,36 @@ "pin": "B7" }, "rgb_matrix": { - "driver": "ws2812" + "animations": { + "breathing": 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, + "raindrops": 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": 180 }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],