summaryrefslogtreecommitdiffstats
path: root/keyboards/bastardkb/charybdis/3x6/v2
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-08 18:41:46 +1100
committerGitHub <noreply@github.com>2023-02-08 18:41:46 +1100
commitf9aeea64c1f85d388485503e52035b5f7533ed26 (patch)
tree72808eb450b72eddac307395784c914cb22c0dd4 /keyboards/bastardkb/charybdis/3x6/v2
parent3499677b6a5a9ee5845122382f93f0500dfd8429 (diff)
Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)
Diffstat (limited to 'keyboards/bastardkb/charybdis/3x6/v2')
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk5
8 files changed, 12 insertions, 27 deletions
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index 02fe2e9ef3..7186cb2c04 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Charybdis Mini (3x6) Elite-C",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu"
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
index c3f278c003..7e5e593915 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/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/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 64c663c7c9..17dc0c1222 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Charybdis Mini (3x6) Splinky",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "processor": "RP2040",
+ "bootloader": "rp2040"
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index 13c1b39961..b67408f28e 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
# RP2040-specific options
ALLOW_WARNINGS = yes
PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index 64c663c7c9..17dc0c1222 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Charybdis Mini (3x6) Splinky",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "processor": "RP2040",
+ "bootloader": "rp2040"
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
index 13c1b39961..b67408f28e 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
# RP2040-specific options
ALLOW_WARNINGS = yes
PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 8aa7bf24c9..b041972cfe 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Charybdis Mini (3x6) STeMCell",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "processor": "STM32F411",
+ "bootloader": "stm32-dfu"
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 0847e9ce1f..3895209c6a 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -1,8 +1,3 @@
-# MCU name
-MCU = STM32F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
CONVERT_TO = stemcell
# Build Options