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

This commit is contained in:
QMK Bot 2025-04-23 02:11:30 +00:00
commit ac4bd6c86d
16 changed files with 17 additions and 27 deletions

View File

@ -38,8 +38,7 @@
{"matrix": [0, 16], "x": 17, "y": 1, "flags": 4},
{"matrix": [0, 17], "x": 18, "y": 1, "flags": 4}
],
"led_count": 3,
"max_brightness": 255
"led_count": 3
},
"usb": {
"device_version": "0.0.1",

View File

@ -60,7 +60,6 @@
"backlight": {
"driver": "pwm",
"breathing": true,
"breathing_period": 6,
"levels": 17,
"pin": "A6"
},

View File

@ -31,8 +31,7 @@
"cols": ["B1", "C7", "C13", "B9"]
},
"indicators": {
"num_lock": "C5",
"on_state": 1
"num_lock": "C5"
},
"ws2812": {
"pin": "A8"

View File

@ -17,8 +17,7 @@
"nkro": true
},
"indicators": {
"caps_lock": "GP27",
"on_state": 1
"caps_lock": "GP27"
},
"diode_direction": "COL2ROW",
"matrix_pins": {

View File

@ -17,8 +17,7 @@
"nkro": true
},
"indicators": {
"caps_lock": "GP29",
"on_state": 1
"caps_lock": "GP29"
},
"diode_direction": "COL2ROW",
"matrix_pins": {

View File

@ -17,8 +17,7 @@
},
"indicators": {
"caps_lock": "GP27",
"scroll_lock": "GP1",
"on_state": 1
"scroll_lock": "GP1"
},
"diode_direction": "COL2ROW",
"matrix_pins": {

View File

@ -26,8 +26,7 @@
"backlight": {
"breathing": true,
"levels": 5,
"pin": "A9",
"on_state": 1
"pin": "A9"
},
"indicators": {
"num_lock": "B6",

View File

@ -31,8 +31,7 @@
"indicators": {
"num_lock": "C13",
"caps_lock": "B14",
"scroll_lock": "B2",
"on_state": 1
"scroll_lock": "B2"
},
"encoder": {
"rotary": [

View File

@ -14,8 +14,7 @@
"wpm": true
},
"indicators": {
"caps_lock": "GP29",
"on_state": 1
"caps_lock": "GP29"
},
"matrix_pins": {
"cols": ["GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP3", "GP4"],

View File

@ -18,7 +18,6 @@
"diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "C7",
"on_state": 1,
"scroll_lock": "B2"
},
"processor": "atmega32u4",

View File

@ -14,8 +14,7 @@
"wpm": true
},
"indicators": {
"caps_lock": "GP25",
"on_state": 1
"caps_lock": "GP25"
},
"matrix_pins": {
"cols": ["GP2", "GP3", "GP6", "GP7", "GP10", "GP11"],

View File

@ -22,8 +22,7 @@
"vid": "0x7C10"
},
"indicators": {
"caps_lock": "B10",
"on_state": 1
"caps_lock": "B10"
},
"community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_ansi_tsangan_split_bs_rshift", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
"layouts": {

View File

@ -19,7 +19,6 @@
},
"indicators": {
"caps_lock": "B6",
"on_state": 1,
"scroll_lock": "D2"
},
"matrix_pins": {

View File

@ -22,8 +22,7 @@
},
"indicators": {
"caps_lock": "A15",
"scroll_lock": "B14",
"on_state": 1
"scroll_lock": "B14"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_all"

View File

@ -17,8 +17,7 @@
"nkro": true
},
"indicators": {
"caps_lock": "GP29",
"on_state": 1
"caps_lock": "GP29"
},
"diode_direction": "COL2ROW",
"matrix_pins": {

View File

@ -149,6 +149,11 @@ def generate_api(cli):
if keymap_rel is None:
cli.log.debug('Skipping keymap %s (not in qmk_firmware)', keymap)
continue
if (keymap_rel / 'keymap.c').exists():
cli.log.debug('Skipping keymap %s (not pure dd keymap)', keymap)
continue
kb_json['keymaps'][keymap.name] = {
# TODO: deprecate 'url' as consumer needs to know its potentially hjson
'url': f'https://raw.githubusercontent.com/qmk/qmk_firmware/master/{keymap_rel}/keymap.json',