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, J
  • Loading branch information
fauxpark committed Mar 31, 2023
commit e6d55a2b9d21b2fd01cd986e989cc380d0ab722b
1 change: 0 additions & 1 deletion keyboards/jacky_studio/bear_65/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

#define RGB_DI_PIN E2
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_DEFAULT_VAL 50
#define RGBLIGHT_EFFECT_BREATHING
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jacky_studio/bear_65/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"backlight": {
"pin": "B6"
},
"ws2812": {
"pin": "E2"
},
"indicators": {
"caps_lock": "C7",
"on_state": 0
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jacky_studio/bear_65/rev2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"backlight": {
"pin": "B6"
},
"ws2812": {
"pin": "E2"
},
"indicators": {
"caps_lock": "C7",
"on_state": 0
Expand Down
1 change: 0 additions & 1 deletion keyboards/jacky_studio/s7_elephant/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#pragma once

#define RGB_DI_PIN E6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jacky_studio/s7_elephant/rev1/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": "E6"
},
"matrix_pins": {
"cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"],
"rows": ["B0", "B1", "B2", "B3", "B4"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/jacky_studio/s7_elephant/rev2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#pragma once

#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/jacky_studio/s7_elephant/rev2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
},
"ws2812": {
"pin": "E2"
},
"diode_direction": "ROW2COL",
"backlight": {
"pin": "B6",
Expand Down
2 changes: 0 additions & 2 deletions keyboards/jadookb/jkb65/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

#pragma once

#define RGB_DI_PIN F0

#define RGB_MATRIX_LED_COUNT 67

#define RGB_DISABLE_WHEN_USB_SUSPENDED
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jadookb/jkb65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"vid": "0x4A4B",
"pid": "0xEF6A"
},
"ws2812": {
"pin": "F0"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/jc65/v32u4/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 RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jc65/v32u4/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"backlight": {
"pin": "B6"
},
"ws2812": {
"pin": "E2"
},
"indicators": {
"caps_lock": "B2",
"on_state": 0
Expand Down
1 change: 0 additions & 1 deletion keyboards/jd40/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

#define RGB_DI_PIN D3
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jd40/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "D3"
},
"matrix_pins": {
"cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"],
"rows": ["F0", "F1", "F5", "B4"]
Expand Down
3 changes: 0 additions & 3 deletions keyboards/jels/jels88/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@

#pragma once

/* ws2812b RGB LEDs */
#define RGB_DI_PIN B6

#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 20 // Number of LEDs
#define RGBLIGHT_SLEEP
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jels/jels88/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"bootmagic": {
"matrix": [1, 0]
},
"ws2812": {
"pin": "B6"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/jian/nsrev2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PHYSICAL_LEDS_ENABLE

/* ws2812 RGB LED */
#define RGB_DI_PIN D4
#define RGBLIGHT_TIMER
#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jian/nsrev2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"levels": 5,
"breathing": true
},
"ws2812": {
"pin": "D4"
},
"qmk_lufa_bootloader": {
"esc_input": "B1",
"esc_output": "D3"
Expand Down
1 change: 0 additions & 1 deletion keyboards/jian/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif // SCROLL_NMOSFET

/* ws2812 RGB LED */
#define RGB_DI_PIN D4
#define RGBLIGHT_TIMER
#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jian/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"pin": "B6",
"levels": 5
},
"ws2812": {
"pin": "D4"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/jian/rev2/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/>.
#define IOS_DEVICE_ENABLE

/* ws2812 RGB LED */
#define RGB_DI_PIN D4
#define RGBLIGHT_TIMER
#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jian/rev2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"pin": "C6",
"levels": 5
},
"ws2812": {
"pin": "D4"
},
"qmk_lufa_bootloader": {
"esc_input": "B1",
"esc_output": "D3"
Expand Down
1 change: 0 additions & 1 deletion keyboards/jiran/rev2/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 RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
5 changes: 5 additions & 0 deletions keyboards/jiran/rev2/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"ws2812": {
"pin": "B6"
}
}
1 change: 0 additions & 1 deletion keyboards/jkeys_design/gentleman65/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

#define RGB_DI_PIN F4
#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jkeys_design/gentleman65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x2020",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "F4"
},
"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
1 change: 0 additions & 1 deletion keyboards/jkeys_design/gentleman65_se_s/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

#define RGB_DI_PIN F7
#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jkeys_design/gentleman65_se_s/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"pid": "0x2322",
"device_version": "0.0.1"
},
"ws2812": {
"pin": "F7"
},
"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
1 change: 0 additions & 1 deletion keyboards/jolofsor/denial75/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

/* RGB Definitions */

#define RGB_DI_PIN D2
#define RGBLED_NUM 84
#define RGBLIGHT_MAX_LAYERS 32
#define RGBLIGHT_HUE_STEP 10
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jolofsor/denial75/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"cols": ["F7", "C7", "C6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B2", "B3", "B7", "D0", "D1", "D3"],
"rows": ["B0", "F6", "F5", "F4", "F1", "F0"]
},
"ws2812": {
"pin": "D2"
},
"diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B6",
Expand Down
1 change: 0 additions & 1 deletion keyboards/jones/v03/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AUDIO_CLICKY
#endif

#define RGB_DI_PIN B7
#define RGBLED_NUM 6 // Left(4) + Right(2)
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jones/v03/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
{"pin_a": "B3", "pin_b": "B2"}
]
},
"ws2812": {
"pin": "B7"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/jones/v03_1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AUDIO_CLICKY
#endif

#define RGB_DI_PIN F0
#define RGBLED_NUM 14 // Left(4) + Right(2) + Under(8)
#define RGBLIGHT_LED_MAP {0,1,2,3,13,12,4,5,6,7,8,9,10,11} // Left --> Right --> Under
#define RGBLIGHT_HUE_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jones/v03_1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
{"pin_a": "B3", "pin_b": "B2"}
]
},
"ws2812": {
"pin": "F0"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/jones/v1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif

/* RGBLIGHT */
#define RGB_DI_PIN F1
#define RGBLED_NUM 4 // Left(2) + Right(2)
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/jones/v1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"],
"rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"]
},
"ws2812": {
"pin": "F1"
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
Expand Down
1 change: 0 additions & 1 deletion keyboards/jorne/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#define RGB_DI_PIN D3
#define RGBLED_SPLIT { 28, 28 }
#define RGBLED_NUM 56

Expand Down
3 changes: 3 additions & 0 deletions keyboards/jorne/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D2"
},
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down