diff options
Diffstat (limited to 'keyboards/bastardkb/charybdis/4x6/v2')
13 files changed, 95 insertions, 39 deletions
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md deleted file mode 100644 index 22df77bbaa..0000000000 --- a/keyboards/bastardkb/charybdis/4x6/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/4x6/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk deleted file mode 100644 index c9c50319db..0000000000 --- a/keyboards/bastardkb/charybdis/4x6/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/4x6/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk deleted file mode 100644 index c9c50319db..0000000000 --- a/keyboards/bastardkb/charybdis/4x6/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/4x6/v2/splinky/v2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h index f3d3e982e3..53d88652e1 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h @@ -18,14 +18,11 @@ #pragma once /* Key matrix configuration. */ +#define MATRIX_ROW_PINS \ + { GP29, GP26, GP5, GP4, GP9 } #define MATRIX_COL_PINS \ { GP27, GP28, GP15, GP6, GP7, GP8 } -/* SPI & PMW3360 settings. */ -#define SPI_SCK_PIN GP18 -#define SPI_MOSI_PIN GP19 -#define POINTING_DEVICE_CS_PIN GP14 - /* Handedness. */ #define MASTER_RIGHT @@ -33,3 +30,21 @@ // 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 + +/* RGB settings. */ +#define RGB_DI_PIN GP0 + +/* 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 +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json index 928a850860..928a850860 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h index 0fdd67c3a2..0fdd67c3a2 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md new file mode 100644 index 0000000000..662eb5825c --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/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/4x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk index 34ef782d2f..13c1b39961 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk @@ -34,5 +34,3 @@ POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor - -DEFAULT_FOLDER = bastardkb/charybdis/4x6/v2/splinky/v3 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h index 5f5476b1f7..8fd108a506 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h @@ -18,14 +18,11 @@ #pragma once /* Key matrix configuration. */ +#define MATRIX_ROW_PINS \ + { GP29, GP26, GP5, GP4, GP9 } #define MATRIX_COL_PINS \ { GP27, GP28, GP21, GP6, GP7, GP8 } -/* SPI & PMW3360 settings. */ -#define SPI_SCK_PIN GP22 -#define SPI_MOSI_PIN GP23 -#define POINTING_DEVICE_CS_PIN GP16 - /* Handedness. */ #define MASTER_RIGHT @@ -33,3 +30,21 @@ // 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/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json new file mode 100644 index 0000000000..928a850860 --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Charybdis (4x6) Splinky", + "usb": { + "device_version": "2.0.0" + } +} diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h index 7d4ed86e84..0fdd67c3a2 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h @@ -17,21 +17,7 @@ #pragma once -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP29, GP26, GP5, GP4, GP9 } +#include_next "mcuconf.h" -/* 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 +#undef RP_SPI_USE_SPI0 +#define RP_SPI_USE_SPI0 TRUE diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md new file mode 100644 index 0000000000..662eb5825c --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/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_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk new file mode 100644 index 0000000000..13c1b39961 --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk @@ -0,0 +1,36 @@ +# MCU name +MCU = RP2040 + +# Bootloader selection +BOOTLOADER = rp2040 + +# RP2040-specific options +ALLOW_WARNINGS = yes +PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +AUDIO_SUPPORTED = no # Audio is not supported +RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default +RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default +RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality +RGB_MATRIX_DRIVER = WS2812 + +SPLIT_KEYBOARD = yes + +POINTING_DEVICE_ENABLE = yes # Enable trackball +POINTING_DEVICE_DRIVER = pmw3360 + +SERIAL_DRIVER = vendor +WS2812_DRIVER = vendor |