varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

Remove layout aliases from keyboard_aliases.hjson (#21658)

Browse source
This commit is contained in:
Joel Challis 2023-08-01 01:54:28 +01:00 committed by GitHub
parent 5369d806bc
commit 27ff1d4153
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 27 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
data/mappings/keyboard_aliases.hjson
View file

@ -1,13 +1,9 @@
{
// Format for each entry:
// "<alias>": {
// "target": "<keyboard_folder>",
// "layouts": {
// "<layout_alias>": "<layout_target>"
// }
// "target": "<keyboard_folder>"
// }
//
// Both target and layouts are optional.
"2_milk": {
"target": "spaceman/2_milk"
},
@ -140,21 +136,6 @@
"daisy": {
"target": "ktec/daisy"
},
"doro67/multi": {
"layouts": {
"LAYOUT_ansi": "LAYOUT_65_ansi_blocker"
}
},
"doro67/regular": {
"layouts": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
}
},
"doro67/rgb": {
"layouts": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
}
},
"drakon": {
"target": "jagdpietr/drakon"
},
@ -285,10 +266,7 @@
"target": "keyhive/honeycomb"
},
"idb_60": {
"target": "idb/idb_60",
"layouts": {
"LAYOUT": "LAYOUT_all"
}
"target": "idb/idb_60"
},
"idobo": {
"target": "idobao/id75"
@ -309,19 +287,13 @@
"target": "jones/v03_1"
},
"kamigakushi": {
"target": "jaykeeb/kamigakushi",
"layouts": {
"LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
}
"target": "jaykeeb/kamigakushi"
},
"katana60": {
"target": "rominronin/katana60/rev1"
},
"kbdfans/kbd67mkiirgb": {
"target": "kbdfans/kbd67/mkiirgb",
"layouts": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
}
"target": "kbdfans/kbd67/mkiirgb"
},
"kbdfans/kbd67/mkiirgb": {
"target": "kbdfans/kbd67/mkiirgb/v1"
@ -467,11 +439,6 @@
"mschwingen/modelm": {
"target": "ibm/model_m/mschwingen"
},
"noxary/268_2": {
"layouts": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
}
},
"oddball": {
"target": "oddball/v1"
},
@ -496,11 +463,6 @@
"peiorisboards/ixora": {
"target": "coarse/ixora"
},
"percent/canoe": {
"layouts": {
"LAYOUT_iso": "LAYOUT_65_iso_blocker"
}
},
"plaid": {
"target": "dm9records/plaid"
},
@ -513,21 +475,6 @@
"polilla": {
"target": "polilla/rev1"
},
"preonic/rev1": {
"layouts": {
"LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
}
},
"preonic/rev2": {
"layouts": {
"LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
}
},
"preonic/rev3": {
"layouts": {
"LAYOUT_preonic_grid": "LAYOUT_ortho_5x12"
}
},
"primekb/prime_l": {
"target": "primekb/prime_l/v1"
},
@ -619,10 +566,7 @@
"target": "underscore33/rev1"
},
"vinta": {
"target": "coarse/vinta",
"layouts": {
"LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
}
"target": "coarse/vinta"
},
"wasdat": {
"target": "maartenwut/wasdat"

3
keyboards/coarse/vinta/info.json
View file

@ -17,6 +17,9 @@
"bootloader": "stm32-dfu",
"debounce": 0,
"community_layouts": ["65_ansi_blocker"],
"layout_aliases": {
"LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
},
"layouts": {
"LAYOUT_69_ansi": {
"layout": [

3
keyboards/doro67/multi/info.json
View file

@ -24,6 +24,9 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker"],
"layout_aliases": {
"LAYOUT_ansi": "LAYOUT_65_ansi_blocker"
},
"layouts": {
"LAYOUT_65_ansi_blocker": {
"layout": [

3
keyboards/doro67/regular/info.json
View file

@ -19,6 +19,9 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker"],
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
},
"layouts": {
"LAYOUT_65_ansi_blocker": {
"layout": [

3
keyboards/doro67/rgb/info.json
View file

@ -26,6 +26,9 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker"],
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
},
"layouts": {
"LAYOUT_65_ansi_blocker": {
"layout": [

3
keyboards/jaykeeb/kamigakushi/info.json
View file

@ -51,6 +51,9 @@
"pid": "0x0765",
"vid": "0x414C"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
},
"layouts": {
"LAYOUT_65_ansi_blocker_tsangan": {
"layout": [

5
keyboards/kbdfans/kbd67/mkiirgb/info.json
View file

@ -5,5 +5,8 @@
"usb": {
"vid": "0x4B42"
},
"community_layouts": ["65_ansi_blocker"]
"community_layouts": ["65_ansi_blocker"],
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
}
}

3
keyboards/noxary/268_2/info.json
View file

@ -19,6 +19,9 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker"],
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
},
"layouts": {
"LAYOUT_65_ansi_blocker": {
"layout": [

3
lib/python/qmk/commands.py
View file

@ -219,9 +219,6 @@ def parse_configurator_json(configurator_file):
if 'target' in aliases[orig_keyboard]:
user_keymap['keyboard'] = aliases[orig_keyboard]['target']
if 'layouts' in aliases[orig_keyboard] and user_keymap['layout'] in aliases[orig_keyboard]['layouts']:
user_keymap['layout'] = aliases[orig_keyboard]['layouts'][user_keymap['layout']]
return user_keymap