Add haptic driver to keyboard.json schema (#23591)

2024-11-25 01:47:10 +06:00 · 2024-04-24 13:59:57 +10:00 · 2024-04-24 13:59:57 +10:00 · c505ea48b3
commit c505ea48b3
parent d9740c9de1
38 changed files with 64 additions and 18 deletions
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@ -23,6 +23,7 @@
    "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
    "ENCODER_DRIVER": {"info_key": "encoder.driver"},
    "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
+    "HAPTIC_DRIVER": {"info_key": "haptic.driver"},
    "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
    "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
    "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@ -387,6 +387,15 @@
                }
            }
        },
+        "haptic": {
+            "type": "object",
+            "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["drv2605l", "solenoid"]
+                }
+            }
+        },
        "leader_key": {
            "type": "object",
            "properties": {
--- a/keyboards/ai03/lunar_ii/keyboard.json
+++ b/keyboards/ai03/lunar_ii/keyboard.json
@ -22,6 +22,9 @@
            "resync": true
        }
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "diode_direction": "COL2ROW",
--- a/keyboards/ai03/lunar_ii/rules.mk
+++ b/keyboards/ai03/lunar_ii/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/boston_meetup/2019/keyboard.json
+++ b/keyboards/boston_meetup/2019/keyboard.json
@ -17,6 +17,9 @@
        "haptic": true,
        "oled": true
    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
    "rgb_matrix": {
        "driver": "ws2812"
    },
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l
--- a/keyboards/dcpedit/redherring/keyboard.json
+++ b/keyboards/dcpedit/redherring/keyboard.json
@ -31,6 +31,9 @@
    "qmk": {
        "tap_keycode_delay": 10
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "url": "https://github.com/dcpedit/redherring",
    "usb": {
        "device_version": "1.0.0",
--- a/keyboards/dcpedit/redherring/rules.mk
+++ b/keyboards/dcpedit/redherring/rules.mk
@ -1,2 +1 @@
 F_CPU = 16000000
-HAPTIC_DRIVER = solenoid
--- a/keyboards/hadron/ver3/keyboard.json
+++ b/keyboards/hadron/ver3/keyboard.json
@ -15,6 +15,9 @@
            {"pin_a": "B13", "pin_b": "B14"}
        ]
    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
    "rgblight": {
        "led_count": 10,
        "animations": {
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l
--- a/keyboards/hardwareabstraction/handwire/keyboard.json
+++ b/keyboards/hardwareabstraction/handwire/keyboard.json
@ -15,6 +15,9 @@
        "oled": true,
        "wpm": true
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "build": {
        "lto": true
    },
--- a/keyboards/hardwareabstraction/handwire/rules.mk
+++ b/keyboards/hardwareabstraction/handwire/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
@ -11,6 +11,9 @@
             "keyboard": true
        }
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "indicators": {
        "caps_lock": "C11",
        "num_lock": "C12",
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/mechwild/clunker/keyboard.json
+++ b/keyboards/mechwild/clunker/keyboard.json
@ -17,6 +17,9 @@
        "mousekey": true,
        "nkro": true
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "matrix_pins": {
        "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
        "rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"]
--- a/keyboards/mechwild/clunker/rules.mk
+++ b/keyboards/mechwild/clunker/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/pearlboards/atlas/keyboard.json
+++ b/keyboards/pearlboards/atlas/keyboard.json
@ -31,6 +31,9 @@
            {"pin_a": "E0", "pin_b": "D7", "resolution": 1}
        ]
    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
    "indicators": {
        "caps_lock": "F4",
        "num_lock": "F5",
--- a/keyboards/pearlboards/atlas/rules.mk
+++ b/keyboards/pearlboards/atlas/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l
--- a/keyboards/pearlboards/pearl/keyboard.json
+++ b/keyboards/pearlboards/pearl/keyboard.json
@ -31,6 +31,9 @@
        "scroll_lock": "B2",
        "on_state": 0
    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
    "rgblight": {
        "saturation_steps": 8,
        "brightness_steps": 8,
--- a/keyboards/pearlboards/pearl/rules.mk
+++ b/keyboards/pearlboards/pearl/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l
--- a/keyboards/pearlboards/zeus/keyboard.json
+++ b/keyboards/pearlboards/zeus/keyboard.json
@ -31,6 +31,9 @@
            {"pin_a": "E7", "pin_b": "E6", "resolution": 1}
        ]
    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
    "indicators": {
        "caps_lock": "C5",
        "num_lock": "C4",
--- a/keyboards/pearlboards/zeus/rules.mk
+++ b/keyboards/pearlboards/zeus/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l    # Rumble motor
--- a/keyboards/splitkb/zima/keyboard.json
+++ b/keyboards/splitkb/zima/keyboard.json
@ -22,6 +22,9 @@
        "oled": true,
        "rgblight": true
    },
+    "haptic": {
+        "driver": "drv2605l"
+    },
    "rgblight": {
        "saturation_steps": 8,
        "brightness_steps": 8,
--- a/keyboards/splitkb/zima/rules.mk
+++ b/keyboards/splitkb/zima/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = drv2605l
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
@ -15,6 +15,9 @@
        "num_lock": "C12",
        "scroll_lock": "C10"
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "processor": "STM32F446",
    "bootloader": "stm32-dfu",
    "diode_direction": "ROW2COL",
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
@ -10,6 +10,9 @@
        "mousekey": true,
        "nkro": false
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "indicators": {
        "caps_lock": "C11",
        "num_lock": "C12",
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
@ -10,6 +10,9 @@
        "mousekey": true,
        "nkro": false
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "indicators": {
        "caps_lock": "C11",
        "num_lock": "C12",
--- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
@ -10,6 +10,9 @@
        "mousekey": true,
        "nkro": false
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "indicators": {
        "caps_lock": "C12"
    },
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
@ -13,6 +13,9 @@
    "indicators": {
        "caps_lock": "C12"
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "processor": "STM32F446", // RET6
    "bootloader": "stm32-dfu",
    "diode_direction": "ROW2COL",
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/vertex/angle65/keyboard.json
+++ b/keyboards/vertex/angle65/keyboard.json
@ -30,6 +30,9 @@
        "caps_lock": "C13",
        "on_state": 0
    },
+    "haptic": {
+        "driver": "solenoid"
+    },
    "rgblight": {
        "led_count": 9,
        "animations": {
--- a/keyboards/vertex/angle65/rules.mk
+++ b/keyboards/vertex/angle65/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid
--- a/keyboards/xw60/keyboard.json
+++ b/keyboards/xw60/keyboard.json
@ -20,6 +20,9 @@
          "enabled": true
      }
    },
+    "haptic": {
+      "driver": "solenoid"
+    },
    "matrix_pins": {
      "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
      "rows": ["D0", "D1", "D2", "D3", "D5"]
--- a/keyboards/xw60/rules.mk
+++ b/keyboards/xw60/rules.mk
@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid