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/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h11
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json13
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json5
13 files changed, 37 insertions, 44 deletions
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
index 93d897a4fe..1070dbd066 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { A2, B8, A8, B9 }
-#define MATRIX_COL_PINS \
- { B0, B1, B10, B3, B4, B5 }
-
/* Handedness. */
#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index 9fa70f3ca1..8287b3112d 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+ "rows": ["A2", "B8", "A8", "B9"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "STM32F411",
"bootloader": "stm32-dfu",
"board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index 19a2fb56f5..ba729aee3e 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -18,8 +18,6 @@
#pragma once
-#define DIODE_DIRECTION ROW2COL
-
/* Trackball angle adjustment. */
#define ROTATIONAL_TRANSFORM_ANGLE -25
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
index 0fea2772d2..a1d7885943 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h
@@ -17,17 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { B7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
- { D5, C7, F0, D7, E6, B4 }
-
-#define MATRIX_ROW_PINS_RIGHT \
- { F0, C6, D4, B5 }
-#define MATRIX_COL_PINS_RIGHT \
- { F1, C7, B7, D7, E6, B4 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index 5a8b815e95..9dd366e1dd 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -3,8 +3,19 @@
"usb": {
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
+ "rows": ["B7", "C6", "D4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
- "soft_serial_pin": "D2"
+ "soft_serial_pin": "D2",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
+ "rows": ["F0", "C6", "D4", "B5"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
index ba2bd4ac36..20b610172d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
- { F6, F5, B6, D7, E6, B4 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index d84a7f314c..d575fdb216 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F7", "C6", "D4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "D2"
},
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
index 053d780161..f09dc72c01 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
- { GP27, GP28, GP15, GP6, GP7, GP8 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 4e1c96298d..e6a3a2318d 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
+ "rows": ["GP26", "GP5", "GP4", "GP9"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "GP1"
},
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
index e4afc5a866..bb85468a86 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
- { GP27, GP28, GP21, GP6, GP7, GP8 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index 4e1c96298d..d06e372938 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
+ "rows": ["GP26", "GP5", "GP4", "GP9"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "GP1"
},
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
index 658819f936..e01419b97a 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
- { F6, F5, B6, D7, E6, B4 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index b667f6d76a..99d33fd668 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F7", "C6", "D4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "D2"
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 20:21:59 +0000