summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/charybdis/4x6
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-11 00:00:24 +1100
committerGitHub <noreply@github.com>2023-03-11 00:00:24 +1100
commit9e64300e67720a5468c2585391250ca5579b311b (patch)
treed8c471bb33cd5d0e38e90d925d69b3c6b3cb2d59 /keyboards/bastardkb/charybdis/4x6
parentdd086a51d82a574a55eb3b89e8943301d72296f3 (diff)
Move matrix config to info.json, part 4 (#20001)
Diffstat (limited to 'keyboards/bastardkb/charybdis/4x6')
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h11
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json13
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json5
13 files changed, 37 insertions, 44 deletions
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
index e37df487fd..69e269a963 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
@@ -19,12 +19,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { B15, 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/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index ec2b0cbad0..c27515d0fb 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
+ "rows": ["B15", "A2", "B8", "A8", "B9"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "STM32F411",
"bootloader": "stm32-dfu",
"board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index 21887dca07..64b5158698 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/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/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
index 44e81807ee..484ccc523f 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h
@@ -18,17 +18,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { F1, B7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
- { D5, C7, F0, D7, E6, B4 }
-
-#define MATRIX_ROW_PINS_RIGHT \
- { D5, 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/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index c9921cd341..5dda4a73a5 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -3,8 +3,19 @@
"usb": {
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["D5", "C7", "F0", "D7", "E6", "B4"],
+ "rows": ["F1", "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": ["D5", "F0", "C6", "D4", "B5"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
index 8e586b89b2..20b610172d 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { F4, F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
- { F6, F5, B6, D7, E6, B4 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 9349712a41..cf70250a15 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F4", "F7", "C6", "D4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "D2"
},
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
index 3e7e3529c8..f09dc72c01 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
- { GP27, GP28, GP15, GP6, GP7, GP8 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
index 6931f9e876..1815ea2b0a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/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": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "GP1"
},
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
index 827267d2cf..bb85468a86 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP29, GP26, GP5, GP4, GP9 }
-#define MATRIX_COL_PINS \
- { GP27, GP28, GP21, GP6, GP7, GP8 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
index 6931f9e876..94f0db8353 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/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": ["GP29", "GP26", "GP5", "GP4", "GP9"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "GP1"
},
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
index fc4e3efadf..e01419b97a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { F4, F7, C6, D4, B5 }
-#define MATRIX_COL_PINS \
- { F6, F5, B6, D7, E6, B4 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 0b7ea21560..5f0fd50578 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F4", "F7", "C6", "D4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "D2"
},