Move WS2812_DRIVER to data driven (qmk#20248)

nicsuzor · Mar 28, 2023 · 131b390 · 131b390
1 parent 5be8375
commit 131b390
Show file tree

Hide file tree

Showing 384 changed files with 583 additions and 211 deletions.
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
@@ -38,6 +38,7 @@
     "PS2_ENABLE": {"info_key": "ps2.enabled", "value_type": "bool"},
     "PS2_MOUSE_ENABLE": {"info_key": "ps2.mouse_enabled", "value_type": "bool"},
     "PS2_DRIVER": {"info_key": "ps2.driver"},
+    "WS2812_DRIVER": {"info_key": "ws2812.driver"},
 
     "PLATFORM_KEY": {"info_key": "platform_key", "to_json": false},
 

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
@@ -699,6 +699,16 @@
                 "led": {"$ref": "qmk.definitions.v1#/mcu_pin"},
                 "speaker": {"$ref": "qmk.definitions.v1#/mcu_pin"}
             }
+        },
+        "ws2812": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["bitbang", "i2c", "pwm", "spi", "vendor"]
+                }
+            }
         }
     }
 }
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
@@ -0,0 +1,5 @@
+{
+    "ws2812": {
+        "driver": "vendor"
+    }
+}
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
@@ -1,2 +1 @@
-WS2812_DRIVER = vendor
 CONVERT_TO = rp2040_ce
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
@@ -13,6 +13,9 @@
     "dynamic_keymap": {
         "layer_count": 10
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "features": {
         "audio": false,
         "backlight": false,

diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
@@ -13,6 +13,9 @@
     "dynamic_keymap": {
         "layer_count": 10
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "features": {
         "audio": false,
         "backlight": false,

diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
@@ -13,6 +13,9 @@
     "dynamic_keymap": {
         "layer_count": 10
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "features": {
         "audio": false,
         "backlight": false,

diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
 OLED_ENABLE     = yes
 OLED_DRIVER     = SSD1306
 

diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json
@@ -24,6 +24,9 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP5", "GP8", "GP11", "GP6", "GP7", "GP0", "GP26", "GP10", "GP9", "GP1", "GP18", "GP20", "GP21", "GP27", "GP28", "GP19"],
         "rows": ["GP12", "GP13", "GP16", "GP25", "GP29"]

diff --git a/keyboards/1upkeyboards/pi60/rules.mk b/keyboards/1upkeyboards/pi60/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor

diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -23,6 +23,9 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP9", "GP8", "GP6", "GP5", "GP14", "GP20", "GP13", "GP12", "GP11", "GP16", "GP17", "GP10", "GP19", "GP18"],
         "rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"]

diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor

diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -26,6 +26,9 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP3", "GP4", "GP5", "GP20", "GP18", "GP13", "GP17", "GP16", "GP15", "GP12", "GP11", "GP14", "GP10", "GP9"],
         "rows": ["GP1", "GP2", "GP8", "GP6", "GP0", "GP21"]

diff --git a/keyboards/1upkeyboards/pi60_rgb/rules.mk b/keyboards/1upkeyboards/pi60_rgb/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor

diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
@@ -24,6 +24,9 @@
         "rgb_matrix": true,
         "rgblight": false
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "matrix_pins": {
         "cols": ["GP2",  "GP9", "GP8",  "GP7"],
         "rows": ["GP26", "GP1", "GP18", "GP5"]

diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor

diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
@@ -18,6 +18,9 @@
         "levels": 10,
         "breathing": true
     },
+    "ws2812": {
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {

diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF

diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/info.json
@@ -20,6 +20,9 @@
         "pid": "0x0001",
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",

diff --git a/keyboards/abatskeyboardclub/nayeon/rules.mk b/keyboards/abatskeyboardclub/nayeon/rules.mk
@@ -1,4 +1,3 @@
 # RGB Matrix
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
@@ -16,6 +16,9 @@
     "bootmagic": {
         "matrix": [1, 2]
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "matrix_pins": {

diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk
@@ -14,7 +14,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor
 OLED_ENABLE = yes
 OLED_DRIVER = custom
 # Project specific files

diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/info.json
@@ -12,6 +12,9 @@
         "levels": 6,
         "breathing": true
     },
+    "ws2812": {
+        "driver": "spi"
+    },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",

diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json
@@ -8,6 +8,9 @@
         "pid": "0x2323",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
         "rows": ["A0", "A1", "A2", "A3"]

diff --git a/keyboards/amag23/rules.mk b/keyboards/amag23/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json
@@ -20,6 +20,9 @@
         "rgblight": false,
         "rgb_matrix": true
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP0",  "GP1",  "GP2",  "GP3",  "GP4",  "GP5",  "GP6",

diff --git a/keyboards/an_achronism/tetromino/rules.mk b/keyboards/an_achronism/tetromino/rules.mk
@@ -1,2 +0,0 @@
-# Use dedicated PIO on Raspberry Pi Pico for RGB LEDs:
-WS2812_DRIVER = vendor

diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json
@@ -34,6 +34,9 @@
 		"twinkle": true
         }
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "encoder": {
 	"enabled": true,
         "rotary": [

diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 

diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json
@@ -39,6 +39,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "encoder": {
     "enabled": true,
         "rotary": [

diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306     # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
 

diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/info.json
@@ -39,6 +39,9 @@
 		"twinkle": true
         }
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "encoder": {
 	"enabled": true,
         "rotary": [

diff --git a/keyboards/anavi/macropad10/rules.mk b/keyboards/anavi/macropad10/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor

diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json
@@ -22,6 +22,9 @@
     "bootmagic": {
         "matrix": [4, 0]
     },
+    "ws2812": {
+        "driver": "i2c"
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layout_aliases": {

diff --git a/keyboards/ares/rules.mk b/keyboards/ares/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json
@@ -8,6 +8,9 @@
         "pid": "0x4136",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "driver": "pwm"
+    },
     "matrix_pins": {
         "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "B2", "B1", "B0", "A0", "A1", "A2", "A3", "A5"],
         "rows": ["B3", "B4", "B5", "A8", "A4"]

diff --git a/keyboards/aurora65/rules.mk b/keyboards/aurora65/rules.mk
@@ -17,5 +17,4 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-WS2812_DRIVER = pwm         # Driver for RGB uderglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "driver": "pwm"
+    },
     "matrix_pins": {
         "cols": ["B1", "B10", "B3", "B4", "B5"],
         "rows": ["A2", "B8", "A8", "B9"]

diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -25,7 +25,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
@@ -11,6 +11,9 @@
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -11,6 +11,9 @@
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "2.0.0"
     },
+    "ws2812": {
+        "driver": "pwm"
+    },
     "matrix_pins": {
         "cols": ["F5", "B6", "D7", "E6", "B4"],
         "rows": ["F7", "C6", "D4", "B5"]

diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -27,6 +27,5 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 SERIAL_DRIVER = usart
-WS2812_DRIVER = pwm
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "driver": "pwm"
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
         "rows": ["A2", "B8", "A8", "B9"]

diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -25,7 +25,6 @@ MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
 KEYBOARD_SHARED_EP = yes
 
 EEPROM_DRIVER = spi
-WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 
 DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -11,6 +11,9 @@
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
 POINTING_DEVICE_DRIVER = pmw3360
 
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -11,6 +11,9 @@
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "ws2812": {
+        "driver": "vendor"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040"
 }
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		# Use dedicated PIO on Raspberry Pi Pico for RGB LEDs:
		WS2812_DRIVER = vendor
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,3 @@ POINTING_DEVICE_ENABLE = yes # Enable trackball
		POINTING_DEVICE_DRIVER = pmw3360

		SERIAL_DRIVER = vendor
		WS2812_DRIVER = vendor