This website works better with JavaScript.
Home
Explore
Help
Sign In
mh
/
qmk_firmware
mirror of
https://github.com/qmk/qmk_firmware/
Watch
1
Star
0
Fork
0
Code
Issues
0
Projects
0
Releases
1.6k
Wiki
Activity
Browse Source
Merge remote-tracking branch 'origin/develop' into xap
xap
QMK Bot
1 week ago
parent
972c5f9d62
c505ea48b3
commit
da0b05512a
38 changed files
with
64 additions
and
18 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+1
-0
data/mappings/info_rules.hjson
+9
-0
data/schemas/keyboard.jsonschema
+3
-0
keyboards/ai03/lunar_ii/keyboard.json
+0
-1
keyboards/ai03/lunar_ii/rules.mk
+3
-0
keyboards/boston_meetup/2019/keyboard.json
+0
-1
keyboards/boston_meetup/2019/rules.mk
+3
-0
keyboards/dcpedit/redherring/keyboard.json
+0
-1
keyboards/dcpedit/redherring/rules.mk
+3
-0
keyboards/hadron/ver3/keyboard.json
+0
-1
keyboards/hadron/ver3/rules.mk
+3
-0
keyboards/hardwareabstraction/handwire/keyboard.json
+0
-1
keyboards/hardwareabstraction/handwire/rules.mk
+3
-0
keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
+0
-1
keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
+3
-0
keyboards/mechwild/clunker/keyboard.json
+0
-1
keyboards/mechwild/clunker/rules.mk
+3
-0
keyboards/pearlboards/atlas/keyboard.json
+0
-1
keyboards/pearlboards/atlas/rules.mk
+3
-0
keyboards/pearlboards/pearl/keyboard.json
+0
-1
keyboards/pearlboards/pearl/rules.mk
+3
-0
keyboards/pearlboards/zeus/keyboard.json
+0
-1
keyboards/pearlboards/zeus/rules.mk
+3
-0
keyboards/splitkb/zima/keyboard.json
+0
-1
keyboards/splitkb/zima/rules.mk
+3
-0
keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
+0
-1
keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
+3
-0
keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
+0
-1
keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
+3
-0
keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
+0
-1
keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
+3
-0
keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
+0
-1
keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
+3
-0
keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
+0
-1
keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
+3
-0
keyboards/vertex/angle65/keyboard.json
+0
-1
keyboards/vertex/angle65/rules.mk
+3
-0
keyboards/xw60/keyboard.json
+0
-1
keyboards/xw60/rules.mk
+ 1
- 0
data/mappings/info_rules.hjson
View File
@ -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"},
+ 9
- 0
data/schemas/keyboard.jsonschema
View File
@ -387,6 +387,15 @@
}
}
},
"haptic": {
"type": "object",
"properties": {
"driver": {
"type": "string",
"enum": ["drv2605l", "solenoid"]
}
}
},
"leader_key": {
"type": "object",
"properties": {
+ 3
- 0
keyboards/ai03/lunar_ii/keyboard.json
View File
@ -22,6 +22,9 @@
"resync"
:
true
}
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"processor"
:
"atmega32u4"
,
"bootloader"
:
"atmel-dfu"
,
"diode_direction"
:
"COL2ROW"
,
+ 0
- 1
keyboards/ai03/lunar_ii/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/boston_meetup/2019/keyboard.json
View File
@ -17,6 +17,9 @@
"haptic"
:
true
,
"oled"
:
true
}
,
"haptic"
:
{
"driver"
:
"drv2605l"
}
,
"rgb_matrix"
:
{
"driver"
:
"ws2812"
}
,
+ 0
- 1
keyboards/boston_meetup/2019/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
drv2605l
+ 3
- 0
keyboards/dcpedit/redherring/keyboard.json
View File
@ -31,6 +31,9 @@
"qmk"
:
{
"tap_keycode_delay"
:
10
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"url"
:
"https://github.com/dcpedit/redherring"
,
"usb"
:
{
"device_version"
:
"1.0.0"
,
+ 0
- 1
keyboards/dcpedit/redherring/rules.mk
View File
@ -1,2 +1 @@
F_CPU
=
16000000
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/hadron/ver3/keyboard.json
View File
@ -15,6 +15,9 @@
{
"pin_a"
:
"B13"
,
"pin_b"
:
"B14"
}
]
}
,
"haptic"
:
{
"driver"
:
"drv2605l"
}
,
"rgblight"
:
{
"led_count"
:
10
,
"animations"
:
{
+ 0
- 1
keyboards/hadron/ver3/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
drv2605l
+ 3
- 0
keyboards/hardwareabstraction/handwire/keyboard.json
View File
@ -15,6 +15,9 @@
"oled"
:
true
,
"wpm"
:
true
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"build"
:
{
"lto"
:
true
}
,
+ 0
- 1
keyboards/hardwareabstraction/handwire/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json
View File
@ -11,6 +11,9 @@
"keyboard"
:
true
}
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"indicators"
:
{
"caps_lock"
:
"C11"
,
"num_lock"
:
"C12"
,
+ 0
- 1
keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
keyboards/mechwild/clunker/info.json → keyboards/mechwild/clunker/keyboard.json
View File
@ -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"
]
+ 0
- 1
keyboards/mechwild/clunker/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/pearlboards/atlas/keyboard.json
View File
@ -31,6 +31,9 @@
{
"pin_a"
:
"E0"
,
"pin_b"
:
"D7"
,
"resolution"
:
1
}
]
}
,
"haptic"
:
{
"driver"
:
"drv2605l"
}
,
"indicators"
:
{
"caps_lock"
:
"F4"
,
"num_lock"
:
"F5"
,
+ 0
- 1
keyboards/pearlboards/atlas/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
drv2605l
+ 3
- 0
keyboards/pearlboards/pearl/keyboard.json
View File
@ -31,6 +31,9 @@
"scroll_lock"
:
"B2"
,
"on_state"
:
0
}
,
"haptic"
:
{
"driver"
:
"drv2605l"
}
,
"rgblight"
:
{
"saturation_steps"
:
8
,
"brightness_steps"
:
8
,
+ 0
- 1
keyboards/pearlboards/pearl/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
drv2605l
+ 3
- 0
keyboards/pearlboards/zeus/keyboard.json
View File
@ -31,6 +31,9 @@
{
"pin_a"
:
"E7"
,
"pin_b"
:
"E6"
,
"resolution"
:
1
}
]
}
,
"haptic"
:
{
"driver"
:
"drv2605l"
}
,
"indicators"
:
{
"caps_lock"
:
"C5"
,
"num_lock"
:
"C4"
,
+ 0
- 1
keyboards/pearlboards/zeus/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
drv2605l
# Rumble motor
+ 3
- 0
keyboards/splitkb/zima/keyboard.json
View File
@ -22,6 +22,9 @@
"oled"
:
true
,
"rgblight"
:
true
}
,
"haptic"
:
{
"driver"
:
"drv2605l"
}
,
"rgblight"
:
{
"saturation_steps"
:
8
,
"brightness_steps"
:
8
,
+ 0
- 1
keyboards/splitkb/zima/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
drv2605l
+ 3
- 0
keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
View File
@ -15,6 +15,9 @@
"num_lock"
:
"C12"
,
"scroll_lock"
:
"C10"
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"processor"
:
"STM32F446"
,
"bootloader"
:
"stm32-dfu"
,
"diode_direction"
:
"ROW2COL"
,
+ 0
- 1
keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
View File
@ -10,6 +10,9 @@
"mousekey"
:
true
,
"nkro"
:
false
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"indicators"
:
{
"caps_lock"
:
"C11"
,
"num_lock"
:
"C12"
,
+ 0
- 1
keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
View File
@ -10,6 +10,9 @@
"mousekey"
:
true
,
"nkro"
:
false
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"indicators"
:
{
"caps_lock"
:
"C11"
,
"num_lock"
:
"C12"
,
+ 0
- 1
keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
View File
@ -10,6 +10,9 @@
"mousekey"
:
true
,
"nkro"
:
false
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"indicators"
:
{
"caps_lock"
:
"C12"
}
,
+ 0
- 1
keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
View File
@ -13,6 +13,9 @@
"indicators"
:
{
"caps_lock"
:
"C12"
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"processor"
:
"STM32F446"
,
/
/
R
E
T
6
"bootloader"
:
"stm32-dfu"
,
"diode_direction"
:
"ROW2COL"
,
+ 0
- 1
keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/vertex/angle65/keyboard.json
View File
@ -30,6 +30,9 @@
"caps_lock"
:
"C13"
,
"on_state"
:
0
}
,
"haptic"
:
{
"driver"
:
"solenoid"
}
,
"rgblight"
:
{
"led_count"
:
9
,
"animations"
:
{
+ 0
- 1
keyboards/vertex/angle65/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
+ 3
- 0
keyboards/xw60/keyboard.json
View File
@ -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"
]
+ 0
- 1
keyboards/xw60/rules.mk
View File
@ -1 +0,0 @@
HAPTIC_DRIVER
=
solenoid
Write
Preview
Loading…
Cancel
Save