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/25keys | |
| parent | 3499677b6a5a9ee5845122382f93f0500dfd8429 (diff) | |
Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)
Diffstat (limited to 'keyboards/25keys')
| -rw-r--r-- | keyboards/25keys/aleth42/rev0/info.json | 4 | ||||
| -rw-r--r-- | keyboards/25keys/aleth42/rev0/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/25keys/aleth42/rev1/info.json | 4 | ||||
| -rw-r--r-- | keyboards/25keys/aleth42/rev1/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/25keys/cassette42/info.json | 2 | ||||
| -rw-r--r-- | keyboards/25keys/cassette42/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/25keys/zinc/info.json | 2 | ||||
| -rw-r--r-- | keyboards/25keys/zinc/rules.mk | 6 |
8 files changed, 10 insertions, 26 deletions
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json index 5baab67dba..acb5cc5855 100644 --- a/keyboards/25keys/aleth42/rev0/info.json +++ b/keyboards/25keys/aleth42/rev0/info.json | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "usb": { | 2 | "usb": { |
| 3 | "device_version": "0.0.0" | 3 | "device_version": "0.0.0" |
| 4 | } | 4 | }, |
| 5 | "processor": "atmega32u2", | ||
| 6 | "bootloader": "atmel-dfu" | ||
| 5 | } | 7 | } |
diff --git a/keyboards/25keys/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk index fd5789116d..e0954e7355 100644 --- a/keyboards/25keys/aleth42/rev0/rules.mk +++ b/keyboards/25keys/aleth42/rev0/rules.mk | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = atmega32u2 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | BOOTLOADER = atmel-dfu | ||
| 6 | |||
| 7 | # Build Options | 1 | # Build Options |
| 8 | # change yes to no to disable | 2 | # change yes to no to disable |
| 9 | # | 3 | # |
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json index 90ac25f360..dab37baf04 100644 --- a/keyboards/25keys/aleth42/rev1/info.json +++ b/keyboards/25keys/aleth42/rev1/info.json | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "usb": { | 2 | "usb": { |
| 3 | "device_version": "0.0.1" | 3 | "device_version": "0.0.1" |
| 4 | } | 4 | }, |
| 5 | "processor": "atmega32u4", | ||
| 6 | "bootloader": "atmel-dfu" | ||
| 5 | } | 7 | } |
diff --git a/keyboards/25keys/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk index 5ff179b0eb..683b249802 100644 --- a/keyboards/25keys/aleth42/rev1/rules.mk +++ b/keyboards/25keys/aleth42/rev1/rules.mk | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = atmega32u4 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | BOOTLOADER = atmel-dfu | ||
| 6 | |||
| 7 | # Build Options | 1 | # Build Options |
| 8 | # change yes to no to disable | 2 | # change yes to no to disable |
| 9 | # | 3 | # |
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json index 4fe088f9e6..5150c28422 100644 --- a/keyboards/25keys/cassette42/info.json +++ b/keyboards/25keys/cassette42/info.json | |||
| @@ -8,6 +8,8 @@ | |||
| 8 | "pid": "0xCA42", | 8 | "pid": "0xCA42", |
| 9 | "device_version": "0.0.1" | 9 | "device_version": "0.0.1" |
| 10 | }, | 10 | }, |
| 11 | "processor": "atmega32u4", | ||
| 12 | "bootloader": "caterina", | ||
| 11 | "layouts": { | 13 | "layouts": { |
| 12 | "LAYOUT": { | 14 | "LAYOUT": { |
| 13 | "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}] | 15 | "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}] |
diff --git a/keyboards/25keys/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk index 756fb8ec92..eaeebeff07 100644 --- a/keyboards/25keys/cassette42/rules.mk +++ b/keyboards/25keys/cassette42/rules.mk | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = atmega32u4 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | BOOTLOADER = caterina | ||
| 6 | |||
| 7 | # Build Options | 1 | # Build Options |
| 8 | # change yes to no to disable | 2 | # change yes to no to disable |
| 9 | # | 3 | # |
diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json index 3d9c898841..d667ca186c 100644 --- a/keyboards/25keys/zinc/info.json +++ b/keyboards/25keys/zinc/info.json | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | "pid": "0xEA3B", | 7 | "pid": "0xEA3B", |
| 8 | "device_version": "0.0.1" | 8 | "device_version": "0.0.1" |
| 9 | }, | 9 | }, |
| 10 | "processor": "atmega32u4", | ||
| 11 | "bootloader": "caterina", | ||
| 10 | "layouts": { | 12 | "layouts": { |
| 11 | "LAYOUT": { | 13 | "LAYOUT": { |
| 12 | "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] | 14 | "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] |
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk index 2fd608c56c..21bd83b609 100644 --- a/keyboards/25keys/zinc/rules.mk +++ b/keyboards/25keys/zinc/rules.mk | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = atmega32u4 | ||
| 3 | |||
| 4 | # Bootloader selection | ||
| 5 | BOOTLOADER = caterina | ||
| 6 | |||
| 7 | # Build Options | 1 | # Build Options |
| 8 | # change yes to no to disable | 2 | # change yes to no to disable |
| 9 | # | 3 | # |
