Remove layout aliases from keyboard_aliases.hjson (#21658)
parent
5369d806bc
commit
27ff1d4153
|
@ -1,13 +1,9 @@
|
||||||
{
|
{
|
||||||
// Format for each entry:
|
// Format for each entry:
|
||||||
// "<alias>": {
|
// "<alias>": {
|
||||||
// "target": "<keyboard_folder>",
|
// "target": "<keyboard_folder>"
|
||||||
// "layouts": {
|
|
||||||
// "<layout_alias>": "<layout_target>"
|
|
||||||
// }
|
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// Both target and layouts are optional.
|
|
||||||
"2_milk": {
|
"2_milk": {
|
||||||
"target": "spaceman/2_milk"
|
"target": "spaceman/2_milk"
|
||||||
},
|
},
|
||||||
|
@ -140,21 +136,6 @@
|
||||||
"daisy": {
|
"daisy": {
|
||||||
"target": "ktec/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": {
|
"drakon": {
|
||||||
"target": "jagdpietr/drakon"
|
"target": "jagdpietr/drakon"
|
||||||
},
|
},
|
||||||
|
@ -285,10 +266,7 @@
|
||||||
"target": "keyhive/honeycomb"
|
"target": "keyhive/honeycomb"
|
||||||
},
|
},
|
||||||
"idb_60": {
|
"idb_60": {
|
||||||
"target": "idb/idb_60",
|
"target": "idb/idb_60"
|
||||||
"layouts": {
|
|
||||||
"LAYOUT": "LAYOUT_all"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"idobo": {
|
"idobo": {
|
||||||
"target": "idobao/id75"
|
"target": "idobao/id75"
|
||||||
|
@ -309,19 +287,13 @@
|
||||||
"target": "jones/v03_1"
|
"target": "jones/v03_1"
|
||||||
},
|
},
|
||||||
"kamigakushi": {
|
"kamigakushi": {
|
||||||
"target": "jaykeeb/kamigakushi",
|
"target": "jaykeeb/kamigakushi"
|
||||||
"layouts": {
|
|
||||||
"LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"katana60": {
|
"katana60": {
|
||||||
"target": "rominronin/katana60/rev1"
|
"target": "rominronin/katana60/rev1"
|
||||||
},
|
},
|
||||||
"kbdfans/kbd67mkiirgb": {
|
"kbdfans/kbd67mkiirgb": {
|
||||||
"target": "kbdfans/kbd67/mkiirgb",
|
"target": "kbdfans/kbd67/mkiirgb"
|
||||||
"layouts": {
|
|
||||||
"LAYOUT": "LAYOUT_65_ansi_blocker"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"kbdfans/kbd67/mkiirgb": {
|
"kbdfans/kbd67/mkiirgb": {
|
||||||
"target": "kbdfans/kbd67/mkiirgb/v1"
|
"target": "kbdfans/kbd67/mkiirgb/v1"
|
||||||
|
@ -467,11 +439,6 @@
|
||||||
"mschwingen/modelm": {
|
"mschwingen/modelm": {
|
||||||
"target": "ibm/model_m/mschwingen"
|
"target": "ibm/model_m/mschwingen"
|
||||||
},
|
},
|
||||||
"noxary/268_2": {
|
|
||||||
"layouts": {
|
|
||||||
"LAYOUT": "LAYOUT_65_ansi_blocker"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"oddball": {
|
"oddball": {
|
||||||
"target": "oddball/v1"
|
"target": "oddball/v1"
|
||||||
},
|
},
|
||||||
|
@ -496,11 +463,6 @@
|
||||||
"peiorisboards/ixora": {
|
"peiorisboards/ixora": {
|
||||||
"target": "coarse/ixora"
|
"target": "coarse/ixora"
|
||||||
},
|
},
|
||||||
"percent/canoe": {
|
|
||||||
"layouts": {
|
|
||||||
"LAYOUT_iso": "LAYOUT_65_iso_blocker"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"plaid": {
|
"plaid": {
|
||||||
"target": "dm9records/plaid"
|
"target": "dm9records/plaid"
|
||||||
},
|
},
|
||||||
|
@ -513,21 +475,6 @@
|
||||||
"polilla": {
|
"polilla": {
|
||||||
"target": "polilla/rev1"
|
"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": {
|
"primekb/prime_l": {
|
||||||
"target": "primekb/prime_l/v1"
|
"target": "primekb/prime_l/v1"
|
||||||
},
|
},
|
||||||
|
@ -619,10 +566,7 @@
|
||||||
"target": "underscore33/rev1"
|
"target": "underscore33/rev1"
|
||||||
},
|
},
|
||||||
"vinta": {
|
"vinta": {
|
||||||
"target": "coarse/vinta",
|
"target": "coarse/vinta"
|
||||||
"layouts": {
|
|
||||||
"LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"wasdat": {
|
"wasdat": {
|
||||||
"target": "maartenwut/wasdat"
|
"target": "maartenwut/wasdat"
|
||||||
|
|
|
@ -17,6 +17,9 @@
|
||||||
"bootloader": "stm32-dfu",
|
"bootloader": "stm32-dfu",
|
||||||
"debounce": 0,
|
"debounce": 0,
|
||||||
"community_layouts": ["65_ansi_blocker"],
|
"community_layouts": ["65_ansi_blocker"],
|
||||||
|
"layout_aliases": {
|
||||||
|
"LAYOUT_67_ansi": "LAYOUT_65_ansi_blocker"
|
||||||
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_69_ansi": {
|
"LAYOUT_69_ansi": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
|
|
@ -24,6 +24,9 @@
|
||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "atmel-dfu",
|
"bootloader": "atmel-dfu",
|
||||||
"community_layouts": ["65_ansi_blocker"],
|
"community_layouts": ["65_ansi_blocker"],
|
||||||
|
"layout_aliases": {
|
||||||
|
"LAYOUT_ansi": "LAYOUT_65_ansi_blocker"
|
||||||
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_65_ansi_blocker": {
|
"LAYOUT_65_ansi_blocker": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
|
|
@ -19,6 +19,9 @@
|
||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "atmel-dfu",
|
"bootloader": "atmel-dfu",
|
||||||
"community_layouts": ["65_ansi_blocker"],
|
"community_layouts": ["65_ansi_blocker"],
|
||||||
|
"layout_aliases": {
|
||||||
|
"LAYOUT": "LAYOUT_65_ansi_blocker"
|
||||||
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_65_ansi_blocker": {
|
"LAYOUT_65_ansi_blocker": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
|
|
@ -26,6 +26,9 @@
|
||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "atmel-dfu",
|
"bootloader": "atmel-dfu",
|
||||||
"community_layouts": ["65_ansi_blocker"],
|
"community_layouts": ["65_ansi_blocker"],
|
||||||
|
"layout_aliases": {
|
||||||
|
"LAYOUT": "LAYOUT_65_ansi_blocker"
|
||||||
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_65_ansi_blocker": {
|
"LAYOUT_65_ansi_blocker": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
|
|
@ -51,6 +51,9 @@
|
||||||
"pid": "0x0765",
|
"pid": "0x0765",
|
||||||
"vid": "0x414C"
|
"vid": "0x414C"
|
||||||
},
|
},
|
||||||
|
"layout_aliases": {
|
||||||
|
"LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
|
||||||
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_65_ansi_blocker_tsangan": {
|
"LAYOUT_65_ansi_blocker_tsangan": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
|
|
@ -5,5 +5,8 @@
|
||||||
"usb": {
|
"usb": {
|
||||||
"vid": "0x4B42"
|
"vid": "0x4B42"
|
||||||
},
|
},
|
||||||
"community_layouts": ["65_ansi_blocker"]
|
"community_layouts": ["65_ansi_blocker"],
|
||||||
|
"layout_aliases": {
|
||||||
|
"LAYOUT": "LAYOUT_65_ansi_blocker"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,9 @@
|
||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "atmel-dfu",
|
"bootloader": "atmel-dfu",
|
||||||
"community_layouts": ["65_ansi_blocker"],
|
"community_layouts": ["65_ansi_blocker"],
|
||||||
|
"layout_aliases": {
|
||||||
|
"LAYOUT": "LAYOUT_65_ansi_blocker"
|
||||||
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_65_ansi_blocker": {
|
"LAYOUT_65_ansi_blocker": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
|
|
@ -219,9 +219,6 @@ def parse_configurator_json(configurator_file):
|
||||||
if 'target' in aliases[orig_keyboard]:
|
if 'target' in aliases[orig_keyboard]:
|
||||||
user_keymap['keyboard'] = aliases[orig_keyboard]['target']
|
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
|
return user_keymap
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue