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/recompile_keys/choco60/rev1/info.json | 4 ++++ keyboards/recompile_keys/choco60/rev1/rules.mk | 6 ------ keyboards/recompile_keys/choco60/rev2/info.json | 4 ++++ keyboards/recompile_keys/choco60/rev2/rules.mk | 6 ------ keyboards/recompile_keys/cocoa40/info.json | 2 ++ keyboards/recompile_keys/cocoa40/rules.mk | 6 ------ keyboards/recompile_keys/mio/info.json | 2 ++ keyboards/recompile_keys/mio/rules.mk | 6 ------ keyboards/recompile_keys/nomu30/rev1/info.json | 4 ++++ keyboards/recompile_keys/nomu30/rev1/rules.mk | 6 ------ keyboards/recompile_keys/nomu30/rev2/info.json | 4 ++++ keyboards/recompile_keys/nomu30/rev2/rules.mk | 6 ------ 12 files changed, 20 insertions(+), 36 deletions(-) create mode 100644 keyboards/recompile_keys/choco60/rev1/info.json create mode 100644 keyboards/recompile_keys/choco60/rev2/info.json create mode 100644 keyboards/recompile_keys/nomu30/rev1/info.json create mode 100644 keyboards/recompile_keys/nomu30/rev2/info.json (limited to 'keyboards/recompile_keys') diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json new file mode 100644 index 0000000000..4369a04103 --- /dev/null +++ b/keyboards/recompile_keys/choco60/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/recompile_keys/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk index ff16426c32..b74db0a672 100644 --- a/keyboards/recompile_keys/choco60/rev1/rules.mk +++ b/keyboards/recompile_keys/choco60/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json new file mode 100644 index 0000000000..dd190d18ee --- /dev/null +++ b/keyboards/recompile_keys/choco60/rev2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/recompile_keys/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk index f8bad8e08e..ca4dbbab2f 100644 --- a/keyboards/recompile_keys/choco60/rev2/rules.mk +++ b/keyboards/recompile_keys/choco60/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json index dca5750161..6a666055f7 100644 --- a/keyboards/recompile_keys/cocoa40/info.json +++ b/keyboards/recompile_keys/cocoa40/info.json @@ -8,6 +8,8 @@ "pid": "0x4000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7.25, "y":0}, {"label":"U", "x":8.25, "y":0}, {"label":"I", "x":9.25, "y":0}, {"label":"O", "x":10.25, "y":0}, {"label":"P", "x":11.25, "y":0}, {"label":"{", "x":12.25, "y":0}, {"label":"}", "x":13.25, "y":0}, {"label":"Back
Space", "x":14.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":7.5, "y":1}, {"label":"J", "x":8.5, "y":1}, {"label":"K", "x":9.5, "y":1}, {"label":"L", "x":10.5, "y":1}, {"label":":", "x":11.5, "y":1}, {"label":"\"", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":8, "y":2}, {"label":"M", "x":9, "y":2}, {"label":"<", "x":10, "y":2}, {"label":">", "x":11, "y":2}, {"label":"?", "x":12, "y":2}, {"label":"Shift", "x":13, "y":2, "w":1.25}, {"label":"Fn", "x":14.25, "y":2}, {"label":"Opt", "x":1.5, "y":3}, {"label":"Command", "x":2.5, "y":3, "w":1.5}, {"label":"", "x":4, "y":3, "w":2.25}, {"label":"", "x":7.5, "y":3, "w":2.75}, {"label":"Command", "x":10.25, "y":3, "w":1.5}, {"label":"Opt", "x":11.75, "y":3}] diff --git a/keyboards/recompile_keys/cocoa40/rules.mk b/keyboards/recompile_keys/cocoa40/rules.mk index 3ef3128f4b..10e75fed2e 100644 --- a/keyboards/recompile_keys/cocoa40/rules.mk +++ b/keyboards/recompile_keys/cocoa40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json index 6c82236727..7523573159 100644 --- a/keyboards/recompile_keys/mio/info.json +++ b/keyboards/recompile_keys/mio/info.json @@ -8,6 +8,8 @@ "pid": "0x4D41", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/recompile_keys/mio/rules.mk b/keyboards/recompile_keys/mio/rules.mk index 3ff392a61f..951dd07d6e 100644 --- a/keyboards/recompile_keys/mio/rules.mk +++ b/keyboards/recompile_keys/mio/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/recompile_keys/nomu30/rev1/info.json b/keyboards/recompile_keys/nomu30/rev1/info.json new file mode 100644 index 0000000000..4369a04103 --- /dev/null +++ b/keyboards/recompile_keys/nomu30/rev1/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/recompile_keys/nomu30/rev1/rules.mk b/keyboards/recompile_keys/nomu30/rev1/rules.mk index df6d769aec..e29387316f 100644 --- a/keyboards/recompile_keys/nomu30/rev1/rules.mk +++ b/keyboards/recompile_keys/nomu30/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/recompile_keys/nomu30/rev2/info.json b/keyboards/recompile_keys/nomu30/rev2/info.json new file mode 100644 index 0000000000..dd190d18ee --- /dev/null +++ b/keyboards/recompile_keys/nomu30/rev2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/recompile_keys/nomu30/rev2/rules.mk b/keyboards/recompile_keys/nomu30/rev2/rules.mk index eca6e85311..c3de5dd6e5 100644 --- a/keyboards/recompile_keys/nomu30/rev2/rules.mk +++ b/keyboards/recompile_keys/nomu30/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3