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, H
  • Loading branch information
fauxpark committed Mar 31, 2023
commit 3a6ce2cebf1b84985c925398ce6f9f8f79fc9d6b
2 changes: 0 additions & 2 deletions keyboards/h0oni/hotduck/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
#pragma once

/* RGB Underglow
* F4 PIN for pre-soldered WS2812 LEDs
*/
#define RGB_DI_PIN F4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
3 changes: 3 additions & 0 deletions keyboards/h0oni/hotduck/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
"ws2812": {
"pin": "F4"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hadron/ver2/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 OLED_UPDATE_INTERVAL 33 // ~30fps

/* ws2812 RGB LED*/
#define RGB_DI_PIN D4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hadron/ver2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"rows": ["D7", "E6", "B4", "B5", "B6"]
},
"diode_direction": "COL2ROW",
"ws2812": {
"pin": "D4"
},
"processor": "atmega32u4",
"bootloader": "halfkay"
}
1 change: 0 additions & 1 deletion keyboards/hadron/ver3/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
#define RGBLIGHT_EFFECT_TWINKLE

#define RGBLED_NUM 10
#define RGB_DI_PIN B5
#define RGB_MATRIX_LED_COUNT RGBLED_NUM

// #define RGB_MATRIX_KEYPRESSES
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hadron/ver3/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
{"pin_a": "B13", "pin_b": "B14"}
]
},
"ws2812": {
"pin": "B5"
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C"
Expand Down
1 change: 0 additions & 1 deletion keyboards/halfcliff/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/>.
#define MATRIX_ROW_PINS { F5, F6, F7, D7, B5, F5, F6, F7, D7, B5 }
#define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }

#define RGB_DI_PIN D3
#define RGBLED_NUM 10
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 5, 5 }
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"
},
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/halokeys/elemental75/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#define TAP_CODE_DELAY 10 // tap_code function delay for register and unregister

#define RGB_DI_PIN A10
#define RGBLED_NUM 22
#define RGBLIGHT_LIMIT_VAL 225 // value set lower than 255 since current draw is too high
#define RGBLIGHT_SLEEP
Expand Down
3 changes: 3 additions & 0 deletions keyboards/halokeys/elemental75/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
{"pin_a": "B6", "pin_b": "B5"}
]
},
"ws2812": {
"pin": "A10"
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
Expand Down
1 change: 0 additions & 1 deletion keyboards/heliotrope/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

#ifdef RGB_MATRIX_ENABLE

#define RGB_DI_PIN A4 // The pin connected to the data pin of the LEDs
#define RGB_MATRIX_LED_COUNT 61 // The number of LEDs connected

#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
Expand Down
3 changes: 3 additions & 0 deletions keyboards/heliotrope/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"pid": "0x4466",
"vid": "0x3141"
},
"ws2812": {
"pin": "A4"
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
Expand Down
3 changes: 0 additions & 3 deletions keyboards/helix/pico/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AUDIO_PIN B5
#endif

/* ws2812 RGB LED */
#define RGB_DI_PIN D3

//#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h

// Helix keyboard RGB LED support
Expand Down
3 changes: 3 additions & 0 deletions keyboards/helix/pico/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"split": {
"soft_serial_pin": "D2"
},
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
3 changes: 0 additions & 3 deletions keyboards/helix/rev2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

/* ws2812 RGB LED */
#define RGB_DI_PIN D3

//#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h

// Helix keyboard RGB LED support
Expand Down
3 changes: 3 additions & 0 deletions keyboards/helix/rev2/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"split": {
"soft_serial_pin": "D2"
},
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/helix/rev3_4rows/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Dip switch on matrix grid */
#define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }

#define RGB_DI_PIN D3
#define RGBLED_NUM 50 // Number of LEDs

#ifdef RGB_MATRIX_ENABLE
Expand Down
3 changes: 3 additions & 0 deletions keyboards/helix/rev3_4rows/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
1 change: 0 additions & 1 deletion keyboards/helix/rev3_5rows/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Dip switch on matrix grid */
#define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }

#define RGB_DI_PIN D3
#define RGBLED_NUM 64 // Number of LEDs

#ifdef RGB_MATRIX_ENABLE
Expand Down
3 changes: 3 additions & 0 deletions keyboards/helix/rev3_5rows/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
1 change: 0 additions & 1 deletion keyboards/hfdkb/ac001/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#define TAP_CODE_DELAY 5

/* ws2812 RGB LED */
#define RGB_DI_PIN A1
#define RGB_MATRIX_LED_COUNT 5

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hfdkb/ac001/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"rows": ["B15"]
},
"diode_direction": "ROW2COL",
"ws2812": {
"pin": "A1"
},
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hidtech/bastyl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#pragma once

#define RGB_DI_PIN D2
#define RGBLED_NUM 38
#define RGBLIGHT_SPLIT
#define RGBLIGHT_EFFECT_BREATHING
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hidtech/bastyl/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"split": {
"soft_serial_pin": "D0"
},
"ws2812": {
"pin": "D2"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hifumi/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

/* ws2812 RGB LED */
#define RGB_DI_PIN D3
#define RGBLED_NUM 6
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_HUE_STEP 5
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hifumi/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"rows": ["D4", "C6"]
},
"diode_direction": "COL2ROW",
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/h08_ocelot/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 7
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hineybush/h08_ocelot/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"rows": ["B4", "B6"]
},
"diode_direction": "COL2ROW",
"ws2812": {
"pin": "F1"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/h60/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 B0
#define RGBLED_NUM 16
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hineybush/h60/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"pin": "B7",
"levels": 12
},
"ws2812": {
"pin": "B0"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"],
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/h65/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 D2
# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hineybush/h65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"indicators": {
"caps_lock": "E6"
},
"ws2812": {
"pin": "D2"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker", "65_iso_blocker_split_bs"],
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/h65_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 D2
# define RGBLED_NUM 17
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hineybush/h65_hotswap/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"indicators": {
"caps_lock": "E6"
},
"ws2812": {
"pin": "D2"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/h660s/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 B0
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hineybush/h660s/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
"ws2812": {
"pin": "B0"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/h75_singa/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 B3
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
3 changes: 3 additions & 0 deletions keyboards/hineybush/h75_singa/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
"ws2812": {
"pin": "B3"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/h87a/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/hineybush/h87a/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"backlight": {
"pin": "B7"
},
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/h88/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/hineybush/h88/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"backlight": {
"pin": "B7"
},
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/hineybush/hbcp/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//EITHERWAY is supported through a custom matrix
//#define DIODE_DIRECTION EITHERWAY

#define RGB_DI_PIN B0
#define RGBLED_NUM 27
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
Expand Down
Loading