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/vitamins_included/info.json | 1 + keyboards/vitamins_included/rev1/info.json | 3 ++- keyboards/vitamins_included/rev1/rules.mk | 3 --- keyboards/vitamins_included/rev2/info.json | 3 ++- keyboards/vitamins_included/rev2/rules.mk | 3 --- keyboards/vitamins_included/rules.mk | 3 --- 6 files changed, 5 insertions(+), 11 deletions(-) (limited to 'keyboards/vitamins_included') diff --git a/keyboards/vitamins_included/info.json b/keyboards/vitamins_included/info.json index f7a9cdef3d..883278d983 100644 --- a/keyboards/vitamins_included/info.json +++ b/keyboards/vitamins_included/info.json @@ -7,6 +7,7 @@ "vid": "0x1209", "pid": "0xBEE5" }, + "processor": "atmega32u4", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT": { diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json index 90ac25f360..1245b8be56 100644 --- a/keyboards/vitamins_included/rev1/info.json +++ b/keyboards/vitamins_included/rev1/info.json @@ -1,5 +1,6 @@ { "usb": { "device_version": "0.0.1" - } + }, + "bootloader": "caterina" } diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk index 6e9beefafe..d38a618090 100644 --- a/keyboards/vitamins_included/rev1/rules.mk +++ b/keyboards/vitamins_included/rev1/rules.mk @@ -1,4 +1 @@ -# Bootloader selection -BOOTLOADER = caterina - SPLIT_KEYBOARD = yes diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json index e557e4d307..f7a5336568 100644 --- a/keyboards/vitamins_included/rev2/info.json +++ b/keyboards/vitamins_included/rev2/info.json @@ -1,5 +1,6 @@ { "usb": { "device_version": "0.0.2" - } + }, + "bootloader": "qmk-dfu" } diff --git a/keyboards/vitamins_included/rev2/rules.mk b/keyboards/vitamins_included/rev2/rules.mk index 05167eb3b9..9f05083d69 100644 --- a/keyboards/vitamins_included/rev2/rules.mk +++ b/keyboards/vitamins_included/rev2/rules.mk @@ -1,6 +1,3 @@ -# Bootloader selection -BOOTLOADER = qmk-dfu - SPLIT_KEYBOARD = yes # Disable unsupported hardware diff --git a/keyboards/vitamins_included/rules.mk b/keyboards/vitamins_included/rules.mk index c64a5ac5f0..3ca1a5cf70 100644 --- a/keyboards/vitamins_included/rules.mk +++ b/keyboards/vitamins_included/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u4 - # Build Options # change yes to no to disable # -- cgit v1.2.3