Migrate some DEFAULT_FOLDER to keyboard_aliases.hjson (#24915)

qmk · Feb 16, 2025 · 164b733 · 164b733
1 parent 132efa9
commit 164b733
Show file tree

Hide file tree

Showing 37 changed files with 90 additions and 58 deletions.
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
@@ -1626,9 +1626,15 @@
     "buzzard": {
         "target": "buzzard/rev1"
     },
+    "cannonkeys/db60": {
+        "target": "cannonkeys/db60/rev2"
+    },
     "clickety_split/leeloo": {
         "target": "clickety_split/leeloo/rev3"
     },
+    "converter/palm_usb": {
+        "target": "converter/palm_usb/stowaway"
+    },
     "crkbd": {
         "target": "crkbd/rev1"
     },
@@ -1713,6 +1719,9 @@
     "handwired/dactyl_manuform/6x6": {
         "target": "handwired/dactyl_manuform/6x6/promicro"
     },
+    "handwired/meck_tkl": {
+        "target": "handwired/meck_tkl/blackpill_f401"
+    },
     "handwired/ms_sculpt_mobile": {
         "target": "handwired/ms_sculpt_mobile/teensy2pp"
     },
@@ -1752,6 +1761,9 @@
     "hillside/46": {
         "target": "hillside/46/0_1"
     },
+    "hhkb/ansi": {
+        "target": "hhkb/ansi/32u4"
+    },
     "hillside/48": {
         "target": "hillside/48/0_1"
     },
@@ -1797,6 +1809,9 @@
     "kakunpc/angel17": {
         "target": "kakunpc/angel17/rev1"
     },
+    "kakunpc/angel64": {
+        "target": "kakunpc/angel64/rev1"
+    },
     "kakunpc/business_card": {
         "target": "kakunpc/business_card/beta"
     },
@@ -2148,6 +2163,9 @@
     "takashiski/namecard2x4": {
         "target": "takashiski/namecard2x4/rev2"
     },
+    "teleport/native": {
+        "target": "teleport/native/iso"
+    },
     "themadnoodle/noodlepad": {
         "target": "themadnoodle/noodlepad/v1"
     },
@@ -2181,6 +2199,21 @@
     "vitamins_included": {
         "target": "vitamins_included/rev2"
     },
+    "westm/westm68": {
+        "target": "westm/westm68/rev2"
+    },
+    "westm/westm9": {
+        "target": "westm/westm9/rev2"
+    },
+    "woodkeys/meira": {
+        "target": "woodkeys/meira/promicro"
+    },
+    "work_louder/loop": {
+        "target": "work_louder/loop/rev3"
+    },
+    "work_louder/work_board": {
+        "target": "work_louder/work_board/rev3"
+    },
     "yanghu/unicorne": {
         "target": "yanghu/unicorne/f411"
     },
@@ -2195,5 +2228,8 @@
     },
     "yynmt/acperience12": {
         "target": "yynmt/acperience12/rev1"
+    },
+    "zsa/planck_ez": {
+        "target": "zsa/planck_ez/base"
     }
 }
