summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/charybdis/3x6
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/charybdis/3x6')
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk8
-rw-r--r--keyboards/bastardkb/charybdis/3x6/config.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/info.json1
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk7
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk6
14 files changed, 20 insertions, 51 deletions
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index 54eda1eadf..9fa70f3ca1 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -2,5 +2,8 @@
"keyboard_name": "Charybdis Mini (3x6) Blackpill",
"usb": {
"device_version": "1.0.0"
- }
+ },
+ "processor": "STM32F411",
+ "bootloader": "stm32-dfu",
+ "board": "BLACKPILL_STM32_F411"
}
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index a29e3e433d..5196e2f5e9 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/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
#
@@ -25,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/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index 40d933f0b8..b759af6560 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -24,9 +24,6 @@
#define DIODE_DIRECTION ROW2COL
-/* Set 0 if debouncing isn't needed. */
-#define DEBOUNCE 5
-
/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25
diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
index 92c424788f..1a4d15711f 100644
--- a/keyboards/bastardkb/charybdis/3x6/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -3,6 +3,7 @@
"usb": {
"pid": "0x1834"
},
+ "community_layouts": ["split_3x6_3"],
"layout_aliases": {
"LAYOUT_charybdis_3x6": "LAYOUT"
},
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index 7edaf111a9..6a03ec9a3a 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -2,5 +2,7 @@
"keyboard_name": "Charybdis Mini (3x6) Elite-C",
"usb": {
"device_version": "1.0.0"
- }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu"
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
index 54406bcc1d..7e5e593915 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v1/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/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 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/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 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/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 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/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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 15:41:08 +0000