summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-08 18:41:46 +1100
committerGitHub <noreply@github.com>2023-02-08 18:41:46 +1100
commitf9aeea64c1f85d388485503e52035b5f7533ed26 (patch)
tree72808eb450b72eddac307395784c914cb22c0dd4 /keyboards/mechlovin
parent3499677b6a5a9ee5845122382f93f0500dfd8429 (diff)
Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)
Diffstat (limited to 'keyboards/mechlovin')
-rw-r--r--keyboards/mechlovin/delphine/info.json2
-rw-r--r--keyboards/mechlovin/delphine/rules.mk6
-rw-r--r--keyboards/mechlovin/foundation/info.json2
-rw-r--r--keyboards/mechlovin/foundation/rules.mk7
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev1/info.json3
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev2/info.json3
-rw-r--r--keyboards/mechlovin/hannah60rgb/rules.mk7
-rw-r--r--keyboards/mechlovin/hannah65/info.json5
-rw-r--r--keyboards/mechlovin/hannah65/rules.mk7
-rw-r--r--keyboards/mechlovin/hannah910/rev1/info.json2
-rw-r--r--keyboards/mechlovin/hannah910/rev1/rules.mk6
-rw-r--r--keyboards/mechlovin/hannah910/rev2/info.json2
-rw-r--r--keyboards/mechlovin/hannah910/rev2/rules.mk6
-rw-r--r--keyboards/mechlovin/hannah910/rev3/info.json2
-rw-r--r--keyboards/mechlovin/hannah910/rev3/rules.mk6
-rw-r--r--keyboards/mechlovin/hex4b/rev1/info.json4
-rw-r--r--keyboards/mechlovin/hex4b/rev1/rules.mk6
-rw-r--r--keyboards/mechlovin/hex4b/rev2/info.json4
-rw-r--r--keyboards/mechlovin/hex4b/rev2/rules.mk6
-rw-r--r--keyboards/mechlovin/hex6c/info.json3
-rw-r--r--keyboards/mechlovin/hex6c/rules.mk7
-rw-r--r--keyboards/mechlovin/infinity87/rev1/info.json5
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rules.mk7
-rw-r--r--keyboards/mechlovin/infinity87/rev2/info.json2
-rw-r--r--keyboards/mechlovin/infinity87/rev2/rules.mk6
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/info.json3
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/rules.mk7
-rw-r--r--keyboards/mechlovin/infinity875/info.json2
-rw-r--r--keyboards/mechlovin/infinity875/rules.mk6
-rw-r--r--keyboards/mechlovin/infinity88/info.json3
-rw-r--r--keyboards/mechlovin/infinity88/rules.mk7
-rw-r--r--keyboards/mechlovin/infinityce/info.json2
-rw-r--r--keyboards/mechlovin/infinityce/rules.mk6
-rw-r--r--keyboards/mechlovin/jay60/info.json2
-rw-r--r--keyboards/mechlovin/jay60/rules.mk6
-rw-r--r--keyboards/mechlovin/kanu/info.json2
-rw-r--r--keyboards/mechlovin/kanu/rules.mk6
-rw-r--r--keyboards/mechlovin/kay60/info.json2
-rw-r--r--keyboards/mechlovin/kay60/rules.mk6
-rw-r--r--keyboards/mechlovin/kay65/info.json2
-rw-r--r--keyboards/mechlovin/kay65/rules.mk6
-rw-r--r--keyboards/mechlovin/mechlovin9/rev1/info.json5
-rw-r--r--keyboards/mechlovin/mechlovin9/rev1/rules.mk7
-rw-r--r--keyboards/mechlovin/mechlovin9/rev2/info.json4
-rw-r--r--keyboards/mechlovin/mechlovin9/rev2/rules.mk6
-rw-r--r--keyboards/mechlovin/olly/bb/info.json2
-rw-r--r--keyboards/mechlovin/olly/bb/rules.mk6
-rw-r--r--keyboards/mechlovin/olly/jf/info.json2
-rw-r--r--keyboards/mechlovin/olly/jf/rules.mk6
-rw-r--r--keyboards/mechlovin/olly/octagon/info.json2
-rw-r--r--keyboards/mechlovin/olly/octagon/rules.mk6
-rw-r--r--keyboards/mechlovin/olly/orion/info.json2
-rw-r--r--keyboards/mechlovin/olly/orion/rules.mk7
-rw-r--r--keyboards/mechlovin/pisces/info.json2
-rw-r--r--keyboards/mechlovin/pisces/rules.mk6
-rw-r--r--keyboards/mechlovin/serratus/info.json2
-rw-r--r--keyboards/mechlovin/serratus/rules.mk6
-rw-r--r--keyboards/mechlovin/th1800/info.json2
-rw-r--r--keyboards/mechlovin/th1800/rules.mk6
-rw-r--r--keyboards/mechlovin/tmkl/info.json3
-rw-r--r--keyboards/mechlovin/tmkl/rules.mk7
-rw-r--r--keyboards/mechlovin/zed60/info.json2
-rw-r--r--keyboards/mechlovin/zed60/rules.mk7
-rw-r--r--keyboards/mechlovin/zed65/info.json4
-rw-r--r--keyboards/mechlovin/zed65/rules.mk7
65 files changed, 85 insertions, 208 deletions
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
index 66dedc5ef7..5958db55d0 100644
--- a/keyboards/mechlovin/delphine/info.json
+++ b/keyboards/mechlovin/delphine/info.json
@@ -6,6 +6,8 @@
"usb": {
"vid": "0x4D4C"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"community_layouts": ["numpad_6x4", "ortho_6x4"],
"layouts": {
"LAYOUT_ortho_6x4": {
diff --git a/keyboards/mechlovin/delphine/rules.mk b/keyboards/mechlovin/delphine/rules.mk
index 1cb91c908c..ef29542a93 100644
--- a/keyboards/mechlovin/delphine/rules.mk
+++ b/keyboards/mechlovin/delphine/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json
index 584a774367..2ed9cbdc06 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/info.json
@@ -8,6 +8,8 @@
"pid": "0x0180",
"device_version": "0.0.2"
},
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
"layout_aliases": {
"LAYOUT_tkl_nofrow_ansi": "LAYOUT_ansi",
"LAYOUT_tkl_nofrow_iso": "LAYOUT_iso"
diff --git a/keyboards/mechlovin/foundation/rules.mk b/keyboards/mechlovin/foundation/rules.mk
index 5a0af7c463..c0fdd8a2ce 100644
--- a/keyboards/mechlovin/foundation/rules.mk
+++ b/keyboards/mechlovin/foundation/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F103
-BOARD = STM32_F103_STM32DUINO
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
index 912f973e0c..2ed43a3fc2 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x6001",
"device_version": "0.0.1"
},
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
"community_layouts": ["60_ansi", "60_iso"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index 616d15c3e2..798e67ee78 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -8,6 +8,9 @@
"pid": "0x6002",
"device_version": "0.0.1"
},
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
"community_layouts": ["60_ansi", "60_iso"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk
index 8d52323021..65e5f070fb 100644
--- a/keyboards/mechlovin/hannah60rgb/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json
new file mode 100644
index 0000000000..c06ffbaf06
--- /dev/null
+++ b/keyboards/mechlovin/hannah65/info.json
@@ -0,0 +1,5 @@
+{
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C"
+}
diff --git a/keyboards/mechlovin/hannah65/rules.mk b/keyboards/mechlovin/hannah65/rules.mk
index 39cf604383..e01e6c73da 100644
--- a/keyboards/mechlovin/hannah65/rules.mk
+++ b/keyboards/mechlovin/hannah65/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json
index bbfdddf1ad..7f61b0e023 100644
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ b/keyboards/mechlovin/hannah910/rev1/info.json
@@ -8,6 +8,8 @@
"pid": "0x9101",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"INS", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"HOME", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"Shift", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"END", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"Space", "x":3.75, "y":4, "w":2.75}, {"label":"Space", "x":6.5, "y":4, "w":1.25}, {"label":"Space", "x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}]
diff --git a/keyboards/mechlovin/hannah910/rev1/rules.mk b/keyboards/mechlovin/hannah910/rev1/rules.mk
index c483c98ee3..8a6e2c7b71 100644
--- a/keyboards/mechlovin/hannah910/rev1/rules.mk
+++ b/keyboards/mechlovin/hannah910/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json
index b180466eeb..76cb6cb8f0 100644
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ b/keyboards/mechlovin/hannah910/rev2/info.json
@@ -8,6 +8,8 @@
"pid": "0x9102",
"device_version": "0.0.2"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/mechlovin/hannah910/rev2/rules.mk b/keyboards/mechlovin/hannah910/rev2/rules.mk
index c483c98ee3..8a6e2c7b71 100644
--- a/keyboards/mechlovin/hannah910/rev2/rules.mk
+++ b/keyboards/mechlovin/hannah910/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json
index dc4953d831..7bae7c1579 100644
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ b/keyboards/mechlovin/hannah910/rev3/info.json
@@ -8,6 +8,8 @@
"pid": "0x9103",
"device_version": "0.0.2"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/mechlovin/hannah910/rev3/rules.mk b/keyboards/mechlovin/hannah910/rev3/rules.mk
index c483c98ee3..8a6e2c7b71 100644
--- a/keyboards/mechlovin/hannah910/rev3/rules.mk
+++ b/keyboards/mechlovin/hannah910/rev3/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json
index b2dfdec696..be59552b33 100644
--- a/keyboards/mechlovin/hex4b/rev1/info.json
+++ b/keyboards/mechlovin/hex4b/rev1/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Hex-4B Rev.1",
"usb": {
"device_version": "0.0.1"
- }
+ },
+ "processor": "atmega32a",
+ "bootloader": "usbasploader"
}
diff --git a/keyboards/mechlovin/hex4b/rev1/rules.mk b/keyboards/mechlovin/hex4b/rev1/rules.mk
index c3a1785039..15d473397d 100644
--- a/keyboards/mechlovin/hex4b/rev1/rules.mk
+++ b/keyboards/mechlovin/hex4b/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32a
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
# Processor frequency
F_CPU = 16000000
diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json
index da18a2ce4b..040f96b010 100644
--- a/keyboards/mechlovin/hex4b/rev2/info.json
+++ b/keyboards/mechlovin/hex4b/rev2/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Hex-4B Rev.2",
"usb": {
"device_version": "0.0.2"
- }
+ },
+ "processor": "STM32F103",
+ "bootloader": "stm32duino"
}
diff --git a/keyboards/mechlovin/hex4b/rev2/rules.mk b/keyboards/mechlovin/hex4b/rev2/rules.mk
index a61a25009b..a5089d51a5 100644
--- a/keyboards/mechlovin/hex4b/rev2/rules.mk
+++ b/keyboards/mechlovin/hex4b/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json
index 5c01225cd7..990dbfd48c 100644
--- a/keyboards/mechlovin/hex6c/info.json
+++ b/keyboards/mechlovin/hex6c/info.json
@@ -8,6 +8,9 @@
"pid": "0x6C01",
"device_version": "0.0.1"
},
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/hex6c/rules.mk b/keyboards/mechlovin/hex6c/rules.mk
index 3bdec7329d..61776ab892 100644
--- a/keyboards/mechlovin/hex6c/rules.mk
+++ b/keyboards/mechlovin/hex6c/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json
new file mode 100644
index 0000000000..c06ffbaf06
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/info.json
@@ -0,0 +1,5 @@
+{
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C"
+}
diff --git a/keyboards/mechlovin/infinity87/rev1/rules.mk b/keyboards/mechlovin/infinity87/rev1/rules.mk
index 82b0f2e482..53a9137b2f 100644
--- a/keyboards/mechlovin/infinity87/rev1/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev1/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index 62aa3cfeb0..858f906ed2 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -8,6 +8,8 @@
"pid": "0x8702",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk
index 92823adea9..ea7804f158 100644
--- a/keyboards/mechlovin/infinity87/rev2/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index fc308175cf..604fa512ed 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x8710",
"device_version": "0.0.1"
},
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
index 27de40424a..5a28c2e1c2 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
@@ -1,9 +1,2 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
RGB_MATRIX_ENABLE = yes # Use RGB matrix
RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
index 9c9fe10a10..3b31aee81a 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -8,6 +8,8 @@
"pid": "0x0875",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_tkl_ansi_split_bs_rshift": {
"layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk
index d16f1ac35b..202f5f759b 100644
--- a/keyboards/mechlovin/infinity875/rules.mk
+++ b/keyboards/mechlovin/infinity875/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json
index 46ae961cde..975d40a8a9 100644
--- a/keyboards/mechlovin/infinity88/info.json
+++ b/keyboards/mechlovin/infinity88/info.json
@@ -8,6 +8,9 @@
"pid": "0x8802",
"device_version": "0.0.1"
},
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
"community_layouts": ["tkl_f13_ansi", "tkl_f13_iso"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/mechlovin/infinity88/rules.mk b/keyboards/mechlovin/infinity88/rules.mk
index 75bcbf6987..ca7f10db50 100644
--- a/keyboards/mechlovin/infinity88/rules.mk
+++ b/keyboards/mechlovin/infinity88/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/info.json
index f85aa21278..23a34f48a8 100644
--- a/keyboards/mechlovin/infinityce/info.json
+++ b/keyboards/mechlovin/infinityce/info.json
@@ -8,6 +8,8 @@
"pid": "0x8801",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/infinityce/rules.mk b/keyboards/mechlovin/infinityce/rules.mk
index b27013f863..3d5cb57ad5 100644
--- a/keyboards/mechlovin/infinityce/rules.mk
+++ b/keyboards/mechlovin/infinityce/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/info.json
index 69e336fa31..f95f0654eb 100644
--- a/keyboards/mechlovin/jay60/info.json
+++ b/keyboards/mechlovin/jay60/info.json
@@ -8,6 +8,8 @@
"pid": "0x0600",
"device_version": "0.0.1"
},
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/jay60/rules.mk b/keyboards/mechlovin/jay60/rules.mk
index fe2be33f82..1e9f925544 100644
--- a/keyboards/mechlovin/jay60/rules.mk
+++ b/keyboards/mechlovin/jay60/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32a
-
# Processor frequency
F_CPU = 16000000
-# Bootloader selection
-BOOTLOADER = usbasploader
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/info.json
index 310bccda29..0f21e4b766 100644
--- a/keyboards/mechlovin/kanu/info.json
+++ b/keyboards/mechlovin/kanu/info.json
@@ -8,6 +8,8 @@
"pid": "0x4B4E",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_iso_blocker_split_bs", "65_iso_blocker"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/mechlovin/kanu/rules.mk b/keyboards/mechlovin/kanu/rules.mk
index b27013f863..3d5cb57ad5 100644
--- a/keyboards/mechlovin/kanu/rules.mk
+++ b/keyboards/mechlovin/kanu/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index 86298b5582..38bbb3c65a 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -8,6 +8,8 @@
"pid": "0x0601",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/kay60/rules.mk b/keyboards/mechlovin/kay60/rules.mk
index f3ae57a374..48c738da8f 100644
--- a/keyboards/mechlovin/kay60/rules.mk
+++ b/keyboards/mechlovin/kay60/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json
index 50b0830ef9..209e1a076d 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/info.json
@@ -8,6 +8,8 @@
"pid": "0x6502",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_iso_blocker"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/mechlovin/kay65/rules.mk b/keyboards/mechlovin/kay65/rules.mk
index 1f52c37154..2eba275490 100644
--- a/keyboards/mechlovin/kay65/rules.mk
+++ b/keyboards/mechlovin/kay65/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json
index 2153f0ad17..e079a7a403 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev1/info.json
@@ -3,5 +3,8 @@
"usb": {
"pid": "0x6509",
"device_version": "0.0.1"
- }
+ },
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C"
}
diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk
index 927204fc74..d6fa845569 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk
+++ b/keyboards/mechlovin/mechlovin9/rev1/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
index 2c92773e6d..bada93cca4 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/info.json
@@ -3,5 +3,7 @@
"usb": {
"pid": "0x6509",
"device_version": "0.0.2"
- }
+ },
+ "processor": "atmega32a",
+ "bootloader": "bootloadhid"
}
diff --git a/keyboards/mechlovin/mechlovin9/rev2/rules.mk b/keyboards/mechlovin/mechlovin9/rev2/rules.mk
index afbfc0d853..c2ee0bc86f 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/rules.mk
+++ b/keyboards/mechlovin/mechlovin9/rev2/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = atmega32a
-
# Processor frequency
F_CPU = 16000000
-
-# Bootloader selection
-BOOTLOADER = bootloadhid
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index c37f167bdb..87d2f3a1a6 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -8,6 +8,8 @@
"pid": "0xD181",
"device_version": "0.0.1"
},
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk
index 2fafe64f12..1d15495eef 100644
--- a/keyboards/mechlovin/olly/bb/rules.mk
+++ b/keyboards/mechlovin/olly/bb/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32a
-
# Processor frequency
F_CPU = 16000000
-# Bootloader selection
-BOOTLOADER = usbasploader
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index 96ea429cb9..4496f5c92a 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -8,6 +8,8 @@
"pid": "0xD180",
"device_version": "0.0.1"
},
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/olly/jf/rules.mk b/keyboards/mechlovin/olly/jf/rules.mk
index 2fafe64f12..1d15495eef 100644
--- a/keyboards/mechlovin/olly/jf/rules.mk
+++ b/keyboards/mechlovin/olly/jf/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32a
-
# Processor frequency
F_CPU = 16000000
-# Bootloader selection
-BOOTLOADER = usbasploader
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index a8da1881e4..9adec5281c 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,6 +8,8 @@
"pid": "0xD750",
"device_version": "0.0.1"
},
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
"layout_aliases": {
"LAYOUT": "LAYOUT_split_bs",
"LAYOUT_all": "LAYOUT_split_bs"
diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk
index 163e6224bd..25096b03d7 100644
--- a/keyboards/mechlovin/olly/octagon/rules.mk
+++ b/keyboards/mechlovin/olly/octagon/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/info.json
index 07f2208b3f..864fd7ff46 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/info.json
@@ -8,6 +8,8 @@
"pid": "0xD870",
"device_version": "0.0.1"
},
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
"layouts": {
"LAYOUT_tkl_ansi_split_bs_rshift": {
"layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
diff --git a/keyboards/mechlovin/olly/orion/rules.mk b/keyboards/mechlovin/olly/orion/rules.mk
index 2e0fa8f743..ef83f572cc 100644
--- a/keyboards/mechlovin/olly/orion/rules.mk
+++ b/keyboards/mechlovin/olly/orion/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F103
-BOARD = STM32_F103_STM32DUINO
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 20b521636f..7a057d15c3 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -8,6 +8,8 @@
"pid": "0x6501",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/pisces/rules.mk b/keyboards/mechlovin/pisces/rules.mk
index 2a88ecc5da..bb8afde082 100644
--- a/keyboards/mechlovin/pisces/rules.mk
+++ b/keyboards/mechlovin/pisces/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/info.json
index fe891d5987..d3ba633cf2 100644
--- a/keyboards/mechlovin/serratus/info.json
+++ b/keyboards/mechlovin/serratus/info.json
@@ -8,6 +8,8 @@
"pid": "0x0870",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/serratus/rules.mk b/keyboards/mechlovin/serratus/rules.mk
index a10d80e257..03ea2f1bda 100644
--- a/keyboards/mechlovin/serratus/rules.mk
+++ b/keyboards/mechlovin/serratus/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json
index 535903586c..52a00d5c9c 100644
--- a/keyboards/mechlovin/th1800/info.json
+++ b/keyboards/mechlovin/th1800/info.json
@@ -8,6 +8,8 @@
"pid": "0x1800",
"device_version": "0.0.1"
},
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk
index fe2be33f82..1e9f925544 100644
--- a/keyboards/mechlovin/th1800/rules.mk
+++ b/keyboards/mechlovin/th1800/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32a
-
# Processor frequency
F_CPU = 16000000
-# Bootloader selection
-BOOTLOADER = usbasploader
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json
index 80922903ce..163b4de6d1 100644
--- a/keyboards/mechlovin/tmkl/info.json
+++ b/keyboards/mechlovin/tmkl/info.json
@@ -7,6 +7,9 @@
"pid": "0xC601",
"device_version": "0.0.1"
},
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechlovin/tmkl/rules.mk b/keyboards/mechlovin/tmkl/rules.mk
index 6d58f12af6..80b09b5e41 100644
--- a/keyboards/mechlovin/tmkl/rules.mk
+++ b/keyboards/mechlovin/tmkl/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/info.json
index e40e1ae91f..0208f48349 100644
--- a/keyboards/mechlovin/zed60/info.json
+++ b/keyboards/mechlovin/zed60/info.json
@@ -8,6 +8,8 @@
"pid": "0x0602",
"device_version": "0.0.1"
},
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
"layout_aliases": {
"LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
},
diff --git a/keyboards/mechlovin/zed60/rules.mk b/keyboards/mechlovin/zed60/rules.mk
index d90d20b776..a0a5d79843 100644
--- a/keyboards/mechlovin/zed60/rules.mk
+++ b/keyboards/mechlovin/zed60/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/mechlovin/zed65/info.json b/keyboards/mechlovin/zed65/info.json
new file mode 100644
index 0000000000..cf993be247
--- /dev/null
+++ b/keyboards/mechlovin/zed65/info.json
@@ -0,0 +1,4 @@
+{
+ "processor": "STM32F103",
+ "bootloader": "stm32duino"
+}
diff --git a/keyboards/mechlovin/zed65/rules.mk b/keyboards/mechlovin/zed65/rules.mk
index dbee1e2486..8e2643d31f 100644
--- a/keyboards/mechlovin/zed65/rules.mk
+++ b/keyboards/mechlovin/zed65/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F103
-BOARD = STM32_F103_STM32DUINO
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
# Build Options
# change yes to no to disable
#