From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/custommk/evo70/info.json | 2 ++ keyboards/custommk/evo70/rules.mk | 6 ------ keyboards/custommk/genesis/rev1/info.json | 2 ++ keyboards/custommk/genesis/rev2/info.json | 2 ++ keyboards/custommk/genesis/rev2/rules.mk | 6 ------ keyboards/custommk/genesis/rules.mk | 6 ------ 6 files changed, 6 insertions(+), 18 deletions(-) (limited to 'keyboards/custommk') diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json index 36f708828c..63c448d5c8 100644 --- a/keyboards/custommk/evo70/info.json +++ b/keyboards/custommk/evo70/info.json @@ -9,6 +9,8 @@ "pid": "0xFAB5", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["F1", "F4", "E6", "B1", "B7", "B0", "E2", "D4", "D6", "D7", "B4", "B3", "B6", "C6"], diff --git a/keyboards/custommk/evo70/rules.mk b/keyboards/custommk/evo70/rules.mk index 5676d945f9..1f9083a182 100644 --- a/keyboards/custommk/evo70/rules.mk +++ b/keyboards/custommk/evo70/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json index ef7838af56..3ff1d77904 100644 --- a/keyboards/custommk/genesis/rev1/info.json +++ b/keyboards/custommk/genesis/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0xFAB0", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_ortho_5x4": { "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"Mute", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Pg Up", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Pg Dn", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"Spc", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}] diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json index 8c94f48eab..6ba57648cb 100644 --- a/keyboards/custommk/genesis/rev2/info.json +++ b/keyboards/custommk/genesis/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0xFAB1", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_ortho_5x4": { "layout": [{"label":"MO(1)", "x":0, "y":0}, diff --git a/keyboards/custommk/genesis/rev2/rules.mk b/keyboards/custommk/genesis/rev2/rules.mk index 00195cec93..212c267b25 100644 --- a/keyboards/custommk/genesis/rev2/rules.mk +++ b/keyboards/custommk/genesis/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk index dabe21110b..cb164c1a89 100644 --- a/keyboards/custommk/genesis/rules.mk +++ b/keyboards/custommk/genesis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3