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

Move RGBLED_SPLIT to data driven #21113

Merged
merged 3 commits into from
Jun 6, 2023
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
1 change: 0 additions & 1 deletion keyboards/aleblazer/zodiark/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 68
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 34, 34 }
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
3 changes: 2 additions & 1 deletion keyboards/aleblazer/zodiark/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"pin": "B5"
},
"rgblight": {
"max_brightness": 170
"max_brightness": 170,
"split_count": [34, 34]
},
"rgb_matrix": {
"driver": "WS2812"
Expand Down
1 change: 0 additions & 1 deletion keyboards/arabica37/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once

#define RGBLED_NUM 50 // Number of LEDs
#define RGBLED_SPLIT {25, 25}
/*
* Feature disable options
* These options are also useful to firmware size reduction.
Expand Down
3 changes: 3 additions & 0 deletions keyboards/arabica37/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D2"
},
"rgblight": {
"split_count": [25, 25]
},
"ws2812": {
"pin": "D3"
},
Expand Down
1 change: 0 additions & 1 deletion keyboards/avalanche/v2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
#pragma once

#define RGBLED_NUM 12
#define RGBLED_SPLIT { 6, 6 }
#define RGBLIGHT_SPLIT
3 changes: 3 additions & 0 deletions keyboards/avalanche/v2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
{"pin_a": "B5", "pin_b": "F4", "resolution": 2}
]
},
"rgblight": {
"split_count": [6, 6]
},
"ws2812": {
"pin": "D3"
},
Expand Down
1 change: 0 additions & 1 deletion keyboards/avalanche/v3/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
#pragma once

#define RGBLED_NUM 12
#define RGBLED_SPLIT { 7, 7 }
#define RGBLIGHT_SPLIT
3 changes: 3 additions & 0 deletions keyboards/avalanche/v3/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
"split": {
"soft_serial_pin": "D2"
},
"rgblight": {
"split_count": [7, 7]
},
"ws2812": {
"pin": "D3"
},
Expand Down
1 change: 0 additions & 1 deletion keyboards/avalanche/v4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 64
# define RGBLED_SPLIT { 32, 32 }
# define RGBLIGHT_SPLIT
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
Expand Down
3 changes: 2 additions & 1 deletion keyboards/avalanche/v4/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"pin": "D3"
},
"rgblight": {
"max_brightness": 100
"max_brightness": 100,
"split_count": [32, 32]
},
"processor": "atmega32u4",
"bootloader": "caterina",
Expand Down
1 change: 0 additions & 1 deletion keyboards/basekeys/slice/rev1_rgb/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* RGB LED */
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 69 // Number of LEDs. backlight x69
#define RGBLED_SPLIT { 34, 35 }
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
Expand Down
3 changes: 2 additions & 1 deletion keyboards/basekeys/slice/rev1_rgb/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"pin": "D3"
},
"rgblight": {
"max_brightness": 120
"max_brightness": 120,
"split_count": [34, 35]
},
"processor": "atmega32u4",
"bootloader": "caterina",
Expand Down
4 changes: 1 addition & 3 deletions keyboards/bastardkb/dilemma/3x5_3/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@

/* RGB settings. */
#define RGBLED_NUM 36
#define RGBLED_SPLIT \
{ 18, 18 }

/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define RGB_MATRIX_SPLIT { 18, 18 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
Expand Down
3 changes: 3 additions & 0 deletions keyboards/bastardkb/dilemma/3x5_3/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
"split": {
"soft_serial_pin": "GP1"
},
"rgblight": {
"split_count": [18, 18]
},
"ws2812": {
"pin": "GP0",
"driver": "vendor"
Expand Down
4 changes: 1 addition & 3 deletions keyboards/bastardkb/scylla/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@

/* RGB settings. */
#define RGBLED_NUM 58
#define RGBLED_SPLIT \
{ 29, 29 }

/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define RGB_MATRIX_SPLIT { 29, 29 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
Expand Down
3 changes: 3 additions & 0 deletions keyboards/bastardkb/scylla/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"usb": {
"pid": "0x1829"
},
"rgblight": {
"split_count": [29, 29]
},
"layouts": {
"LAYOUT_split_4x6_5": {
"layout": [
Expand Down
4 changes: 1 addition & 3 deletions keyboards/bastardkb/skeletyl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@

/* RGB settings. */
#define RGBLED_NUM 36
#define RGBLED_SPLIT \
{ 18, 18 }

/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define RGB_MATRIX_SPLIT { 18, 18 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
Expand Down
3 changes: 3 additions & 0 deletions keyboards/bastardkb/skeletyl/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"usb": {
"pid": "0x1830"
},
"rgblight": {
"split_count": [18, 18]
},
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/bastardkb/tbk/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#pragma once

#define RGBLED_NUM 38
#define RGBLED_SPLIT { 19, 19 }
#define RGBLIGHT_SPLIT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
Expand Down
3 changes: 3 additions & 0 deletions keyboards/bastardkb/tbk/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"device_version": "0.0.1",
"pid": "0x1828"
},
"rgblight": {
"split_count": [19, 19]
},
"ws2812": {
"pin": "D2"
},
Expand Down
4 changes: 1 addition & 3 deletions keyboards/bastardkb/tbkmini/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@

/* RGB settings. */
#define RGBLED_NUM 42
#define RGBLED_SPLIT \
{ 21, 21 }

/* RGB matrix support. */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# define RGB_MATRIX_SPLIT { 21, 21 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
# define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
# define RGB_DISABLE_WHEN_USB_SUSPENDED
Expand Down
3 changes: 3 additions & 0 deletions keyboards/bastardkb/tbkmini/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"usb": {
"pid": "0x1828"
},
"rgblight": {
"split_count": [21, 21]
},
"community_layouts": ["split_3x6_3"],
"layouts": {
"LAYOUT_split_3x6_3": {
Expand Down
2 changes: 0 additions & 2 deletions keyboards/bluebell/swoop/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLED_NUM 36
#define RGBLED_SPLIT \
{ 18, 18 }
#define RGBLIGHT_SPLIT
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
Expand Down
3 changes: 2 additions & 1 deletion keyboards/bluebell/swoop/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"pin": "D3"
},
"rgblight": {
"max_brightness": 150
"max_brightness": 150,
"split_count": [18, 18]
},
"matrix_pins": {
"cols": ["B1", "F7", "F6", "F5", "F4"],
Expand Down
2 changes: 0 additions & 2 deletions keyboards/crkbd/r2g/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_TWINKLE

# define RGBLED_NUM 54
# define RGBLED_SPLIT \
{ 27, 27 }
#endif

#ifdef RGB_MATRIX_ENABLE
Expand Down
3 changes: 3 additions & 0 deletions keyboards/crkbd/r2g/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"split": {
"soft_serial_pin": "D2"
},
"rgblight": {
"split_count": [27, 27]
},
"ws2812": {
"pin": "D3"
},
Expand Down
2 changes: 0 additions & 2 deletions keyboards/crkbd/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 54 // Number of LEDs
# define RGBLED_SPLIT \
{ 27, 27 }
# define RGBLIGHT_SPLIT
#endif

Expand Down
3 changes: 3 additions & 0 deletions keyboards/crkbd/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"split": {
"soft_serial_pin": "D2"
},
"rgblight": {
"split_count": [27, 27]
},
"ws2812": {
"pin": "D3"
},
Expand Down
1 change: 0 additions & 1 deletion keyboards/doppelganger/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#define RGBLED_NUM 2
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 1, 1 }

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
Expand Down
3 changes: 3 additions & 0 deletions keyboards/doppelganger/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
}
}
},
"rgblight": {
"split_count": [1, 1]
},
"ws2812": {
"pin": "B4"
},
Expand Down
3 changes: 1 addition & 2 deletions keyboards/elephant42/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

# define RGBLED_SPLIT { 27, 27 }
# define RGBLED_NUM 54 // backlight x42 + underglow x12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
Expand All @@ -36,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# define RGB_MATRIX_SPLIT RGBLED_SPLIT
# 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
Expand Down
3 changes: 2 additions & 1 deletion keyboards/elephant42/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"driver": "WS2812"
},
"rgblight": {
"max_brightness": 170
"max_brightness": 170,
"split_count": [27, 27]
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
Expand Down
4 changes: 0 additions & 4 deletions keyboards/ergoslab/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once

#define RGBLED_NUM 2 // Number of LEDs
// FIXME this following line should enable our layer status LEDs to work on both
// sides without need to wire them into a chain. It doesn't though. Uncommenting
// means the slave side of the keyboard stops working (and the LEDs don't work).
// #define RGBLED_SPLIT {1,1}

/*
* Feature disable options
Expand Down
1 change: 0 additions & 1 deletion keyboards/flxlb/zplit/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */
#define RGBLED_NUM 16
#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8}
#define RGBLED_SPLIT { 8, 8 }
#define RGBLIGHT_SPLIT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
Expand Down
3 changes: 3 additions & 0 deletions keyboards/flxlb/zplit/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
{"pin_a": "B0", "pin_b": "D2"}
]
},
"rgblight": {
"split_count": [8, 8]
},
"ws2812": {
"pin": "D3"
},
Expand Down
5 changes: 0 additions & 5 deletions keyboards/giabalanai/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 123

// Do not define "RGBLED_SPLIT" since somehow it doesn't work well yet.
// Even thhough "#define RGBLED_SPLIT { 60, 63 }" was set, LEDs on the sub keyboad side didn't turn on.
// Not sure but rgblight_sethsv_at() might not support RGBLED_SPLIT yet.
// Instead, LED data is tranferred from right side to the left via TRRS cable.

# define RGBLIGHT_LAYERS

// By default, LEDs of the buttons which are pressed turn on.
Expand Down
1 change: 0 additions & 1 deletion keyboards/halfcliff/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#define RGBLED_NUM 10
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 5, 5 }
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/halfcliff/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D2"
},
"rgblight": {
"split_count": [5, 5]
},
"ws2812": {
"pin": "D3"
},
Expand Down
1 change: 0 additions & 1 deletion keyboards/handwired/dactyl_manuform/dmote/62key/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
#define RGBLED_NUM 6 // Used when chaining strips
#define RGBLED_SPLIT { 3, 3 } // Used when not chaining strips
Loading