diff options
Diffstat (limited to 'keyboards/bastardkb')
81 files changed, 660 insertions, 398 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h deleted file mode 100644 index 8e4a2de892..0000000000 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP26, GP5, GP4, GP9 } - -/* serial.c configuration (for split keyboard). */ -#define SOFT_SERIAL_PIN GP1 - -/* RGB settings. */ -#define RGB_DI_PIN GP0 - -/* SPI & PMW3360 settings. */ -#define SPI_DRIVER SPID0 -#define SPI_MISO_PIN GP20 - -/* Reset. */ -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md deleted file mode 100644 index 22df77bbaa..0000000000 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -# Splinky controller - -The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040. - -See https://github.com/plut0nium/0xB2/#releases to figure out the right version -for you (v2 and v3) supported. diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk deleted file mode 100644 index c9c50319db..0000000000 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Intentionally blank so that QMK detects this folder as a valid keyboard -# parameter. diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk deleted file mode 100644 index c9c50319db..0000000000 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Intentionally blank so that QMK detects this folder as a valid keyboard -# parameter. diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h index 8e4a2de892..cbdc3ae855 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h @@ -20,6 +20,16 @@ /* Key matrix configuration. */ #define MATRIX_ROW_PINS \ { GP26, GP5, GP4, GP9 } +#define MATRIX_COL_PINS \ + { GP28, GP15, GP6, GP7, GP8 } + +/* 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 @@ -29,7 +39,10 @@ /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 +#define SPI_SCK_PIN GP18 #define SPI_MISO_PIN GP20 +#define SPI_MOSI_PIN GP19 +#define POINTING_DEVICE_CS_PIN GP14 /* Reset. */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json index 98f436f52b..98f436f52b 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h index 0fdd67c3a2..0fdd67c3a2 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/readme.md b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/readme.md new file mode 100644 index 0000000000..662eb5825c --- /dev/null +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/readme.md @@ -0,0 +1,5 @@ +# Splinky controller + +The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040. + +See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3). diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk index 7e38f33d5d..21a9506077 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk @@ -35,5 +35,3 @@ POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor - -DEFAULT_FOLDER = bastardkb/charybdis/3x5/v2/splinky/v3 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h new file mode 100644 index 0000000000..3772044c15 --- /dev/null +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h @@ -0,0 +1,50 @@ +/* + * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + +/* Key matrix configuration. */ +#define MATRIX_ROW_PINS \ + { GP26, GP5, GP4, GP9 } +#define MATRIX_COL_PINS \ + { GP28, GP21, GP6, GP7, GP8 } + +/* 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. + +/* serial.c configuration (for split keyboard). */ +#define SOFT_SERIAL_PIN GP1 + +/* RGB settings. */ +#define RGB_DI_PIN GP0 + +/* SPI & PMW3360 settings. */ +#define SPI_DRIVER SPID0 +#define SPI_SCK_PIN GP22 +#define SPI_MISO_PIN GP20 +#define SPI_MOSI_PIN GP23 +#define POINTING_DEVICE_CS_PIN GP16 + +/* Reset. */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json new file mode 100644 index 0000000000..98f436f52b --- /dev/null +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Charybdis Nano (3x5) Splinky", + "usb": { + "device_version": "2.0.0" + } +} diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h index 0fdd67c3a2..0fdd67c3a2 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky/mcuconf.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/readme.md b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/readme.md new file mode 100644 index 0000000000..662eb5825c --- /dev/null +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/readme.md @@ -0,0 +1,5 @@ +# Splinky controller + +The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040. + +See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3). diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk index 34ef782d2f..21a9506077 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk @@ -28,11 +28,10 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes |