diff options
Diffstat (limited to 'keyboards/boardsource')
22 files changed, 38 insertions, 23 deletions
diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h index 587dda7381..75b5888bc3 100644 --- a/keyboards/boardsource/beiwagon/config.h +++ b/keyboards/boardsource/beiwagon/config.h @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define RGB_DI_PIN C6 #define RGB_MATRIX_LED_COUNT 18 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/info.json index 69ce8d96f1..ac0e023c44 100644 --- a/keyboards/boardsource/beiwagon/info.json +++ b/keyboards/boardsource/beiwagon/info.json @@ -10,6 +10,9 @@ "mousekey": false, "rgb_matrix": true }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["B5", "B6", "B7"], "rows": ["B0", "B1", "B2", "B3"] @@ -22,6 +25,7 @@ "vid": "0x4273" }, "rgb_matrix": { + "driver": "WS2812", "layout": [ { "flags": 2, "x": 16, "y": 38 }, { "flags": 2, "x": 16, "y": 113 }, diff --git a/keyboards/boardsource/beiwagon/rules.mk b/keyboards/boardsource/beiwagon/rules.mk index 32afd21635..e69de29bb2 100644 --- a/keyboards/boardsource/beiwagon/rules.mk +++ b/keyboards/boardsource/beiwagon/rules.mk @@ -1 +0,0 @@ -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json index 393b4fd806..359b95c699 100644 --- a/keyboards/boardsource/holiday/spooky/info.json +++ b/keyboards/boardsource/holiday/spooky/info.json @@ -22,7 +22,6 @@ }, "rgblight": { "led_count": 5, - "pin": "D3", "sleep": true, "animations": { "alternating": true, @@ -37,6 +36,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "community_layouts": [ "ortho_2x3" ], diff --git a/keyboards/boardsource/lulu/avr/info.json b/keyboards/boardsource/lulu/avr/info.json index 2c9155f6ad..73f86a435f 100644 --- a/keyboards/boardsource/lulu/avr/info.json +++ b/keyboards/boardsource/lulu/avr/info.json @@ -10,12 +10,12 @@ "split": { "soft_serial_pin": "D2" }, - "rgblight": { + "ws2812": { "pin": "D3" }, "encoder": { "rotary": [ - { "pin_a": "F4", "pin_b": "F5" } + {"pin_a": "F4", "pin_b": "F5"} ] } } diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h index 8728002a39..7dea913a0f 100644 --- a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h +++ b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h @@ -23,7 +23,6 @@ #define TAPPING_TERM 210 /*#define PERMISSIVE_HOLD*/ -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_FORCE_HOLD #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/boardsource/lulu/keymaps/via/keymap.c b/keyboards/boardsource/lulu/keymaps/via/keymap.c index 67ef4b7b6b..bf5ffc7a9b 100644 --- a/keyboards/boardsource/lulu/keymaps/via/keymap.c +++ b/keyboards/boardsource/lulu/keymaps/via/keymap.c @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) }, [_LOWER] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [_RAISE] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, diff --git a/keyboards/boardsource/lulu/rp2040/config.h b/keyboards/boardsource/lulu/rp2040/config.h index 4f50a586df..2c86e48e6f 100644 --- a/keyboards/boardsource/lulu/rp2040/config.h +++ b/keyboards/boardsource/lulu/rp2040/config.h @@ -9,4 +9,3 @@ #define I2C_DRIVER I2CD1 #define I2C1_SDA_PIN GP22 #define I2C1_SCL_PIN GP23 -#define RGB_DI_PIN GP29 diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/info.json index c50260c7c5..a1e8db89a9 100644 --- a/keyboards/boardsource/lulu/rp2040/info.json +++ b/keyboards/boardsource/lulu/rp2040/info.json @@ -7,7 +7,11 @@ "processor": "RP2040", "encoder": { "rotary": [ - { "pin_a": "GP8", "pin_b": "GP9" } + {"pin_a": "GP8", "pin_b": "GP9"} ] + }, + "ws2812": { + "pin": "GP29", + "driver": "vendor" } } diff --git a/keyboards/boardsource/lulu/rp2040/rules.mk b/keyboards/boardsource/lulu/rp2040/rules.mk index 8fb51ec82d..161ec22b16 100644 --- a/keyboards/boardsource/lulu/rp2040/rules.mk +++ b/keyboards/boardsource/lulu/rp2040/rules.mk @@ -1,2 +1 @@ SERIAL_DRIVER = vendor -WS2812_DRIVER = vendor diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/info.json index ba8307221a..6e47fbd2c4 100644 --- a/keyboards/boardsource/microdox/v1/info.json +++ b/keyboards/boardsource/microdox/v1/info.json @@ -13,7 +13,6 @@ "soft_serial_pin": "D2" }, "rgblight": { - "pin": "D3", "sleep": true, "led_count": 12, "split_count": [6, 6], @@ -30,5 +29,8 @@ "static_gradient": true, "twinkle": true } - } + }, + "ws2812": { + "pin": "D3" + }, } diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h index 4846bf5146..236254317a 100644 --- a/keyboards/boardsource/microdox/v2/config.h +++ b/keyboards/boardsource/microdox/v2/config.h @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define RGB_DI_PIN B5 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define RGB_MATRIX_LED_COUNT 44 #define RGB_MATRIX_SPLIT { 22, 22 } diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/info.json index a53dfff708..9e5fc60377 100644 --- a/keyboards/boardsource/microdox/v2/info.json +++ b/keyboards/boardsource/microdox/v2/info.json @@ -9,10 +9,13 @@ "usb": { "device_version": "2.0.0" }, + "ws2812": { + "pin": "B5" + }, "encoder": { "enabled": true, "rotary": [ - { "pin_a": "E6", "pin_b": "B2"} + {"pin_a": "E6", "pin_b": "B2"} ] }, "split": { @@ -26,12 +29,13 @@ "encoder": { "right": { "rotary": [ - { "pin_a": "B6", "pin_b": "B2" } + {"pin_a": "B6", "pin_b": "B2"} ] } } }, "rgb_matrix": { + "driver": "WS2812", "layout": [ { "flags": 2, "x": 12, "y": 11 }, { "flags": 2, "x": 86, "y": 11 }, diff --git a/keyboards/boardsource/microdox/v2/rules.mk b/keyboards/boardsource/microdox/v2/rules.mk index 32afd21635..e69de29bb2 100644 --- a/keyboards/boardsource/microdox/v2/rules.mk +++ b/keyboards/boardsource/microdox/v2/rules.mk @@ -1 +0,0 @@ -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h index c6edbf1c4e..1148c13ebc 100644 --- a/keyboards/boardsource/technik_o/config.h +++ b/keyboards/boardsource/technik_o/config.h @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define RGB_DI_PIN C6 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_LED_COUNT 58 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/info.json index d84a976e13..df0dbd63a5 100644 --- a/keyboards/boardsource/technik_o/info.json +++ b/keyboards/boardsource/technik_o/info.json @@ -11,6 +11,9 @@ "nkro": true, "rgb_matrix": true }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6"], "rows": ["B0", "B1", "B2", "B3"] @@ -22,7 +25,8 @@ "pid": "0x0079", "vid": "0x4273" }, - "rgb_matrix": { + "rgb_matrix": { + "driver": "WS2812", "layout": [ { "flags": 2, "x": 220, "y": 17 }, { "flags": 2, "x": 172, "y": 17 }, diff --git a/keyboards/boardsource/technik_o/rules.mk b/keyboards/boardsource/technik_o/rules.mk index 32afd21635..e69de29bb2 100644 --- a/keyboards/boardsource/technik_o/rules.mk +++ b/keyboards/boardsource/technik_o/rules.mk @@ -1 +0,0 @@ -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h index ab4d79147c..fe6518356e 100644 --- a/keyboards/boardsource/technik_s/config.h +++ b/keyboards/boardsource/technik_s/config.h @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define RGB_DI_PIN C6 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 #define RGB_MATRIX_LED_COUNT 55 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/info.json index 6593845e83..089acc9397 100644 --- a/keyboards/boardsource/technik_s/info.json +++ b/keyboards/boardsource/technik_s/info.json @@ -11,6 +11,9 @@ "nkro": true, "rgb_matrix": true }, + "ws2812": { + "pin": "C6" + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "F5", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6"], "rows": ["B0", "B1", "B2", "B3"] @@ -23,6 +26,7 @@ "vid": "0x4273" }, "rgb_matrix": { + "driver": "WS2812", "layout": [ { "flags": 2, "x": 220, "y": 17 }, { "flags": 2, "x": 172, "y": 17 }, diff --git a/keyboards/boardsource/technik_s/rules.mk b/keyboards/boardsource/technik_s/rules.mk index 32afd21635..e69de29bb2 100644 --- a/keyboards/boardsource/technik_s/rules.mk +++ b/keyboards/boardsource/technik_s/rules.mk @@ -1 +0,0 @@ -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json index 46f10affcd..c73d93fa9d 100644 --- a/keyboards/boardsource/the_mark/info.json +++ b/keyboards/boardsource/the_mark/info.json @@ -24,7 +24,6 @@ }, "rgblight": { "led_count": 24, - "pin": "C6", "sleep": true, "max_brightness": 200, "animations": { @@ -40,7 +39,11 @@ "twinkle": true } }, + "ws2812": { + "pin": "C6" + }, "rgb_matrix": { + "driver": "WS2812", "layout": [ { "flags": 2, "x": 224, "y": 42}, { "flags": 2, "x": 224, "y": 21}, diff --git a/keyboards/boardsource/the_mark/rules.mk b/keyboards/boardsource/the_mark/rules.mk index 32afd21635..e69de29bb2 100644 --- a/keyboards/boardsource/the_mark/rules.mk +++ b/keyboards/boardsource/the_mark/rules.mk @@ -1 +0,0 @@ -RGB_MATRIX_DRIVER = WS2812 |