diff --git a/keyboards/westm/westm9/rules.mk → keyboards/cannonkeys/db60/hotswap/rules.mk b/keyboards/westm/westm9/rules.mk → keyboards/cannonkeys/db60/hotswap/rules.mk
@@ -1,4 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = westm/westm9/rev2
diff --git a/keyboards/westm/westm68/rules.mk → keyboards/cannonkeys/db60/j02/rules.mk b/keyboards/westm/westm68/rules.mk → keyboards/cannonkeys/db60/j02/rules.mk
@@ -1,4 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = westm/westm68/rev2
diff --git a/keyboards/cannonkeys/db60/rules.mk → keyboards/cannonkeys/db60/rev2/rules.mk b/keyboards/cannonkeys/db60/rules.mk → keyboards/cannonkeys/db60/rev2/rules.mk
@@ -1,4 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = cannonkeys/db60/rev2
diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json
diff --git a/keyboards/converter/palm_usb/config.h → ...ards/converter/palm_usb/stowaway/config.h b/keyboards/converter/palm_usb/config.h → ...ards/converter/palm_usb/stowaway/config.h
diff --git a/keyboards/converter/palm_usb/stowaway/keyboard.json b/keyboards/converter/palm_usb/stowaway/keyboard.json
@@ -1,4 +1,22 @@
 {
+    "keyboard_name": "Stowaway Converter",
+    "manufacturer": "QMK",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true,
+        "command": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/converter/palm_usb/matrix.c → ...ards/converter/palm_usb/stowaway/matrix.c b/keyboards/converter/palm_usb/matrix.c → ...ards/converter/palm_usb/stowaway/matrix.c
diff --git a/keyboards/converter/palm_usb/readme.md → ...rds/converter/palm_usb/stowaway/readme.md b/keyboards/converter/palm_usb/readme.md → ...rds/converter/palm_usb/stowaway/readme.md
diff --git a/keyboards/converter/palm_usb/rules.mk → ...ards/converter/palm_usb/stowaway/rules.mk b/keyboards/converter/palm_usb/rules.mk → ...ards/converter/palm_usb/stowaway/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes
 
 SRC += matrix.c
 UART_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = converter/palm_usb/stowaway
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
@@ -0,0 +1,2 @@
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk
diff --git a/keyboards/hhkb/ansi/rules.mk → keyboards/hhkb/ansi/32u2/rules.mk b/keyboards/hhkb/ansi/rules.mk → keyboards/hhkb/ansi/32u2/rules.mk
@@ -2,5 +2,3 @@ CUSTOM_MATRIX = yes
 
 # project specific files
 SRC = matrix.c
-
-DEFAULT_FOLDER = hhkb/ansi/32u4
diff --git a/keyboards/hhkb/ansi/32u4/rules.mk b/keyboards/hhkb/ansi/32u4/rules.mk
@@ -0,0 +1,4 @@
+CUSTOM_MATRIX = yes
+
+# project specific files
+SRC = matrix.c
diff --git a/keyboards/kakunpc/angel64/alpha/rules.mk b/keyboards/kakunpc/angel64/alpha/rules.mk
@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c
diff --git a/keyboards/kakunpc/angel64/rev1/rules.mk b/keyboards/kakunpc/angel64/rev1/rules.mk
@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c
diff --git a/keyboards/kakunpc/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk
diff --git a/keyboards/oddball/rules.mk → keyboards/oddball/v1/rules.mk b/keyboards/oddball/rules.mk → keyboards/oddball/v1/rules.mk
@@ -1,3 +1 @@
 POINTING_DEVICE_DRIVER = adns9800
-
-DEFAULT_FOLDER = oddball/v1
diff --git a/keyboards/oddball/v2/rules.mk b/keyboards/oddball/v2/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/oddball/v2_1/rules.mk b/keyboards/oddball/v2_1/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/teleport/native/ansi/rules.mk b/keyboards/teleport/native/ansi/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/teleport/native/iso/rules.mk b/keyboards/teleport/native/iso/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk
diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm68/rev2/rules.mk b/keyboards/westm/westm68/rev2/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm9/rev1/rules.mk b/keyboards/westm/westm9/rev1/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/westm/westm9/rev2/rules.mk b/keyboards/westm/westm9/rev2/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/woodkeys/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk
@@ -1,2 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
+
+CUSTOM_MATRIX = yes
+SRC += matrix.c
diff --git a/keyboards/woodkeys/meira/promicro/rules.mk b/keyboards/woodkeys/meira/promicro/rules.mk
@@ -1,3 +1,6 @@
+CUSTOM_MATRIX = yes
+SRC += matrix.c
+
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no
diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk
diff --git a/keyboards/work_louder/loop/post_rules.mk b/keyboards/work_louder/loop/post_rules.mk
@@ -0,0 +1 @@
+SRC += rgb_functions.c
diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk
diff --git a/keyboards/work_louder/work_board/post_rules.mk b/keyboards/work_louder/work_board/post_rules.mk
@@ -0,0 +1 @@
+SRC += rgb_functions.c
diff --git a/keyboards/work_louder/work_board/rules.mk b/keyboards/work_louder/work_board/rules.mk
diff --git a/keyboards/zsa/planck_ez/base/rules.mk b/keyboards/zsa/planck_ez/base/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/zsa/planck_ez/glow/rules.mk b/keyboards/zsa/planck_ez/glow/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/zsa/planck_ez/rules.mk b/keyboards/zsa/planck_ez/rules.mk
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes

		SRC += matrix.c
		UART_DRIVER_REQUIRED = yes

		DEFAULT_FOLDER = converter/palm_usb/stowaway
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,3 @@ CUSTOM_MATRIX = yes

		# project specific files
		SRC = matrix.c

		DEFAULT_FOLDER = hhkb/ansi/32u4
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		POINTING_DEVICE_DRIVER = adns9800

		DEFAULT_FOLDER = oddball/v1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Wildcard to allow APM32 MCU
		DFU_SUFFIX_ARGS = -v FFFF -p FFFF
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		RGBLIGHT_SUPPORTED = no
		BACKLIGHT_SUPPORTED = no