From 2b0a3cd2f13ca4719cf4bba96ee7ec5ed7c1aabd Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Mon, 21 Nov 2022 05:34:42 +0900
Subject: Bastard Keyboards: upstream recent changes (#19083)

Co-authored-by: Simian <alex@Mandelbrot>
Co-authored-by: Charly Delay <0xcharly@users.noreply.github.com>
Co-authored-by: Alex Baldwin <alexbaldwin42@gmail.com>
---
 keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json    | 4 ++--
 keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h    | 8 --------
 keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json   | 4 ++--
 keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h | 8 ++++++++
 keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h | 8 ++++++++
 keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json  | 2 +-
 6 files changed, 21 insertions(+), 13 deletions(-)

(limited to 'keyboards/bastardkb/charybdis/4x6/v2')

diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 151c0e1ca3..3acba65a6b 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis (4x6) Elite-C",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
index 010de7c480..7d4ed86e84 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h
@@ -21,14 +21,6 @@
 #define MATRIX_ROW_PINS \
     { GP29, GP26, GP5, GP4, GP9 }
 
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #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
 
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
index 0004eb81c9..928a850860 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis (4x6) Splinky",
     "usb": {
-      "device_version": "2.0.0",
-    },
+        "device_version": "2.0.0"
+    }
 }
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
index 7b7d94b320..f3d3e982e3 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h
@@ -25,3 +25,11 @@
 #define SPI_SCK_PIN GP18
 #define SPI_MOSI_PIN GP19
 #define POINTING_DEVICE_CS_PIN GP14
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP13
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
index 0e9f2257f0..5f5476b1f7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h
@@ -25,3 +25,11 @@
 #define SPI_SCK_PIN GP22
 #define SPI_MOSI_PIN GP23
 #define POINTING_DEVICE_CS_PIN GP16
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+// To use the handedness pin, resistors need to be installed on the adapter PCB.
+// If so, uncomment the following code, and undefine MASTER_RIGHT above.
+// #define SPLIT_HAND_PIN GP15
+// #define SPLIT_HAND_PIN_LOW_IS_LEFT  // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 7d687319b3..932bf09a32 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "Charybdis (4x6) STeMCell",
     "usb": {
-      "device_version": "2.0.0"
+        "device_version": "2.0.0"
     }
 }
-- 
cgit v1.2.3