Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2025-06-17 03:24:01 +00:00
commit 22e3ed9d01
62 changed files with 62 additions and 124 deletions

View File

@ -18,6 +18,5 @@
"rows": ["E6", "D7", "C6", "D4", "F7", "F6", "F5", "F4"] "rows": ["E6", "D7", "C6", "D4", "F7", "F6", "F5", "F4"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro"
"bootloader": "caterina"
} }

View File

@ -18,8 +18,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": false, "mousekey": false,

View File

@ -12,8 +12,7 @@
"rows": ["B5", "B4"] "rows": ["B5", "B4"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -18,8 +18,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -18,8 +18,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -18,8 +18,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -24,8 +24,7 @@
{ "pin_a": "B6", "pin_b": "B2" } { "pin_a": "B6", "pin_b": "B2" }
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"encoder": true, "encoder": true,

View File

@ -46,8 +46,7 @@
"rows": ["F6", "B1", "B3", "B2", "B6"] "rows": ["F6", "B1", "B3", "B2", "B6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_ortho_5x12": { "LAYOUT_ortho_5x12": {
"layout": [ "layout": [

View File

@ -25,8 +25,7 @@
"rows": ["F6", "F7", "B3", "B2", "B6"] "rows": ["F6", "F7", "B3", "B2", "B6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_ortho_5x12": { "LAYOUT_ortho_5x12": {
"layout": [ "layout": [

View File

@ -25,8 +25,7 @@
"rows": ["D3", "D2", "D1", "D0", "B2", "B6"] "rows": ["D3", "D2", "D1", "D0", "B2", "B6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_ss_6x12": { "LAYOUT_ss_6x12": {
"layout": [ "layout": [

View File

@ -24,8 +24,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": true, "mousekey": true,

View File

@ -25,8 +25,7 @@
"ws2812": { "ws2812": {
"pin": "B6" "pin": "B6"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -37,8 +37,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -40,8 +40,7 @@
"bootmagic": { "bootmagic": {
"matrix": [0, 1] "matrix": [0, 1]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -48,8 +48,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": true, "mousekey": true,

View File

@ -31,8 +31,7 @@
{"pin_a": "F4", "pin_b": "F5"} {"pin_a": "F4", "pin_b": "F5"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_625uC": { "LAYOUT_625uC": {
"layout": [ "layout": [

View File

@ -25,8 +25,7 @@
"rows": ["B1", "B3", "B2", "B5"] "rows": ["B1", "B3", "B2", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -25,6 +25,5 @@
"rows": ["F6", "B6", "B2"] "rows": ["F6", "B6", "B2"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro"
"bootloader": "caterina"
} }

View File

@ -31,8 +31,7 @@
{"pin_a": "F5", "pin_b": "F4"} {"pin_a": "F5", "pin_b": "F4"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_3uc": { "LAYOUT_3uc": {
"layout": [ "layout": [

View File

@ -32,8 +32,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": true, "mousekey": true,

View File

@ -15,8 +15,7 @@
"bootmagic": { "bootmagic": {
"matrix": [3, 0] "matrix": [3, 0]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -16,8 +16,7 @@
"bootmagic": { "bootmagic": {
"matrix": [3, 0] "matrix": [3, 0]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -15,8 +15,7 @@
"bootmagic": { "bootmagic": {
"matrix": [3, 4] "matrix": [3, 4]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -15,8 +15,7 @@
"bootmagic": { "bootmagic": {
"matrix": [3, 0] "matrix": [3, 0]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -16,8 +16,7 @@
"bootmagic": { "bootmagic": {
"matrix": [3, 0] "matrix": [3, 0]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -13,8 +13,7 @@
{"pin_a": "E6", "pin_b": "D7"} {"pin_a": "E6", "pin_b": "D7"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": false, "mousekey": false,

View File

@ -15,8 +15,7 @@
"bootmagic": { "bootmagic": {
"matrix": [3, 4] "matrix": [3, 4]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -55,8 +55,7 @@
"ws2812": { "ws2812": {
"pin": "D1" "pin": "D1"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": false, "mousekey": false,

View File

@ -25,8 +25,7 @@
"rows": ["D4", "C6", "D7", "E6"] "rows": ["D4", "C6", "D7", "E6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -6,8 +6,7 @@
"vid": "0x1337", "vid": "0x1337",
"pid": "0x6006" "pid": "0x6006"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"qmk": { "qmk": {
"locking": { "locking": {
"enabled": true, "enabled": true,

View File

@ -54,8 +54,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": false, "mousekey": false,

View File

@ -19,8 +19,7 @@
"rows": ["B4", "B5", "B2", "B6"] "rows": ["B4", "B5", "B2", "B6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -18,8 +18,7 @@
"rows": ["B6", "B2", "B3", "B1"] "rows": ["B6", "B2", "B3", "B1"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -25,8 +25,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": true, "mousekey": true,

View File

@ -25,8 +25,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"bootloader": "caterina", "development_board": "promicro",
"processor": "atmega32u4",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": true, "mousekey": true,

View File

@ -21,8 +21,7 @@
"rows": ["D1", "D0", "D4", "C6", "D7"] "rows": ["D1", "D0", "D4", "C6", "D7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -21,8 +21,7 @@
"rows": ["D0", "D1"] "rows": ["D0", "D1"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_ortho_2x5": { "LAYOUT_ortho_2x5": {
"layout": [ "layout": [

View File

@ -54,8 +54,7 @@
"ws2812": { "ws2812": {
"pin": "D4" "pin": "D4"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT": "LAYOUT_all" "LAYOUT": "LAYOUT_all"
}, },

View File

@ -24,8 +24,7 @@
"rows": ["F6", "B5", "B4", "E6", "F7"] "rows": ["F6", "B5", "B4", "E6", "F7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT_numbrero_numpad": "LAYOUT_numpad", "LAYOUT_numbrero_numpad": "LAYOUT_numpad",
"LAYOUT_numbrero_ortho": "LAYOUT_ortho" "LAYOUT_numbrero_ortho": "LAYOUT_ortho"

View File

@ -24,8 +24,7 @@
"rows": ["D1", "D0", "D4", "C6", "D7"] "rows": ["D1", "D0", "D4", "C6", "D7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_5x4", "numpad_5x4"], "community_layouts": ["ortho_5x4", "numpad_5x4"],
"layouts": { "layouts": {
"LAYOUT_ortho_5x4": { "LAYOUT_ortho_5x4": {

View File

@ -24,8 +24,7 @@
"rows": ["D1", "C6", "D4", "D0"] "rows": ["D1", "C6", "D4", "D0"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4"], "community_layouts": ["ortho_4x4"],
"layout_aliases": { "layout_aliases": {
"LAYOUT_tradestation": "LAYOUT_4x2u" "LAYOUT_tradestation": "LAYOUT_4x2u"

View File

@ -26,8 +26,7 @@
"rows": ["D4", "D7", "E6", "B4", "B5"] "rows": ["D4", "D7", "E6", "B4", "B5"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_split_4x5_3": { "LAYOUT_split_4x5_3": {
"layout": [ "layout": [

View File

@ -25,8 +25,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"] "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -19,8 +19,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7"] "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": [ "community_layouts": [
"60_hhkb" "60_hhkb"
], ],

View File

@ -13,8 +13,7 @@
"rows": ["B1", "F7", "F6", "F5", "F4"] "rows": ["B1", "F7", "F6", "F5", "F4"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -19,8 +19,7 @@
"rows": ["F4", "F5", "F6", "F7"] "rows": ["F4", "F5", "F6", "F7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -40,8 +40,7 @@
"resync": true "resync": true
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"debounce": 3, "debounce": 3,
"tapping": { "tapping": {
"toggle": 3 "toggle": 3

View File

@ -24,8 +24,7 @@
"rows": ["D4", "C6", "B4", "B5"] "rows": ["D4", "C6", "B4", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -8,8 +8,7 @@
"pid": "0xE8D1", "pid": "0xE8D1",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -26,8 +26,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -31,8 +31,7 @@
{"pin_a": "D7", "pin_b": "E6", "resolution": 3} {"pin_a": "D7", "pin_b": "E6", "resolution": 3}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"mousekey": true, "mousekey": true,

View File

@ -19,8 +19,7 @@
"rows": ["D1", "D0", "D4"] "rows": ["D1", "D0", "D4"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_ortho_3x3": { "LAYOUT_ortho_3x3": {
"layout": [ "layout": [

View File

@ -29,8 +29,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": false, "mousekey": false,

View File

@ -39,8 +39,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -26,8 +26,7 @@
"rows": ["D3", "D2", "D1", "F4"] "rows": ["D3", "D2", "D1", "F4"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -19,8 +19,7 @@
"rows": ["D2", "D3", "F4", "F5"] "rows": ["D2", "D3", "F4", "F5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_all": { "LAYOUT_all": {
"layout": [ "layout": [

View File

@ -43,8 +43,7 @@
"rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -19,8 +19,7 @@
"pin": "D0" "pin": "D0"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": false, "mousekey": false,

View File

@ -24,8 +24,7 @@
"nkro": true, "nkro": true,
"oled": true "oled": true
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -28,8 +28,7 @@
{"pin_a": "D4", "pin_b": "C6"} {"pin_a": "D4", "pin_b": "C6"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"tapping": { "tapping": {
"toggle": 2 "toggle": 2
}, },

View File

@ -19,6 +19,5 @@
"pin": "D1" "pin": "D1"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro"
"bootloader": "caterina"
} }

View File

@ -32,8 +32,7 @@
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"mousekey": true, "mousekey": true,