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/tgr/910/info.json | 2 ++ keyboards/tgr/910/rules.mk | 6 ------ keyboards/tgr/910ce/info.json | 2 ++ keyboards/tgr/910ce/rules.mk | 6 ------ keyboards/tgr/alice/info.json | 2 ++ keyboards/tgr/alice/rules.mk | 6 ------ keyboards/tgr/jane/v2/info.json | 2 ++ keyboards/tgr/jane/v2/rules.mk | 6 ------ keyboards/tgr/jane/v2ce/info.json | 2 ++ keyboards/tgr/jane/v2ce/rules.mk | 6 ------ keyboards/tgr/tris/info.json | 2 ++ keyboards/tgr/tris/rules.mk | 6 ------ 12 files changed, 12 insertions(+), 36 deletions(-) (limited to 'keyboards/tgr') diff --git a/keyboards/tgr/910/info.json b/keyboards/tgr/910/info.json index 694d4be5d9..bf9d895b4d 100644 --- a/keyboards/tgr/910/info.json +++ b/keyboards/tgr/910/info.json @@ -8,6 +8,8 @@ "pid": "0x9100", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] diff --git a/keyboards/tgr/910/rules.mk b/keyboards/tgr/910/rules.mk index 9a2e1da0de..9a00928ea8 100644 --- a/keyboards/tgr/910/rules.mk +++ b/keyboards/tgr/910/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/910ce/info.json b/keyboards/tgr/910ce/info.json index 7fb25e4412..d38a4720f3 100644 --- a/keyboards/tgr/910ce/info.json +++ b/keyboards/tgr/910ce/info.json @@ -8,6 +8,8 @@ "pid": "0x910C", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["65_ansi_blocker", "65_iso_blocker"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/tgr/910ce/rules.mk b/keyboards/tgr/910ce/rules.mk index 3be499411c..78a6bee271 100644 --- a/keyboards/tgr/910ce/rules.mk +++ b/keyboards/tgr/910ce/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json index f5be2ed6a3..cd1d330103 100644 --- a/keyboards/tgr/alice/info.json +++ b/keyboards/tgr/alice/info.json @@ -8,6 +8,8 @@ "pid": "0x422E", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["alice_split_bs"], "layouts": { "LAYOUT_alice_split_bs": { diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk index 9686fd1aa4..25437c442c 100644 --- a/keyboards/tgr/alice/rules.mk +++ b/keyboards/tgr/alice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/jane/v2/info.json b/keyboards/tgr/jane/v2/info.json index 101b66eded..89949c886f 100644 --- a/keyboards/tgr/jane/v2/info.json +++ b/keyboards/tgr/jane/v2/info.json @@ -8,6 +8,8 @@ "pid": "0x4A4E", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/tgr/jane/v2/rules.mk b/keyboards/tgr/jane/v2/rules.mk index 7bc9adda6b..4ba2386220 100644 --- a/keyboards/tgr/jane/v2/rules.mk +++ b/keyboards/tgr/jane/v2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/info.json index bbcb90bff0..391b657bed 100644 --- a/keyboards/tgr/jane/v2ce/info.json +++ b/keyboards/tgr/jane/v2ce/info.json @@ -8,6 +8,8 @@ "pid": "0x4A43", "device_version": "2.0.0" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_tsangan", "tkl_f13_iso", "tkl_f13_iso_tsangan"], "layouts": { "LAYOUT_all_f13": { diff --git a/keyboards/tgr/jane/v2ce/rules.mk b/keyboards/tgr/jane/v2ce/rules.mk index 4bcec1c4eb..ea1cd4ec4f 100644 --- a/keyboards/tgr/jane/v2ce/rules.mk +++ b/keyboards/tgr/jane/v2ce/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # diff --git a/keyboards/tgr/tris/info.json b/keyboards/tgr/tris/info.json index 2c7034e5fc..bd2a42b77f 100644 --- a/keyboards/tgr/tris/info.json +++ b/keyboards/tgr/tris/info.json @@ -8,6 +8,8 @@ "pid": "0x5452", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "bootloadhid", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_ortho_6x4": { diff --git a/keyboards/tgr/tris/rules.mk b/keyboards/tgr/tris/rules.mk index 9a2e1da0de..9a00928ea8 100644 --- a/keyboards/tgr/tris/rules.mk +++ b/keyboards/tgr/tris/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = bootloadhid - # Build Options # change yes to no to disable # -- cgit v1.2.3