summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/charybdis/3x6/v2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/charybdis/3x6/v2')
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk6
12 files changed, 24 insertions, 43 deletions
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
index e9d45e6796..ba2bd4ac36 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
@@ -26,9 +26,6 @@
/* Handedness. */
#define MASTER_RIGHT
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN D2
-
/* RGB settings. */
#define RGB_DI_PIN D3
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index 02fe2e9ef3..d84a7f314c 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -2,5 +2,10 @@
"keyboard_name": "Charybdis Mini (3x6) Elite-C",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "split": {
+ "soft_serial_pin": "D2"
+ },
+ "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 54406bcc1d..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
#
@@ -24,7 +18,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
index 3f72897c56..053d780161 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
@@ -31,9 +31,6 @@
// #define SPLIT_HAND_PIN GP13
// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
/* RGB settings. */
#define RGB_DI_PIN GP0
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 64c663c7c9..4e1c96298d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -2,5 +2,10 @@
"keyboard_name": "Charybdis Mini (3x6) Splinky",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "split": {
+ "soft_serial_pin": "GP1"
+ },
+ "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 6ab474a76f..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.
@@ -28,7 +22,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
index 1828aaa98b..e4afc5a866 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
@@ -31,9 +31,6 @@
// #define SPLIT_HAND_PIN GP15
// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
/* RGB settings. */
#define RGB_DI_PIN GP0
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index 64c663c7c9..4e1c96298d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -2,5 +2,10 @@
"keyboard_name": "Charybdis Mini (3x6) Splinky",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "split": {
+ "soft_serial_pin": "GP1"
+ },
+ "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 6ab474a76f..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.
@@ -28,7 +22,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
index 81c7e737a7..658819f936 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
@@ -32,9 +32,6 @@
// #define SPLIT_HAND_PIN A0
// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN D2
-
/* RGB settings. */
#define RGB_DI_PIN D3
#define WS2812_PWM_DRIVER PWMD2
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 8aa7bf24c9..b667f6d76a 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -2,5 +2,10 @@
"keyboard_name": "Charybdis Mini (3x6) STeMCell",
"usb": {
"device_version": "2.0.0"
- }
+ },
+ "split": {
+ "soft_serial_pin": "D2"
+ },
+ "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 94cd8a0deb..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
@@ -25,7 +20,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x6_3
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360