aboutsummaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/charybdis
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/charybdis')
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json4
18 files changed, 45 insertions, 21 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
index c43f84e0de..300b0eeaed 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
@@ -21,7 +21,5 @@
#define HAL_USE_PWM TRUE
#define HAL_USE_SERIAL TRUE
#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json
index 4a94d023d4..2fd99fb5ab 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2",
+ "serial": {
+ "pin": "D2"
+ },
"matrix_pins": {
"right": {
"cols": ["C7", "B7", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json
index bc95061ced..51f6cedf51 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json
index cc990d3f21..cf800062b3 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json
index 6719b21196..d9039f7591 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json
index 2de77b07f0..ca48cc0f3c 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json
@@ -30,7 +30,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
index 1ba700a80f..5c5dff98d4 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
@@ -21,7 +21,5 @@
#define HAL_USE_PWM TRUE
#define HAL_USE_SERIAL TRUE
#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
index dcc454366c..cef4eab72f 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2",
+ "serial": {
+ "pin": "D2"
+ },
"matrix_pins": {
"right": {
"cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
index ce74b2dc6d..fdfd2c38f9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
index 825508475c..650bf46481 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
index 4d9cfb616d..b2a4890f56 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
index 05d82b2445..a405395438 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
@@ -30,7 +30,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
index c43f84e0de..300b0eeaed 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
@@ -21,7 +21,5 @@
#define HAL_USE_PWM TRUE
#define HAL_USE_SERIAL TRUE
#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
index b90b144c8b..6b0caff82e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2",
+ "serial": {
+ "pin": "D2"
+ },
"matrix_pins": {
"right": {
"cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
index 8ae66d083b..4163f9d476 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
index b0c98389f7..0da7d0b442 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
index 1e072db85b..026684eb92 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
index ab145e0f95..ed929f7fb7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
@@ -30,7 +30,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}