mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-04-09 15:25:42 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
2d5e85e3a4
@ -17,9 +17,6 @@
|
||||
"enabled": true,
|
||||
"soft_serial_pin": "D2"
|
||||
},
|
||||
"features": {
|
||||
"encoder": true
|
||||
},
|
||||
"encoder": {
|
||||
"rotary": [
|
||||
{ "pin_a": "B5", "pin_b": "B4" },
|
||||
@ -30,8 +27,9 @@
|
||||
"bootloader": "caterina",
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"mousekey": true,
|
||||
"extrakey": true
|
||||
"encoder": true,
|
||||
"extrakey": true,
|
||||
"mousekey": true
|
||||
},
|
||||
"layout_aliases": {
|
||||
"LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3"
|
||||
|
Loading…
Reference in New Issue
Block a user