diff options
author | Ryan <fauxpark@gmail.com> | 2023-02-08 18:41:46 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-08 18:41:46 +1100 |
commit | f9aeea64c1f85d388485503e52035b5f7533ed26 (patch) | |
tree | 72808eb450b72eddac307395784c914cb22c0dd4 /keyboards/tkw | |
parent | 3499677b6a5a9ee5845122382f93f0500dfd8429 (diff) |
Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)
Diffstat (limited to 'keyboards/tkw')
-rw-r--r-- | keyboards/tkw/grandiceps/info.json | 3 | ||||
-rw-r--r-- | keyboards/tkw/grandiceps/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v1/info.json | 2 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v1/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/f411/info.json | 5 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/f411/rules.mk | 6 |
6 files changed, 10 insertions, 19 deletions
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index dc4cf5a0ee..d1d4b729d4 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -6,6 +6,9 @@ "vid": "0xFEED", "pid": "0x7812" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 2220b16252..1b481a9e1e 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json index 4d77a4ac68..2a8814d840 100644 --- a/keyboards/tkw/stoutgat/v1/info.json +++ b/keyboards/tkw/stoutgat/v1/info.json @@ -8,6 +8,8 @@ "pid": "0x7811", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["65_iso", "65_ansi"], "layouts": { "LAYOUT_encoder": { diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk index 837489db84..8dca0665f7 100644 --- a/keyboards/tkw/stoutgat/v1/rules.mk +++ b/keyboards/tkw/stoutgat/v1/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/tkw/stoutgat/v2/f411/info.json b/keyboards/tkw/stoutgat/v2/f411/info.json new file mode 100644 index 0000000000..2517a82403 --- /dev/null +++ b/keyboards/tkw/stoutgat/v2/f411/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" +} diff --git a/keyboards/tkw/stoutgat/v2/f411/rules.mk b/keyboards/tkw/stoutgat/v2/f411/rules.mk index c25a64f4b3..e69de29bb2 100644 --- a/keyboards/tkw/stoutgat/v2/f411/rules.mk +++ b/keyboards/tkw/stoutgat/v2/f411/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu |