diff options
| author | zvecr <git@zvecr.com> | 2022-11-22 02:48:11 +0000 |
|---|---|---|
| committer | zvecr <git@zvecr.com> | 2022-11-22 02:48:11 +0000 |
| commit | ab17d34dbd4358537435bdb4c6954b0af2040d36 (patch) | |
| tree | a42673a53e2151be180ce21c51644eda5267350d /keyboards/bastardkb/charybdis/3x6/v2 | |
| parent | 08805cada0b935cafffeb4e402c8ee24b1a946fa (diff) | |
| parent | 06a3801a27881d7a409ea1749002393d765294f9 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/bastardkb/charybdis/3x6/v2')
6 files changed, 21 insertions, 13 deletions
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json index 239a10f8a3..02fe2e9ef3 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "Charybdis Mini (3x6) Elite-C", "usb": { - "device_version": "2.0.0", - }, + "device_version": "2.0.0" + } } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h index e68bf722e4..8e4a2de892 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h @@ -21,14 +21,6 @@ #define MATRIX_ROW_PINS \ { 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/3x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json index 7f3997158f..64c663c7c9 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "Charybdis Mini (3x6) Splinky", "usb": { - "device_version": "2.0.0", - }, + "device_version": "2.0.0" + } } diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h index 7b7d94b320..f3d3e982e3 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h +++ b/keyboards/bastardkb/charybdis/3x6/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/3x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h index 0e9f2257f0..5f5476b1f7 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h +++ b/keyboards/bastardkb/charybdis/3x6/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/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json index 516eb7dde3..8aa7bf24c9 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "Charybdis Mini (3x6) STeMCell", "usb": { - "device_version": "2.0.0" + "device_version": "2.0.0" } } |