M data/mappings/info_rules.hjson => data/mappings/info_rules.hjson +1 -0
@@ 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"},
M data/schemas/keyboard.jsonschema => data/schemas/keyboard.jsonschema +9 -0
@@ 387,6 387,15 @@
}
}
},
+ "haptic": {
+ "type": "object",
+ "properties": {
+ "driver": {
+ "type": "string",
+ "enum": ["drv2605l", "solenoid"]
+ }
+ }
+ },
"leader_key": {
"type": "object",
"properties": {
M keyboards/ai03/lunar_ii/keyboard.json => keyboards/ai03/lunar_ii/keyboard.json +3 -0
@@ 22,6 22,9 @@
"resync": true
}
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
D keyboards/ai03/lunar_ii/rules.mk => keyboards/ai03/lunar_ii/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/boston_meetup/2019/keyboard.json => keyboards/boston_meetup/2019/keyboard.json +3 -0
@@ 17,6 17,9 @@
"haptic": true,
"oled": true
},
+ "haptic": {
+ "driver": "drv2605l"
+ },
"rgb_matrix": {
"driver": "ws2812"
},
D keyboards/boston_meetup/2019/rules.mk => keyboards/boston_meetup/2019/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = drv2605l
M keyboards/dcpedit/redherring/keyboard.json => keyboards/dcpedit/redherring/keyboard.json +3 -0
@@ 31,6 31,9 @@
"qmk": {
"tap_keycode_delay": 10
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"url": "https://github.com/dcpedit/redherring",
"usb": {
"device_version": "1.0.0",
M keyboards/dcpedit/redherring/rules.mk => keyboards/dcpedit/redherring/rules.mk +0 -1
@@ 1,2 1,1 @@
F_CPU = 16000000
-HAPTIC_DRIVER = solenoid>
\ No newline at end of file
M keyboards/hadron/ver3/keyboard.json => keyboards/hadron/ver3/keyboard.json +3 -0
@@ 15,6 15,9 @@
{"pin_a": "B13", "pin_b": "B14"}
]
},
+ "haptic": {
+ "driver": "drv2605l"
+ },
"rgblight": {
"led_count": 10,
"animations": {
D keyboards/hadron/ver3/rules.mk => keyboards/hadron/ver3/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = drv2605l
M keyboards/hardwareabstraction/handwire/keyboard.json => keyboards/hardwareabstraction/handwire/keyboard.json +3 -0
@@ 15,6 15,9 @@
"oled": true,
"wpm": true
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"build": {
"lto": true
},
D keyboards/hardwareabstraction/handwire/rules.mk => keyboards/hardwareabstraction/handwire/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json => keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json +3 -0
@@ 11,6 11,9 @@
"keyboard": true
}
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"indicators": {
"caps_lock": "C11",
"num_lock": "C12",
D keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk => keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
R keyboards/mechwild/clunker/info.json => keyboards/mechwild/clunker/keyboard.json +3 -0
@@ 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"]
D keyboards/mechwild/clunker/rules.mk => keyboards/mechwild/clunker/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/pearlboards/atlas/keyboard.json => keyboards/pearlboards/atlas/keyboard.json +3 -0
@@ 31,6 31,9 @@
{"pin_a": "E0", "pin_b": "D7", "resolution": 1}
]
},
+ "haptic": {
+ "driver": "drv2605l"
+ },
"indicators": {
"caps_lock": "F4",
"num_lock": "F5",
D keyboards/pearlboards/atlas/rules.mk => keyboards/pearlboards/atlas/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = drv2605l
M keyboards/pearlboards/pearl/keyboard.json => keyboards/pearlboards/pearl/keyboard.json +3 -0
@@ 31,6 31,9 @@
"scroll_lock": "B2",
"on_state": 0
},
+ "haptic": {
+ "driver": "drv2605l"
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
D keyboards/pearlboards/pearl/rules.mk => keyboards/pearlboards/pearl/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = drv2605l
M keyboards/pearlboards/zeus/keyboard.json => keyboards/pearlboards/zeus/keyboard.json +3 -0
@@ 31,6 31,9 @@
{"pin_a": "E7", "pin_b": "E6", "resolution": 1}
]
},
+ "haptic": {
+ "driver": "drv2605l"
+ },
"indicators": {
"caps_lock": "C5",
"num_lock": "C4",
D keyboards/pearlboards/zeus/rules.mk => keyboards/pearlboards/zeus/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = drv2605l # Rumble motor
M keyboards/splitkb/zima/keyboard.json => keyboards/splitkb/zima/keyboard.json +3 -0
@@ 22,6 22,9 @@
"oled": true,
"rgblight": true
},
+ "haptic": {
+ "driver": "drv2605l"
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
D keyboards/splitkb/zima/rules.mk => keyboards/splitkb/zima/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = drv2605l
M keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json => keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json +3 -0
@@ 15,6 15,9 @@
"num_lock": "C12",
"scroll_lock": "C10"
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"processor": "STM32F446",
"bootloader": "stm32-dfu",
"diode_direction": "ROW2COL",
D keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk => keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json => keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json +3 -0
@@ 10,6 10,9 @@
"mousekey": true,
"nkro": false
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"indicators": {
"caps_lock": "C11",
"num_lock": "C12",
D keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk => keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json => keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json +3 -0
@@ 10,6 10,9 @@
"mousekey": true,
"nkro": false
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"indicators": {
"caps_lock": "C11",
"num_lock": "C12",
D keyboards/unicomp/pc122/overnumpad_1xb/rules.mk => keyboards/unicomp/pc122/overnumpad_1xb/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json => keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json +3 -0
@@ 10,6 10,9 @@
"mousekey": true,
"nkro": false
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"indicators": {
"caps_lock": "C12"
},
D keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk => keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json => keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json +3 -0
@@ 13,6 13,9 @@
"indicators": {
"caps_lock": "C12"
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"processor": "STM32F446", // RET6
"bootloader": "stm32-dfu",
"diode_direction": "ROW2COL",
D keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk => keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/vertex/angle65/keyboard.json => keyboards/vertex/angle65/keyboard.json +3 -0
@@ 30,6 30,9 @@
"caps_lock": "C13",
"on_state": 0
},
+ "haptic": {
+ "driver": "solenoid"
+ },
"rgblight": {
"led_count": 9,
"animations": {
D keyboards/vertex/angle65/rules.mk => keyboards/vertex/angle65/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid
M keyboards/xw60/keyboard.json => keyboards/xw60/keyboard.json +3 -0
@@ 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"]
D keyboards/xw60/rules.mk => keyboards/xw60/rules.mk +0 -1
@@ 1,1 0,0 @@
-HAPTIC_DRIVER = solenoid