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

master
Ryan 2024-04-24 13:59:57 +10:00 committed by GitHub
parent d9740c9de1
commit c505ea48b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
38 changed files with 64 additions and 18 deletions

View File

@ -23,6 +23,7 @@
"ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"}, "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
"ENCODER_DRIVER": {"info_key": "encoder.driver"}, "ENCODER_DRIVER": {"info_key": "encoder.driver"},
"FIRMWARE_FORMAT": {"info_key": "build.firmware_format"}, "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"}, "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
"LAYOUTS": {"info_key": "community_layouts", "value_type": "list"}, "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
"LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"}, "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},

View File

@ -387,6 +387,15 @@
} }
} }
}, },
"haptic": {
"type": "object",
"properties": {
"driver": {
"type": "string",
"enum": ["drv2605l", "solenoid"]
}
}
},
"leader_key": { "leader_key": {
"type": "object", "type": "object",
"properties": { "properties": {

View File

@ -22,6 +22,9 @@
"resync": true "resync": true
} }
}, },
"haptic": {
"driver": "solenoid"
},
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -17,6 +17,9 @@
"haptic": true, "haptic": true,
"oled": true "oled": true
}, },
"haptic": {
"driver": "drv2605l"
},
"rgb_matrix": { "rgb_matrix": {
"driver": "ws2812" "driver": "ws2812"
}, },

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = drv2605l

View File

@ -31,6 +31,9 @@
"qmk": { "qmk": {
"tap_keycode_delay": 10 "tap_keycode_delay": 10
}, },
"haptic": {
"driver": "solenoid"
},
"url": "https://github.com/dcpedit/redherring", "url": "https://github.com/dcpedit/redherring",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0",

View File

@ -1,2 +1 @@
F_CPU = 16000000 F_CPU = 16000000
HAPTIC_DRIVER = solenoid

View File

@ -15,6 +15,9 @@
{"pin_a": "B13", "pin_b": "B14"} {"pin_a": "B13", "pin_b": "B14"}
] ]
}, },
"haptic": {
"driver": "drv2605l"
},
"rgblight": { "rgblight": {
"led_count": 10, "led_count": 10,
"animations": { "animations": {

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = drv2605l

View File

@ -15,6 +15,9 @@
"oled": true, "oled": true,
"wpm": true "wpm": true
}, },
"haptic": {
"driver": "solenoid"
},
"build": { "build": {
"lto": true "lto": true
}, },

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -11,6 +11,9 @@
"keyboard": true "keyboard": true
} }
}, },
"haptic": {
"driver": "solenoid"
},
"indicators": { "indicators": {
"caps_lock": "C11", "caps_lock": "C11",
"num_lock": "C12", "num_lock": "C12",

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -17,6 +17,9 @@
"mousekey": true, "mousekey": true,
"nkro": true "nkro": true
}, },
"haptic": {
"driver": "solenoid"
},
"matrix_pins": { "matrix_pins": {
"cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"] "rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"]

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -31,6 +31,9 @@
{"pin_a": "E0", "pin_b": "D7", "resolution": 1} {"pin_a": "E0", "pin_b": "D7", "resolution": 1}
] ]
}, },
"haptic": {
"driver": "drv2605l"
},
"indicators": { "indicators": {
"caps_lock": "F4", "caps_lock": "F4",
"num_lock": "F5", "num_lock": "F5",

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = drv2605l

View File

@ -31,6 +31,9 @@
"scroll_lock": "B2", "scroll_lock": "B2",
"on_state": 0 "on_state": 0
}, },
"haptic": {
"driver": "drv2605l"
},
"rgblight": { "rgblight": {
"saturation_steps": 8, "saturation_steps": 8,
"brightness_steps": 8, "brightness_steps": 8,

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = drv2605l

View File

@ -31,6 +31,9 @@
{"pin_a": "E7", "pin_b": "E6", "resolution": 1} {"pin_a": "E7", "pin_b": "E6", "resolution": 1}
] ]
}, },
"haptic": {
"driver": "drv2605l"
},
"indicators": { "indicators": {
"caps_lock": "C5", "caps_lock": "C5",
"num_lock": "C4", "num_lock": "C4",

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = drv2605l # Rumble motor

View File

@ -22,6 +22,9 @@
"oled": true, "oled": true,
"rgblight": true "rgblight": true
}, },
"haptic": {
"driver": "drv2605l"
},
"rgblight": { "rgblight": {
"saturation_steps": 8, "saturation_steps": 8,
"brightness_steps": 8, "brightness_steps": 8,

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = drv2605l

View File

@ -15,6 +15,9 @@
"num_lock": "C12", "num_lock": "C12",
"scroll_lock": "C10" "scroll_lock": "C10"
}, },
"haptic": {
"driver": "solenoid"
},
"processor": "STM32F446", "processor": "STM32F446",
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu",
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -10,6 +10,9 @@
"mousekey": true, "mousekey": true,
"nkro": false "nkro": false
}, },
"haptic": {
"driver": "solenoid"
},
"indicators": { "indicators": {
"caps_lock": "C11", "caps_lock": "C11",
"num_lock": "C12", "num_lock": "C12",

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -10,6 +10,9 @@
"mousekey": true, "mousekey": true,
"nkro": false "nkro": false
}, },
"haptic": {
"driver": "solenoid"
},
"indicators": { "indicators": {
"caps_lock": "C11", "caps_lock": "C11",
"num_lock": "C12", "num_lock": "C12",

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -10,6 +10,9 @@
"mousekey": true, "mousekey": true,
"nkro": false "nkro": false
}, },
"haptic": {
"driver": "solenoid"
},
"indicators": { "indicators": {
"caps_lock": "C12" "caps_lock": "C12"
}, },

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -13,6 +13,9 @@
"indicators": { "indicators": {
"caps_lock": "C12" "caps_lock": "C12"
}, },
"haptic": {
"driver": "solenoid"
},
"processor": "STM32F446", // RET6 "processor": "STM32F446", // RET6
"bootloader": "stm32-dfu", "bootloader": "stm32-dfu",
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -30,6 +30,9 @@
"caps_lock": "C13", "caps_lock": "C13",
"on_state": 0 "on_state": 0
}, },
"haptic": {
"driver": "solenoid"
},
"rgblight": { "rgblight": {
"led_count": 9, "led_count": 9,
"animations": { "animations": {

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid

View File

@ -20,6 +20,9 @@
"enabled": true "enabled": true
} }
}, },
"haptic": {
"driver": "solenoid"
},
"matrix_pins": { "matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5"] "rows": ["D0", "D1", "D2", "D3", "D5"]

View File

@ -1 +0,0 @@
HAPTIC_DRIVER = solenoid