Move RGB_MATRIX_HUE/SAT/VAL/SPD_STEP to data driven (#21354)

This commit is contained in:
Ryan 2023-06-24 17:13:18 +10:00 committed by GitHub
parent 8093b13365
commit 6545eb64a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 85 additions and 100 deletions

View file

@ -13,7 +13,8 @@
"pin": "B7"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 24
},
"matrix_pins": {
"cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],

View file

@ -27,10 +27,6 @@
#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 20
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_SAT_STEP 24
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_VAL_STEP 16
#define RGB_MATRIX_SPD_STEP 16
#define ENABLE_RGB_MATRIX_BREATHING
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT

View file

@ -40,8 +40,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10
#endif

View file

@ -17,7 +17,10 @@
"split_count": [34, 34]
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"matrix_pins": {
"cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],

View file

@ -52,10 +52,6 @@
# 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.
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
/* 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. */

View file

@ -30,6 +30,11 @@
"led_count": 80,
"max_brightness": 128
},
"rgb_matrix": {
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -15,10 +15,6 @@
// # 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.
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
/* 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. */

View file

@ -19,7 +19,10 @@
"pin": "B7"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"layouts": {
"LAYOUT": {

View file

@ -27,10 +27,6 @@
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_DISABLE_WHEN_USB_SUSPENDED // 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.
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:

View file

@ -12,7 +12,10 @@
"pin": "C2"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"matrix_pins": {
"cols": ["B6", "B5", "B4", "B3", "B0", "D6", "D5", "D4", "D3", "D2", "D1", "D0"],

View file

@ -36,10 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGB_MATRIX_LED_COUNT 54
# define RGB_MATRIX_SPLIT { 27, 27 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
# define RGB_MATRIX_HUE_STEP RGBLIGHT_HUE_STEP
# define RGB_MATRIX_SAT_STEP RGBLIGHT_SAT_STEP
# define RGB_MATRIX_VAL_STEP RGBLIGHT_VAL_STEP
# define RGB_MATRIX_SPD_STEP 8
#endif
#ifndef OLED_FONT_H

View file

@ -9,7 +9,10 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 8
},
"rgblight": {
"led_count": 54,

View file

@ -55,10 +55,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// # 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.
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
#endif
#ifdef RGBLIGHT_ENABLE

View file

@ -9,7 +9,10 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"encoder": {
"rotary": [

View file

@ -55,10 +55,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// # 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.
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
#endif
#ifdef RGBLIGHT_ENABLE

View file

@ -9,7 +9,10 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"encoder": {
"rotary": [

View file

@ -23,10 +23,6 @@
#endif
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 16
#define RGB_MATRIX_VAL_STEP 16
#define RGB_MATRIX_SPD_STEP 10
// EFFECTS
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN

View file

@ -12,7 +12,8 @@
"pin": "D4"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"speed_steps": 10
},
"rgblight": {
"led_count": 88,

View file

@ -61,7 +61,3 @@
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10

View file

@ -14,7 +14,10 @@
"pin": "E6"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"matrix_pins": {
"cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"],

View file

@ -36,10 +36,6 @@
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects

View file

@ -11,7 +11,10 @@
"pin": "C7"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"matrix_pins": {
"cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],

View file

@ -26,10 +26,6 @@
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects

View file

@ -12,7 +12,10 @@
"pin": "C7"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"matrix_pins": {
"cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],

View file

@ -61,7 +61,3 @@
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10

View file

@ -15,7 +15,10 @@
"pin": "C7"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"matrix_pins": {
"cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],

View file

@ -40,10 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #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 200 out of 255. If not defined maximum brightness is set to 255
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10
// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN

View file

@ -9,7 +9,10 @@
"device_version": "0.2.0"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4"],

View file

@ -23,9 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_LED_COUNT 52
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs
#define RGB_MATRIX_DEFAULT_VAL 64
#define RGB_MATRIX_HUE_STEP 10
#define RGB_MATRIX_SAT_STEP 10
#define RGB_MATRIX_VAL_STEP 10
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects

View file

@ -13,7 +13,10 @@
"driver": "spi"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"hue_steps": 10,
"sat_steps": 10,
"val_steps": 10
},
"matrix_pins": {
"cols": ["A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B6", "B7", "C13", "C14", "C15"],

View file

@ -20,9 +20,6 @@
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_DISABLE_WHEN_USB_SUSPENDED // Turn off effects when suspended
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130 // Limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10
// RGB_MATRIX effects
#define ENABLE_RGB_MATRIX_ALPHAS_MODS //Enables RGB_MATRIX_ALPHAS_MODS

View file

@ -9,7 +9,10 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"rgblight": {
"led_count": 47,

View file

@ -23,11 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_MATRIX_LED_COUNT 52
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 8
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses

View file

@ -12,7 +12,10 @@
"pin": "D3"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 8
},
"rgblight": {
"led_count": 52,

View file

@ -42,8 +42,4 @@
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#define RGB_MATRIX_HUE_STEP 8
#define RGB_MATRIX_SAT_STEP 8
#define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10
#endif

View file

@ -19,7 +19,10 @@
]
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",

View file

@ -19,7 +19,10 @@
]
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",

View file

@ -19,7 +19,10 @@
]
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",

View file

@ -29,10 +29,6 @@
// # 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 50 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL // default mode
// RGB Matrix Animation modes. Explicitly enabled

View file

@ -9,7 +9,10 @@
"device_version": "99.9.9"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3"],

View file

@ -30,10 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RGB_MATRIX_DEFAULT_HUE 128
// #define RGB_MATRIX_DEFAULT_SAT 255
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
# define RGB_MATRIX_SPD_STEP 10
#endif

View file

@ -9,7 +9,10 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
},
"rgblight": {
"led_count": 18,