Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate RGB Matrix config to info.json - J #22862

Merged
merged 2 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions keyboards/jacky_studio/piggy60/rev2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@

#pragma once

#define RGB_MATRIX_LED_COUNT 14

#define RGB_MATRIX_SLEEP

#define RGB_MATRIX_FRAMEBUFFER_EFFECTS

#define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_PAL_MODE 2
Expand Down
3 changes: 2 additions & 1 deletion keyboards/jacky_studio/piggy60/rev2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
{"flags": 2, "x": 45, "y": 0},
{"flags": 2, "x": 0, "y": 0},
{"flags": 2, "x": 32, "y": 32}
]
],
"sleep": true
},
"usb": {
"device_version": "2.0.0",
Expand Down
56 changes: 0 additions & 56 deletions keyboards/jadookb/jkb65/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,61 +18,5 @@

#define RGB_MATRIX_LED_COUNT 67

#define RGB_MATRIX_SLEEP
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_LED_PROCESS_LIMIT 4
#define RGB_MATRIX_LED_FLUSH_LIMIT 26
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL

// 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 LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
51 changes: 51 additions & 0 deletions keyboards/jadookb/jkb65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,58 @@
"pin": "F0"
},
"rgb_matrix": {
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"rainbow_moving_chevron": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"dual_beacon": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_rain": true,
"pixel_flow": true,
"pixel_fractal": true,
"typing_heatmap": true,
"digital_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_wide": true,
"solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
"splash": true,
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
},
"default": {
"animation": "cycle_all"
},
"driver": "ws2812",
"led_process_limit": 4,
"led_flush_limit": 26,
"sleep": true,
"timeout": 90000
},
"processor": "atmega32u4",
Expand Down
21 changes: 0 additions & 21 deletions keyboards/jkeys_design/gentleman65/config.h

This file was deleted.

3 changes: 0 additions & 3 deletions keyboards/jkeys_design/gentleman65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
"ws2812": {
"pin": "F4"
},
"rgb_matrix": {
"driver": "ws2812"
},
"matrix_pins": {
"cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "B2", "B1", "B3", "B0", "B7", "D0"],
"rows": ["D3", "D2", "D1", "F7", "F1"]
Expand Down
21 changes: 0 additions & 21 deletions keyboards/jkeys_design/gentleman65_se_s/config.h

This file was deleted.

3 changes: 0 additions & 3 deletions keyboards/jkeys_design/gentleman65_se_s/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
"ws2812": {
"pin": "F7"
},
"rgb_matrix": {
"driver": "ws2812"
},
"matrix_pins": {
"cols": ["D5", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "D4", "D6", "D7", "C7", "C6", "B6", "B5", "B4"],
"rows": ["F0", "F1", "F4", "F5", "F6"]
Expand Down
6 changes: 0 additions & 6 deletions keyboards/jorne/post_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,3 @@
# define RGBLIGHT_LIMIT_VAL 120
# endif
#endif

#ifdef RGB_MATRIX_ENABLE
# ifndef RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
# endif
#endif
54 changes: 0 additions & 54 deletions keyboards/joshajohnson/hub20/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,60 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

#define RGB_MATRIX_LED_COUNT 27

#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#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

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
19 changes: 19 additions & 0 deletions keyboards/joshajohnson/hub20/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,25 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
"animations": {
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"cycle_left_right": true,
"cycle_up_down": 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
},
"driver": "ws2812"
},
"matrix_pins": {
Expand Down
6 changes: 0 additions & 6 deletions keyboards/jukaie/jk01/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

#define RGB_MATRIX_SLEEP

/* External spi flash */
#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14

Expand All @@ -36,7 +34,3 @@
#define AW20216S_CS_PIN_2 B15
#define AW20216S_EN_PIN_1 C13
#define AW20216S_EN_PIN_2 C13

#define DRIVER_1_LED_TOTAL 66
#define DRIVER_2_LED_TOTAL 19
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
3 changes: 2 additions & 1 deletion keyboards/jukaie/jk01/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@
{ "flags": 4, "matrix": [0, 5], "x": 150, "y": 50 },
{ "flags": 4, "matrix": [11, 0], "x": 0, "y": 1 },
{ "flags": 4, "matrix": [11, 1], "x": 0, "y": 2 }
]
],
"sleep": true
},
"url": "",
"usb": {
Expand Down
3 changes: 2 additions & 1 deletion keyboards/junco/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"driver": "vendor"
},
"rgb_matrix": {
"driver": "ws2812"
"driver": "ws2812",
"split_count": [37, 37]
},
"encoder": {
"rotary": [
Expand Down
9 changes: 0 additions & 9 deletions keyboards/junco/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,3 @@
#define SERIAL_USART_FULL_DUPLEX // Use full duplex communication (TRRS)
#define SERIAL_USART_TX_PIN GP0 // USART TX pin
#define SERIAL_USART_RX_PIN GP1 // USART RX pin

/* RGB Stuff */
#ifdef RGB_MATRIX_ENABLE

# define RGB_MATRIX_LED_COUNT 74
# define RGB_MATRIX_SPLIT \
{ 37, 37 } // 37 LEDs on each side

#endif