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

This commit is contained in:
QMK Bot 2025-05-24 20:20:30 +00:00
commit 8c624767d6
50 changed files with 53 additions and 99 deletions

View File

@ -59,8 +59,7 @@
"build": { "build": {
"lto": true "lto": true
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

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

View File

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

View File

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

View File

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

View File

@ -2,7 +2,7 @@
"manufacturer": "Salicylic-acid3", "manufacturer": "Salicylic-acid3",
"keyboard_name": "guide68", "keyboard_name": "guide68",
"maintainer": "Salicylic-acid3", "maintainer": "Salicylic-acid3",
"bootloader": "caterina", "development_board": "promicro",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
@ -15,7 +15,6 @@
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
"rows": ["D4", "C6", "D7", "E6", "B4"] "rows": ["D4", "C6", "D7", "E6", "B4"]
}, },
"processor": "atmega32u4",
"usb": { "usb": {
"vid": "0x04D8", "vid": "0x04D8",
"pid": "0xE6DD", "pid": "0xE6DD",

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -76,8 +76,7 @@
"rows": ["D4", "C6", "D7", "E6"] "rows": ["D4", "C6", "D7", "E6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["numpad_6x4"], "community_layouts": ["numpad_6x4"],
"layouts": { "layouts": {
"LAYOUT_numpad_6x4": { "LAYOUT_numpad_6x4": {

View File

@ -25,8 +25,7 @@
"rows": ["F4"] "rows": ["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": ["B6", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "B5"] "rows": ["B6", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_5x15"], "community_layouts": ["ortho_5x15"],
"layouts": { "layouts": {
"LAYOUT_ortho_5x15": { "LAYOUT_ortho_5x15": {

View File

@ -19,8 +19,7 @@
"rows": ["B3", "B2", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"] "rows": ["B3", "B2", "D3", "D2", "D1", "D0", "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

@ -34,8 +34,7 @@
{"pin_a": "B1", "pin_b": "B3"} {"pin_a": "B1", "pin_b": "B3"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"encoder": true, "encoder": true,

View File

@ -13,8 +13,7 @@
{"pin_a": "D2", "pin_b": "D3", "resolution": 1} {"pin_a": "D2", "pin_b": "D3", "resolution": 1}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": false, "bootmagic": false,
"command": true, "command": true,

View File

@ -27,8 +27,7 @@
"rows": ["D3", "C6", "D4", "D2"] "rows": ["D3", "C6", "D4", "D2"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_default": { "LAYOUT_default": {
"layout": [ "layout": [

View File

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

View File

@ -27,8 +27,7 @@
"rows": ["D4", "C6", "D7", "E6", "B4"] "rows": ["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

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

View File

@ -60,8 +60,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"debounce": 10, "debounce": 10,
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {

View File

@ -26,8 +26,7 @@
"rows": ["F4", "F5", "F6", "F7", "B1", "B3"] "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["numpad_6x4"], "community_layouts": ["numpad_6x4"],
"layouts": { "layouts": {
"LAYOUT_numpad_6x4": { "LAYOUT_numpad_6x4": {

View File

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

View File

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

View File

@ -1,4 +1,6 @@
{ {
"processor": "atmega32u4",
"bootloader": "caterina",
"features": { "features": {
"bluetooth": true, "bluetooth": true,
"bootmagic": true, "bootmagic": true,

View File

@ -7,8 +7,6 @@
"pid": "0x504B", "pid": "0x504B",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x12", "planck_mit"], "community_layouts": ["ortho_4x12", "planck_mit"],
"layouts": { "layouts": {
"LAYOUT_planck_mit": { "LAYOUT_planck_mit": {

View File

@ -1,4 +1,5 @@
{ {
"development_board": "promicro",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"command": true, "command": true,

View File

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

View File

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

View File

@ -25,8 +25,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

@ -22,8 +22,7 @@
"dynamic_keymap": { "dynamic_keymap": {
"layer_count": 10 "layer_count": 10
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_4x10"], "community_layouts": ["ortho_4x10"],
"layouts": { "layouts": {
"LAYOUT_ortho_4x10": { "LAYOUT_ortho_4x10": {

View File

@ -21,8 +21,7 @@
"rows": ["F4", "B2", "B6"] "rows": ["F4", "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": ["D3", "F4", "D2", "B2", "B5", "B6"] "rows": ["D3", "F4", "D2", "B2", "B5", "B6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -51,8 +51,7 @@
{"pin_a": "D2", "pin_b": "D1", "resolution": 1} {"pin_a": "D2", "pin_b": "D1", "resolution": 1}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

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

View File

@ -40,8 +40,7 @@
} }
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"rgblight": { "rgblight": {
"led_count": 8, "led_count": 8,
"split_count": [4, 4], "split_count": [4, 4],

View File

@ -48,9 +48,8 @@
"rows": ["B3", "B2", "B6", "B5"] "rows": ["B3", "B2", "B6", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina", "layouts": {
"layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"matrix": [0, 0], "x": 0, "y": 0.5}, {"matrix": [0, 0], "x": 0, "y": 0.5},

View File

@ -52,9 +52,8 @@
{"pin_a": "D2", "pin_b": "D1", "resolution": 1} {"pin_a": "D2", "pin_b": "D1", "resolution": 1}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina", "layouts": {
"layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},

View File

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

View File

@ -2,7 +2,7 @@
"manufacturer": "takashicompany", "manufacturer": "takashicompany",
"keyboard_name": "Spreadwriter", "keyboard_name": "Spreadwriter",
"maintainer": "takashicompany", "maintainer": "takashicompany",
"bootloader": "caterina", "development_board": "promicro",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
@ -16,7 +16,6 @@
"cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"], "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
"rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
}, },
"processor": "atmega32u4",
"url": "https://github.com/takashicompany/spreadwriter", "url": "https://github.com/takashicompany/spreadwriter",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0",

View File

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

View File

@ -16,8 +16,7 @@
"pid": "0x0000", "pid": "0x0000",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -45,8 +45,7 @@
"rows": ["F7", "B1", "D4", "D0"] "rows": ["F7", "B1", "D4", "D0"]
}, },
"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": ["B5", "D7"] "rows": ["B5", "D7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View File

@ -48,8 +48,7 @@
"rows": ["B1", "B4", "F6", "B6", "B2"] "rows": ["B1", "B4", "F6", "B6", "B2"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_5x4"], "community_layouts": ["ortho_5x4"],
"layouts": { "layouts": {
"LAYOUT_ortho_5x4": { "LAYOUT_ortho_5x4": {

View File

@ -49,9 +49,8 @@
"rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"] "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina", "layouts": {
"layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 0], "x": 0, "y": 0},

View File

@ -45,8 +45,7 @@
"rows": ["F4", "D4", "C6", "E6", "D1", "D0"] "rows": ["F4", "D4", "C6", "E6", "D1", "D0"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_split_space": { "LAYOUT_split_space": {
"layout": [ "layout": [