summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/mappings/keyboard_aliases.hjson66
-rw-r--r--keyboards/coarse/vinta/info.json3
-rw-r--r--keyboards/doro67/multi/info.json3
-rw-r--r--keyboards/doro67/regular/info.json3
-rw-r--r--keyboards/doro67/rgb/info.json3
-rw-r--r--keyboards/jaykeeb/kamigakushi/info.json3
-rw-r--r--keyboards/kbdfans/kbd67/mkiirgb/info.json5
-rw-r--r--keyboards/noxary/268_2/info.json3
-rw-r--r--lib/python/qmk/commands.py3
9 files changed, 27 insertions, 65 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 1f275a2f16..60c5deaad5 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -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"
diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/info.json
index a430ea36b7..3dd9898f1a 100644
--- a/keyboards/coarse/vinta/info.json
+++ b/keyboards/coarse/vinta/info.json
@@ -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": [
diff --git a/keyboards/doro67/multi/info.json b/keyboards/doro67/multi/info.json
index db8da861c1..10cd3bb652 100644
--- a/keyboards/doro67/multi/info.json
+++ b/keyboards/doro67/multi/info.json
@@ -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": [
diff --git a/keyboards/doro67/regular/info.json b/keyboards/doro67/regular/info.json
index 70997d3e1a..863d935b0a 100644
--- a/keyboards/doro67/regular/info.json
+++ b/keyboards/doro67/regular/info.json
@@ -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": [
diff --git a/keyboards/doro67/rgb/info.json b/keyboards/doro67/rgb/info.json
index f4a7d40dce..83d642ab0b 100644
--- a/keyboards/doro67/rgb/info.json
+++ b/keyboards/doro67/rgb/info.json
@@ -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": [
diff --git a/keyboards/jaykeeb/kamigakushi/info.json b/keyboards/jaykeeb/kamigakushi/info.json
index a421019a4a..7ab02d2c66 100644
--- a/keyboards/jaykeeb/kamigakushi/info.json
+++ b/keyboards/jaykeeb/kamigakushi/info.json
@@ -51,6 +51,9 @@
"pid": "0x0765",
"vid": "0x414C"
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_65_ansi_blocker_tsangan"
+ },
"layouts": {
"LAYOUT_65_ansi_blocker_tsangan": {
"layout": [
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/info.json b/keyboards/kbdfans/kbd67/mkiirgb/info.json
index 023c6ff5db..683503b4ee 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json
@@ -5,5 +5,8 @@
"usb": {
"vid": "0x4B42"
},
- "community_layouts": ["65_ansi_blocker"]
+ "community_layouts": ["65_ansi_blocker"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_65_ansi_blocker"
+ }
}
diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json
index b96500aa31..a652276c6d 100644
--- a/keyboards/noxary/268_2/info.json
+++ b/keyboards/noxary/268_2/info.json
@@ -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": [
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index ab8e323edf..660b2ff72e 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 07:37:51 +0000