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 rgblight.pin and RGB_DI_PIN to ws2812.pin #20303

Merged
merged 39 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ef7a4af
Add `ws2812.pin` to schema and deprecate `rgblight.pin`
fauxpark Mar 30, 2023
e27cc63
Update docs with new define name
fauxpark Mar 30, 2023
1ea65cc
Update WS2812 drivers with new define name
fauxpark Mar 30, 2023
494fb53
Migrate `rgblight.pin` to `ws2812.pin`
fauxpark Mar 30, 2023
5f70133
Update define in layouts and userspace
fauxpark Mar 30, 2023
e1dd45c
Update define in keymaps
fauxpark Mar 30, 2023
b93a82d
Migrate `RGB_DI_PIN` to `ws2812.pin`, 0-9
fauxpark Mar 31, 2023
510aacf
Migrate `RGB_DI_PIN` to `ws2812.pin`, A
fauxpark Mar 31, 2023
4b653f7
Migrate `RGB_DI_PIN` to `ws2812.pin`, B
fauxpark Mar 31, 2023
852c0a7
Migrate `RGB_DI_PIN` to `ws2812.pin`, C
fauxpark Mar 31, 2023
2b4c179
Migrate `RGB_DI_PIN` to `ws2812.pin`, D
fauxpark Mar 31, 2023
ec9c095
Migrate `RGB_DI_PIN` to `ws2812.pin`, E
fauxpark Mar 31, 2023
f586ce2
Migrate `RGB_DI_PIN` to `ws2812.pin`, F
fauxpark Mar 31, 2023
ee4cebe
Migrate `RGB_DI_PIN` to `ws2812.pin`, G
fauxpark Mar 31, 2023
3a6ce2c
Migrate `RGB_DI_PIN` to `ws2812.pin`, H
fauxpark Mar 31, 2023
507179f
Migrate `RGB_DI_PIN` to `ws2812.pin`, handwired
fauxpark Mar 31, 2023
3938c8f
Migrate `RGB_DI_PIN` to `ws2812.pin`, I
fauxpark Mar 31, 2023
e6d55a2
Migrate `RGB_DI_PIN` to `ws2812.pin`, J
fauxpark Mar 31, 2023
8535609
Migrate `RGB_DI_PIN` to `ws2812.pin`, K
fauxpark Mar 31, 2023
be17730
Migrate `RGB_DI_PIN` to `ws2812.pin`, L
fauxpark Mar 31, 2023
85d6cdf
Migrate `RGB_DI_PIN` to `ws2812.pin`, M
fauxpark Mar 31, 2023
dadc764
Migrate `RGB_DI_PIN` to `ws2812.pin`, N
fauxpark Mar 31, 2023
7e1ead3
Migrate `RGB_DI_PIN` to `ws2812.pin`, O
fauxpark Mar 31, 2023
1c4c4d6
Migrate `RGB_DI_PIN` to `ws2812.pin`, P
fauxpark Mar 31, 2023
0c1b18b
Migrate `RGB_DI_PIN` to `ws2812.pin`, Q
fauxpark Mar 31, 2023
1c4699a
Migrate `RGB_DI_PIN` to `ws2812.pin`, R
fauxpark Mar 31, 2023
8bf5424
Migrate `RGB_DI_PIN` to `ws2812.pin`, S
fauxpark Mar 31, 2023
6001372
Migrate `RGB_DI_PIN` to `ws2812.pin`, T
fauxpark Mar 31, 2023
b61aa39
Migrate `RGB_DI_PIN` to `ws2812.pin`, U
fauxpark Mar 31, 2023
17506af
Migrate `RGB_DI_PIN` to `ws2812.pin`, V
fauxpark Mar 31, 2023
cd3901a
Migrate `RGB_DI_PIN` to `ws2812.pin`, W
fauxpark Mar 31, 2023
e06c04b
Migrate `RGB_DI_PIN` to `ws2812.pin`, X
fauxpark Mar 31, 2023
55fbd22
Migrate `RGB_DI_PIN` to `ws2812.pin`, Y
fauxpark Mar 31, 2023
bda58a4
Migrate `RGB_DI_PIN` to `ws2812.pin`, Z
fauxpark Mar 31, 2023
60c2fc9
Merge branch 'develop' into ws2812-pin
fauxpark Apr 1, 2023
bd96e52
Fix duplicate keys
fauxpark Apr 1, 2023
235f2c5
Merge branch 'develop' into ws2812-pin
fauxpark Apr 3, 2023
20311bf
Merge branch 'develop' into ws2812-pin
fauxpark Apr 4, 2023
5ccb2fb
Merge branch 'develop' into ws2812-pin
fauxpark Apr 5, 2023
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
Prev Previous commit
Next Next commit
Migrate RGB_DI_PIN to ws2812.pin, G
  • Loading branch information
fauxpark committed Mar 31, 2023
commit ee4cebec4d05d583a49cfda3154fa8cffa570021
1 change: 0 additions & 1 deletion keyboards/gami_studio/lex60/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 RGB_DI_PIN D1
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gami_studio/lex60/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0160",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D1"
},
"matrix_pins": {
"cols": ["B7", "F7", "C7", "E6", "C6", "F0", "B6", "F1", "B5", "F4", "B4", "F5", "D7", "F6", "D6"],
"rows": ["D5", "D4", "B0", "D2", "D3"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/geekboards/macropad_v2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#define RGBLED_NUM 42
#define RGB_MATRIX_LED_COUNT 42
#define RGB_DI_PIN A7

// PWM RGB Underglow Defines
#define WS2812_PWM_DRIVER PWMD3
Expand Down
1 change: 1 addition & 0 deletions keyboards/geekboards/macropad_v2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"device_version": "0.0.2"
},
"ws2812": {
"pin": "A7",
"driver": "pwm"
},
"processor": "STM32F072",
Expand Down
1 change: 0 additions & 1 deletion keyboards/gh60/satan/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

/* Underglow configuration
*/
#define RGB_DI_PIN E2
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gh60/satan/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"pin": "B6",
"levels": 4
},
"ws2812": {
"pin": "E2"
},
"indicators": {
"caps_lock": "B2",
"on_state": 0
Expand Down
1 change: 0 additions & 1 deletion keyboards/gh60/v1p3/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 RGB_DI_PIN F0
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gh60/v1p3/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"pin": "B6",
"levels": 15
},
"ws2812": {
"pin": "F0"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi", "60_ansi_arrow", "60_ansi_tsangan", "60_hhkb", "64_ansi"],
Expand Down
1 change: 0 additions & 1 deletion keyboards/ghs/rar/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 RGB_DI_PIN D0
#define RGBLED_NUM 17
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
Expand Down
3 changes: 3 additions & 0 deletions keyboards/ghs/rar/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D0"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D1"],
"rows": ["B0", "B7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"]
Expand Down
3 changes: 0 additions & 3 deletions keyboards/giabalanai/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// for "Generic" Promicro to be detected correctly as lefthand side (slave)
#define SPLIT_USB_DETECT

/* ws2812 RGB LED */
#define RGB_DI_PIN D3

#ifdef RGBLIGHT_ENABLE
# define RGBLED_NUM 123

Expand Down
3 changes: 3 additions & 0 deletions keyboards/giabalanai/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"encoder": {
"rotary": []
},
"ws2812": {
"pin": "D3"
},
"split": {
"soft_serial_pin": "D2",
"encoder": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/gkeyboard/gkb_m16/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 RGB_DI_PIN F1
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gkeyboard/gkb_m16/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x4201",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "F1"
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7"],
"rows": ["D4", "D5", "D6", "D7"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/gkeyboard/gpad8_2r/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#define DYNAMIC_KEYMAP_LAYER_COUNT 8

#define RGB_DI_PIN GP19
#define RGB_MATRIX_LED_COUNT 16
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
Expand Down
1 change: 1 addition & 0 deletions keyboards/gkeyboard/gpad8_2r/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
]
},
"ws2812": {
"pin": "GP19",
"driver": "vendor"
},
"layouts": {
Expand Down
3 changes: 0 additions & 3 deletions keyboards/gl516/j73gl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* ws2812 RGB LED */
#define RGB_DI_PIN D3

#ifndef RGBLED_NUM
#define RGBLED_NUM 73
#endif
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gl516/j73gl/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0xE8D0",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
3 changes: 0 additions & 3 deletions keyboards/gl516/n51gl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* ws2812 RGB LED */
#define RGB_DI_PIN D3

#ifndef RGBLED_NUM
#define RGBLED_NUM 15
#endif
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gl516/n51gl/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0xE8CF",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D3"
},
"encoder": {
"rotary": [
{"pin_a": "D7", "pin_b": "E6", "resolution": 3}
Expand Down
1 change: 0 additions & 1 deletion keyboards/gopolar/gg86/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#ifdef RGB_MATRIX_ENABLE
/* RGB Matrix config */
#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 100
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gopolar/gg86/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "E2"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "E6", "D2", "D3"],
"rows": ["B0", "B1", "B2", "B3", "B7", "D5"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/gray_studio/aero75/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#define RGB_DI_PIN B10
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
#define RGBLED_NUM 1
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gray_studio/aero75/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x3075",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "B10"
},
"matrix_pins": {
"cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B1", "A8", "B15", "B14", "B13"],
"rows": ["A7", "A6", "B12", "A2", "A1", "A0"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/gray_studio/apollo80/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

#define RGB_DI_PIN E2
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gray_studio/apollo80/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x3001",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "E2"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"],
"rows": ["D1", "D0", "B3", "B0", "B2", "B1"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/gray_studio/cod67/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 RGB_DI_PIN B2
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gray_studio/cod67/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x1000",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "B2"
},
"matrix_pins": {
"cols": ["D7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B7", "D0", "D1", "D2", "D3"],
"rows": ["C7", "C6", "B6", "B5", "B4"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/gray_studio/space65/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 RGB_DI_PIN E2
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gray_studio/space65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"levels": 5,
"breathing": true
},
"ws2812": {
"pin": "E2"
},
"indicators": {
"caps_lock": "E6",
"on_state": 0
Expand Down
1 change: 0 additions & 1 deletion keyboards/gray_studio/space65r3/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-2.0
#pragma once

#define RGB_DI_PIN B10
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
#define RGBLED_NUM 5
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gray_studio/space65r3/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid":"0x3003",
"device_version": "0.0.3",
},
"ws2812": {
"pin": "B10"
},
"matrix_pins": {
"cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"],
"rows": ["A6", "B12", "A2", "A0", "A1"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/gray_studio/think65/hotswap/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 RGB_DI_PIN E2
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gray_studio/think65/hotswap/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x4001",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "E2"
},
"matrix_pins": {
"cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/gray_studio/think65/solder/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 RGB_DI_PIN E2
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/gray_studio/think65/solder/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x4000",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "E2"
},
"matrix_pins": {
"cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/grid600/press/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 RGB_DI_PIN B6
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
Expand Down
3 changes: 3 additions & 0 deletions keyboards/grid600/press/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"cols": ["F1", "F4", "F5", "F6"],
"rows": ["F0"]
},
"ws2812": {
"pin": "B6"
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
Expand Down