From 36c410592dbd35da33ccc5fd6d2a5cbf4b25a708 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 23 Sep 2022 22:46:23 +1000 Subject: Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399) --- keyboards/bastardkb/charybdis/4x6/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index f557089073..4c0f508948 100644 --- a/keyboards/bastardkb/charybdis/4x6/config.h +++ b/keyboards/bastardkb/charybdis/4x6/config.h @@ -38,7 +38,7 @@ /* RGB matrix support. */ #ifdef RGB_MATRIX_ENABLE # define SPLIT_TRANSPORT_MIRROR -# define DRIVER_LED_TOTAL RGBLED_NUM +# define RGB_MATRIX_LED_COUNT RGBLED_NUM # define RGB_MATRIX_SPLIT RGBLED_SPLIT # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 # define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS -- cgit v1.2.3 From 5abb125b025750d7015d1a9cafc5a861cedfa9b3 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sun, 25 Sep 2022 13:04:00 -0700 Subject: [Keymap] develop updates for Drashna Keymaps (#18472) --- keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk index 336750bc90..d655fbd5dc 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk @@ -24,7 +24,7 @@ SERIAL_DRIVER = usart AUDIO_DRIVER = pwm_hardware BACKLIGHT_DRIVER = pwm -AUTOCORRECTION_ENABLE = yes +AUTOCORRECT_ENABLE = yes CAPS_WORD_ENABLE = yes SWAP_HANDS_ENABLE = yes TAP_DANCE_ENABLE = yes -- cgit v1.2.3 From c347e732be6b50500c1651b3fb8c0753b0c9c40d Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 20 Oct 2022 22:20:07 +1100 Subject: Remove legacy EEPROM clear keycodes (#18782) * `EEP_RST` -> `EE_CLR`, default-ish keymaps * `EEP_RST` -> `EE_CLR`, user keymaps * `EEP_RST` -> `EE_CLR`, community layouts * `EEP_RST` -> `EE_CLR`, userspace * `EEP_RST` -> `EE_CLR`, docs & core --- keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c | 4 ++-- keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c index e0cee41221..98edad47d9 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤ RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PEQL, // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤ - RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT, + RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ XXXXXXX, XXXXXXX, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_P0 @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤ KC_MPLY, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE, // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤ - KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, + KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ _______, _______, XXXXXXX, _______, XXXXXXX, _______, _______, XXXXXXX diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c index 8c55855af1..0ab7b78cc4 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c @@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤ XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX, // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤ - XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX, + XXXXXXX, _______, DRGSCRL, SNIPING, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, SNIPING, DRGSCRL, _______, XXXXXXX, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1, XXXXXXX, KC_BTN2, KC_BTN2 -- cgit v1.2.3 From 19145704e4a7a8a7609d697585a6423b67dc5371 Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Thu, 27 Oct 2022 19:26:16 +0200 Subject: [Core] Adjust PWM hardware audio driver for RP2040 (#17723) --- keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h | 1 - keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h | 1 - keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h | 3 --- 3 files changed, 5 deletions(-) (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h index 7e47953d63..e29ff644da 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h @@ -56,7 +56,6 @@ #define AUDIO_PWM_DRIVER PWMD4 #define AUDIO_PWM_CHANNEL 2 #define AUDIO_PWM_PAL_MODE 2 -#define AUDIO_STATE_TIMER GPTD3 #define AUDIO_INIT_DELAY #define AUDIO_ENABLE_TONE_MULTIPLEXING #define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10 diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h index 3d9f187317..8aad829e5c 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h @@ -17,7 +17,6 @@ #define HAL_USE_PWM TRUE #define HAL_USE_PAL TRUE -#define HAL_USE_GPT TRUE #define HAL_USE_SERIAL TRUE // #define HAL_USE_I2C TRUE #define HAL_USE_SPI TRUE diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h index 5712bb4574..4f04811e54 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h @@ -36,8 +36,5 @@ #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE -#undef STM32_GPT_USE_TIM3 -#define STM32_GPT_USE_TIM3 TRUE - #undef STM32_ST_USE_TIMER #define STM32_ST_USE_TIMER 5 -- cgit v1.2.3 From 7407347be1df69928d27ea9b6a4fe094429f2a55 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 28 Oct 2022 09:50:14 +1100 Subject: Remove rgblight_list.h (#18878) * Remove rgblight_list defines with no usage * Remove rgblight_setrgb_*[_at] defines * Remove rgblight_sethsv_* defines * Remove rgblight_sethsv_noeeprom_* defines * Delete rgblight_list.h and remove all references --- keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c index 0ab7b78cc4..92a861e91a 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c @@ -162,7 +162,7 @@ void shutdown_user(void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(1); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif // RGBLIGHT_ENABLE #ifdef RGB_MATRIX_ENABLE rgb_matrix_set_color_all(RGB_RED); -- cgit v1.2.3 From 5974d989fe72f6c576901a065bee4487a58c351d Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 1 Nov 2022 08:15:12 +1100 Subject: Normalise Unicode keycodes (#18898) * `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV` * `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*` * `UC_MAC` -> `UNICODE_MODE_MACOS` * `UC_LNX` -> `UNICODE_MODE_LINUX` * `UC_WIN` -> `UNICODE_MODE_WINDOWS` * `UC_BSD` -> `UNICODE_MODE_BSD` * `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE` * `UC_EMACS` -> `UNICODE_MODE_EMACS` * `UC__COUNT` -> `UNICODE_MODE_COUNT` * `UC_M_MA` -> `UC_MAC` * `UC_M_LN` -> `UC_LINX` * `UC_M_WI` -> `UC_WIN` * `UC_M_BS` -> `UC_BSD` * `UC_M_WC` -> `UC_WINC` * `UC_M_EM` -> `UC_EMAC` * Docs * Update quantum/unicode/unicode.h --- keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c index a0f290ad57..cc6dbc34e9 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_SUPER, KC_NOMODE,KC_BLOCKS,KC_REGIONAL,TG_GAME,TG_DBLO, QK_BOOT, VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EE_CLR, KEYLOCK, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, TG_MODS, - UC_MOD, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY, + UC_NEXT, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY, QK_RBT, AUTO_CTN, _______, _______, KC_NUKE, _______, _______, _______ ) -- cgit v1.2.3 From 30b2dbe369b3a61d1d6681b0a689dbcdd41fc221 Mon Sep 17 00:00:00 2001 From: Charly Delay <0xcharly@users.noreply.github.com> Date: Tue, 15 Nov 2022 17:51:44 +0900 Subject: Bastard Keyboards: upstream recent changes (#18903) * bastardkb: cleanup blackpill configuration Fixes #17 * bastardkb: fix splinky configuration The pinout of the splinky changed between the last beta batch, and the production one. This commit updates the keyboard definition to support the new pinout by default, while offering backward compatibility. Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production pinout. Fixes #15 * bastardkb: add support for STeMCell * Update scylla/tbkmini/skeletyl outdated readmes * bastardkb/dilemma: enable circular scroll * bastardkb/dilemma: add initial version of the `via` keymap * bastardkb/dilemma/assembled: add new keyboard Fixes #20 * bastardkb/dilemma: remove elite-c * Initial support for the Dilemma 3x5+3 Assembled RGB * Address code review comments * Address more comments * Address review comments * Address more nits * bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout --- .../bastardkb/charybdis/4x6/blackpill/config.h | 2 +- .../bastardkb/charybdis/4x6/blackpill/halconf.h | 4 +- .../bastardkb/charybdis/4x6/blackpill/mcuconf.h | 16 ------ .../bastardkb/charybdis/4x6/blackpill/rules.mk | 2 - .../bastardkb/charybdis/4x6/v1/elitec/config.h | 2 +- .../bastardkb/charybdis/4x6/v2/elitec/config.h | 2 +- .../bastardkb/charybdis/4x6/v2/splinky/config.h | 5 -- .../bastardkb/charybdis/4x6/v2/splinky/readme.md | 6 +++ .../bastardkb/charybdis/4x6/v2/splinky/v2/config.h | 27 ++++++++++ .../bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk | 2 + .../bastardkb/charybdis/4x6/v2/splinky/v3/config.h | 27 ++++++++++ .../bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk | 2 + .../bastardkb/charybdis/4x6/v2/stemcell/config.h | 63 ++++++++++++++++++++++ .../bastardkb/charybdis/4x6/v2/stemcell/halconf.h | 24 +++++++++ .../bastardkb/charybdis/4x6/v2/stemcell/info.json | 6 +++ .../bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h | 32 +++++++++++ .../bastardkb/charybdis/4x6/v2/stemcell/rules.mk | 37 +++++++++++++ 17 files changed, 230 insertions(+), 29 deletions(-) create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h index 2514a52fb0..e37df487fd 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h @@ -58,5 +58,5 @@ #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4 /* PMW3360 settings. */ -#define PMW33XX_CS_PIN B14 +#define POINTING_DEVICE_CS_PIN B14 #define PMW33XX_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h index a89dff0cd3..0e5caa9f9a 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h @@ -1,4 +1,4 @@ -/* +/** * Copyright 2020 Nick Brassel (tzarc) * Copyright 2021 Charly Delay (@0xcharly) * @@ -20,10 +20,8 @@ #define HAL_USE_PWM TRUE #define HAL_USE_SERIAL TRUE -//#define HAL_USE_I2C TRUE #define HAL_USE_SPI TRUE #define SPI_USE_WAIT TRUE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD -//#define HAL_USE_GPT TRUE #include_next "halconf.h" diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h index 1615d1bf46..3b9c9056f8 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h @@ -21,14 +21,6 @@ #include_next "mcuconf.h" -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE - -#undef STM32_I2C_I2C1_RX_DMA_STREAM -#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) -#undef STM32_I2C_I2C1_TX_DMA_STREAM -#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1) - #undef STM32_PWM_USE_TIM2 #define STM32_PWM_USE_TIM2 TRUE @@ -46,14 +38,6 @@ #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE -// #undef STM32_SERIAL_USE_USART2 -// #define STM32_SERIAL_USE_USART2 TRUE - -// #undef STM32_UART_USART2_RX_DMA_STREAM -// #define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5) -// #undef STM32_UART_USART2_TX_DMA_STREAM -// #define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) - #undef STM32_GPT_USE_TIM4 #define STM32_GPT_USE_TIM4 TRUE diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index 6123ec58b7..9015f3a8b2 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -24,8 +24,6 @@ RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by def RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 -# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the -# trackball side). SPLIT_KEYBOARD = yes POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h index 15044ef645..710c4c3587 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h @@ -39,4 +39,4 @@ #define RGB_DI_PIN D3 /* PMW3360 settings. */ -#define PMW33XX_CS_PIN B0 +#define POINTING_DEVICE_CS_PIN B0 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h index 891e511ccb..692a28b7be 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h @@ -33,4 +33,4 @@ #define RGB_DI_PIN D3 /* PMW3360 settings. */ -#define PMW33XX_CS_PIN F0 +#define POINTING_DEVICE_CS_PIN F0 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h index e17ec49726..010de7c480 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h @@ -20,8 +20,6 @@ /* 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 @@ -39,10 +37,7 @@ /* SPI & PMW3360 settings. */ #define SPI_DRIVER SPID0 -#define SPI_SCK_PIN GP18 -#define SPI_MOSI_PIN GP19 #define SPI_MISO_PIN GP20 -#define PMW33XX_CS_PIN GP14 /* Reset. */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md b/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md new file mode 100644 index 0000000000..22df77bbaa --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md @@ -0,0 +1,6 @@ +# 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/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h new file mode 100644 index 0000000000..7b7d94b320 --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Charly Delay (@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 . + */ + +#pragma once + +/* Key matrix configuration. */ +#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 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk new file mode 100644 index 0000000000..c9c50319db --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk @@ -0,0 +1,2 @@ +# Intentionally blank so that QMK detects this folder as a valid keyboard +# parameter. diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h new file mode 100644 index 0000000000..0e9f2257f0 --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Charly Delay (@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 . + */ + +#pragma once + +/* Key matrix configuration. */ +#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 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk new file mode 100644 index 0000000000..c9c50319db --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk @@ -0,0 +1,2 @@ +# Intentionally blank so that QMK detects this folder as a valid keyboard +# parameter. diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h new file mode 100644 index 0000000000..b1b432c330 --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h @@ -0,0 +1,63 @@ +/* + * Copyright 2022 Charly Delay (@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 . + */ + +#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 + +// 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 A0 PAL_LINE(GPIOA, 0) +// #define SPLIT_HAND_PIN A0 +// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. + +/* serial.c configuration (for split keyboard). */ +#define SOFT_SERIAL_PIN D2 + +/* RGB settings. */ +#define RGB_DI_PIN D3 +#define WS2812_PWM_DRIVER PWMD2 +#define WS2812_PWM_CHANNEL 4 +#define WS2812_PWM_PAL_MODE 1 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_DMA_CHANNEL 3 + +/* CRC. */ +#define CRC8_USE_TABLE +#define CRC8_OPTIMIZE_SPEED + +/* SPI config for pmw3360 sensor. */ +#define SPI_DRIVER SPID1 +#define SPI_SCK_PIN B1 +#define SPI_SCK_PAL_MODE 5 +#define SPI_MOSI_PIN B2 +#define SPI_MOSI_PAL_MODE 5 +#define SPI_MISO_PIN B3 +#define SPI_MISO_PAL_MODE 5 + +/* PMW3360 settings. */ +#define A1 PAL_LINE(GPIOA, 1) +#define POINTING_DEVICE_CS_PIN A1 +#define PMW3360_CS_MODE 3 +#define PMW3360_CS_DIVISOR 64 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h new file mode 100644 index 0000000000..0397de50b7 --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h @@ -0,0 +1,24 @@ +/* + * Copyright 2021 Charly Delay (@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 . + */ + +#pragma once + +#define HAL_USE_PWM TRUE +#define HAL_USE_SERIAL TRUE +#define HAL_USE_SPI TRUE + +#include_next diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json new file mode 100644 index 0000000000..7d687319b3 --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Charybdis (4x6) STeMCell", + "usb": { + "device_version": "2.0.0" + } +} diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h new file mode 100644 index 0000000000..17a46d8f95 --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h @@ -0,0 +1,32 @@ +/* + * Copyright 2021 Charly Delay (@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 . + */ + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI1 +#define STM32_SPI_USE_SPI1 TRUE + +#undef STM32_SERIAL_USE_USART1 +#define STM32_SERIAL_USE_USART1 FALSE + +#undef STM32_PWM_USE_TIM2 +#define STM32_PWM_USE_TIM2 TRUE + +#undef STM32_ST_USE_TIMER +#define STM32_ST_USE_TIMER 5 diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk new file mode 100644 index 0000000000..0847e9ce1f --- /dev/null +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -0,0 +1,37 @@ +# MCU name +MCU = STM32F411 + +# Bootloader selection +BOOTLOADER = stm32-dfu +CONVERT_TO = stemcell + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # 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 +MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint +KEYBOARD_SHARED_EP = yes + +SERIAL_DRIVER = usart +WS2812_DRIVER = pwm + +DEBOUNCE_TYPE = asym_eager_defer_pk -- cgit v1.2.3 From d6956668e33ef993d9114a31c0b6c79bebc9ad2c Mon Sep 17 00:00:00 2001 From: Charly Delay <0xcharly@users.noreply.github.com> Date: Wed, 16 Nov 2022 16:07:51 +0900 Subject: Specify `DEFAULT_FOLDER` for `v2/splinky` (#19093) --- keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk index 13c1b39961..34ef782d2f 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk @@ -34,3 +34,5 @@ POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor WS2812_DRIVER = vendor + +DEFAULT_FOLDER = bastardkb/charybdis/4x6/v2/splinky/v3 -- cgit v1.2.3 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 Co-authored-by: Charly Delay <0xcharly@users.noreply.github.com> Co-authored-by: Alex Baldwin --- .../bastardkb/charybdis/4x6/blackpill/info.json | 4 +-- keyboards/bastardkb/charybdis/4x6/config.h | 13 ++------ keyboards/bastardkb/charybdis/4x6/info.json | 4 +-- .../charybdis/4x6/keymaps/default/config.h | 39 ---------------------- .../bastardkb/charybdis/4x6/keymaps/via/config.h | 33 ------------------ .../bastardkb/charybdis/4x6/v1/elitec/info.json | 4 +-- .../bastardkb/charybdis/4x6/v2/elitec/info.json | 4 +-- .../bastardkb/charybdis/4x6/v2/splinky/config.h | 8 ----- .../bastardkb/charybdis/4x6/v2/splinky/info.json | 4 +-- .../bastardkb/charybdis/4x6/v2/splinky/v2/config.h | 8 +++++ .../bastardkb/charybdis/4x6/v2/splinky/v3/config.h | 8 +++++ .../bastardkb/charybdis/4x6/v2/stemcell/info.json | 2 +- 12 files changed, 30 insertions(+), 101 deletions(-) delete mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json index 788783c679..a42035157b 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "Charybdis (4x6) Blackpill", "usb": { - "device_version": "1.0.0", - }, + "device_version": "1.0.0" + } } diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index f557089073..aea184d57c 100644 --- a/keyboards/bastardkb/charybdis/4x6/config.h +++ b/keyboards/bastardkb/charybdis/4x6/config.h @@ -31,17 +31,10 @@ #define ROTATIONAL_TRANSFORM_ANGLE -25 /* RGB settings. */ -#define RGBLED_NUM 58 -#define RGBLED_SPLIT \ - { 29, 29 } - -/* RGB matrix support. */ #ifdef RGB_MATRIX_ENABLE -# define SPLIT_TRANSPORT_MIRROR +# define RGBLED_NUM 58 +# define RGBLED_SPLIT \ + { 29, 29 } # define DRIVER_LED_TOTAL RGBLED_NUM # define RGB_MATRIX_SPLIT RGBLED_SPLIT -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 -# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS -# define RGB_DISABLE_WHEN_USB_SUSPENDED -# define RGB_MATRIX_KEYPRESSES #endif diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json index c95bf07516..0b929a2188 100644 --- a/keyboards/bastardkb/charybdis/4x6/info.json +++ b/keyboards/bastardkb/charybdis/4x6/info.json @@ -1,9 +1,9 @@ { - "url": "https://bastardkb.com/charybdis", "manufacturer": "Bastard Keyboards", + "url": "https://bastardkb.com/charybdis", "usb": { - "vid": "0xA8F8", "pid": "0x1833", + "vid": "0xA8F8" }, "layouts": { "LAYOUT_charybdis_4x6": { diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h deleted file mode 100644 index 383b3f9dc3..0000000000 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright 2021 Charly Delay (@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 . - */ -#pragma once - -/* RGB Matrix. */ - -#ifdef RGB_MATRIX_ENABLE -// Limit maximum brightness to keep power consumption reasonable, and avoid -// disconnects. -# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64 - -// Rainbow swirl as startup mode. -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT - -// Slow swirl at startup. -# define RGB_MATRIX_STARTUP_SPD 32 - -// Startup values. -# define RGB_MATRIX_STARTUP_HUE 0 -# define RGB_MATRIX_STARTUP_SAT 255 -# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS -# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL -#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h index c31e39261e..cb9013dbd1 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h @@ -24,17 +24,6 @@ /* Disable unused features. */ #define NO_ACTION_ONESHOT -#ifndef TAPPING_TERM -/** - * \brief Configure the global tapping term (default: 200ms). - * - * If you have a lot of accidental mod activations, crank up the tapping term. - * - * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term - */ -# define TAPPING_TERM 200 -#endif // TAPPING_TERM - /* Charybdis-specific features. */ #ifdef POINTING_DEVICE_ENABLE @@ -43,25 +32,3 @@ // - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD` // #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE #endif // POINTING_DEVICE_ENABLE - -/* RGB Matrix. */ - -#ifdef RGB_MATRIX_ENABLE -// Limit maximum brightness to keep power consumption reasonable, and avoid -// disconnects. -# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64 - -// Rainbow swirl as startup mode. -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT - -// Slow swirl at startup. -# define RGB_MATRIX_STARTUP_SPD 32 - -// Startup values. -# define RGB_MATRIX_STARTUP_HUE 0 -# define RGB_MATRIX_STARTUP_SAT 255 -# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS -# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL -#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json index 4ea658a7d9..e3924b49b2 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "Charybdis (4x6) Elite-C", "usb": { - "device_version": "1.0.0", - }, + "device_version": "1.0.0" + } } 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 From e12ca14af8fc1799357bbfffd156d53b4a51001c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 27 Nov 2022 04:18:24 +1100 Subject: Change `RGB_MATRIX_STARTUP_*` defines to `RGB_MATRIX_DEFAULT_*` (#19079) --- keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c index 92a861e91a..1050974212 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c @@ -139,7 +139,7 @@ void matrix_scan_user(void) { auto_pointer_layer_timer = 0; layer_off(LAYER_POINTER); # ifdef RGB_MATRIX_ENABLE - rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE); + rgb_matrix_mode_noeeprom(RGB_MATRIX_DEFAULT_MODE); # endif // RGB_MATRIX_ENABLE } } -- cgit v1.2.3 From 4a87af0e9af046d5fc00d930476920c0c34a57a7 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 29 Nov 2022 11:43:42 -0800 Subject: [Keymap] Drashna updates for 0.19 (#19175) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix up bastardkb boards since blackpill support is officially added. * Check for blackpill version, not elite c. * Add checks in chibiOS config since multiple ARM controllers supported. * Rework rules.mk for keymaps to better handle arm vs avr support * Start moving away from `matrix_*_*` functions. * `housekeeping_task_*` instead of `matrix_scan_*` * `keyboard_(pre|post)_init_*` instead of `matrix_init_*` * Add ℂℴmⅈℂ unicode input method. * Clean up unicode code to be more compact and flexible. * Remove/move Pro Micro LED commands to userspace and better filter them * Fixup OLED code * Use newer quantum keycode functions/preprocessors rather than manual bit manipulation * Make unicode mode render much more compact/simple. * Make qmk secrets more self contained * Remove custom implementation of split watchdog --- .../charybdis/4x6/keymaps/drashna/config.h | 108 ++++++--------------- .../charybdis/4x6/keymaps/drashna/halconf.h | 26 ----- .../charybdis/4x6/keymaps/drashna/keymap.c | 26 +++-- .../charybdis/4x6/keymaps/drashna/mcuconf.h | 25 ++--- .../charybdis/4x6/keymaps/drashna/rules.mk | 90 ++++++++++------- 5 files changed, 107 insertions(+), 168 deletions(-) delete mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h index e29ff644da..cb11ea2748 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h @@ -16,99 +16,49 @@ */ #pragma once -#undef PRODUCT -#define PRODUCT "Charybdis (4x6) Blackpill" +#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill) +# undef MATRIX_COL_PINS +# define MATRIX_COL_PINS \ + { B0, B1, B12, B3, B4, B5 } -#undef MATRIX_COL_PINS -#define MATRIX_COL_PINS \ - { B0, B1, B12, B3, B4, B5 } -#undef MATRIX_COL_PINS_RIGHT -#define MATRIX_COL_PINS_RIGHT \ - { B0, B1, B12, B3, B4, B5 } +# define USB_VBUS_PIN B10 +# define DEBUG_LED_PIN C13 -#undef MATRIX_ROW_PINS -#define MATRIX_ROW_PINS \ - { B15, A2, B8, A8, B9 } -#undef MATRIX_ROW_PINS_RIGHT -#define MATRIX_ROW_PINS_RIGHT \ - { B15, A2, B8, A8, B9 } +# define AUDIO_PIN B7 +# define AUDIO_PWM_DRIVER PWMD4 +# define AUDIO_PWM_CHANNEL 2 +# define AUDIO_PWM_PAL_MODE 2 +# define AUDIO_INIT_DELAY +# define AUDIO_ENABLE_TONE_MULTIPLEXING +# define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10 +# define SERIAL_USART_SPEED (1 * 1024 * 1024) -#define DIODE_DIRECTION ROW2COL -#define SPLIT_HAND_PIN A3 -#undef MASTER_RIGHT -#define USB_VBUS_PIN B10 +# undef POINTING_DEVICE_CS_PIN +# define POINTING_DEVICE_CS_PIN A15 // b14 +# define PMW33XX_LIFTOFF_DISTANCE 0b1111 +#endif -#undef RGB_DI_PIN -#define RGB_DI_PIN A1 -#define WS2812_EXTERNAL_PULLUP -#define WS2812_PWM_DRIVER PWMD2 -#define WS2812_PWM_CHANNEL 2 -#define WS2812_PWM_PAL_MODE 1 -#define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 -#define WS2812_PWM_TARGET_PERIOD 800000 - -#define DEBUG_LED_PIN C13 - -#define AUDIO_PIN B7 -#define AUDIO_PWM_DRIVER PWMD4 -#define AUDIO_PWM_CHANNEL 2 -#define AUDIO_PWM_PAL_MODE 2 -#define AUDIO_INIT_DELAY -#define AUDIO_ENABLE_TONE_MULTIPLEXING -#define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10 - -#undef SOFT_SERIAL_PIN -// #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. -#define SERIAL_USART_TX_PIN A9 -// #define SERIAL_USART_RX_PIN A3 -// #define SERIAL_USART_DRIVER SD2 -// #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 -// #define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 -// #define SERIAL_USART_TIMEOUT 100 // USART driver timeout. default 100 -// #define SERIAL_USART_SPEED 921600 -#define SERIAL_USART_SPEED (1.5 * 1024 * 1024) - -#define CRC8_USE_TABLE -#define CRC8_OPTIMIZE_SPEED - -/* spi config for eeprom and pmw3360 sensor */ -#define SPI_DRIVER SPID1 -#define SPI_SCK_PIN A5 -#define SPI_SCK_PAL_MODE 5 -#define SPI_MOSI_PIN A7 -#define SPI_MOSI_PAL_MODE 5 -#define SPI_MISO_PIN A6 -#define SPI_MISO_PAL_MODE 5 - -#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4 -#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64 - -#undef PMW33XX_CS_PIN -#define PMW33XX_CS_PIN A15 // b14 -#define PMW33XX_LIFTOFF_DISTANCE 0b1111 #undef ROTATIONAL_TRANSFORM_ANGLE -#define ROTATIONAL_TRANSFORM_ANGLE -65 - -#define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200 -#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400 -#define CHARYBDIS_MINIMUM_SNIPING_DPI 200 -#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100 +#define ROTATIONAL_TRANSFORM_ANGLE 25 +#define POINTING_DEVICE_ROTATION_270 /* RGB Matrix. */ - #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 +#define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200 +#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400 +#define CHARYBDIS_MINIMUM_SNIPING_DPI 200 +#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100 + #define CHARYBDIS_CONFIG_SYNC -#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 0 -#define BOOTMAGIC_LITE_ROW_RIGHT 5 +#define BOOTMAGIC_LITE_ROW_RIGHT 5 #define BOOTMAGIC_LITE_COLUMN_RIGHT 0 -#define BOOTMAGIC_LITE_EEPROM_ROW 1 +#define BOOTMAGIC_LITE_EEPROM_ROW 1 #define BOOTMAGIC_LITE_EEPROM_COLUMN 0 -#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 1 +#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 1 #define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 0 diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h deleted file mode 100644 index 8aad829e5c..0000000000 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2020 Nick Brassel (tzarc) - * - * 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 3 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 . - */ -#pragma once - -#define HAL_USE_PWM TRUE -#define HAL_USE_PAL TRUE -#define HAL_USE_SERIAL TRUE -// #define HAL_USE_I2C TRUE -#define HAL_USE_SPI TRUE -#define SPI_USE_WAIT TRUE -#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD - -#include_next diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c index cc6dbc34e9..50a05e1b35 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c @@ -83,12 +83,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { SFT_T(KC_SPACE), ALT_T(KC_Q), _______ ), [_MOUSE] = LAYOUT_charybdis_4x6( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______, + _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, DRGSCRL, _______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING, - _______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, DRGSCRL, _______, - _______, SNIPING, SNIPING, _______, _______, - _______, _______, _______ + _______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______ ), [_LOWER] = LAYOUT_charybdis_4x6_wrapper( @@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_charybdis_4x6_wrapper( - QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_SUPER, KC_NOMODE,KC_BLOCKS,KC_REGIONAL,TG_GAME,TG_DBLO, QK_BOOT, + QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_SUPER, KC_NOMODE,KC_COMIC,KC_REGIONAL,TG_GAME,TG_DBLO, QK_BOOT, VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EE_CLR, KEYLOCK, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, TG_MODS, UC_NEXT, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY, @@ -121,8 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on -void matrix_init_keymap(void) { - setPinInputHigh(A0); +void keyboard_post_init_keymap(void) { #ifdef RGB_MATRIX_ENABLE g_led_config.flags[53] = g_led_config.flags[54] = g_led_config.flags[55] = g_led_config.flags[0] = g_led_config.flags[1] = g_led_config.flags[2] = g_led_config.flags[3] = @@ -131,11 +130,17 @@ void matrix_init_keymap(void) { #endif } -void matrix_scan_keymap(void) { +#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill) +void keyboard_pre_init_keymap(void) { + setPinInputHigh(A0); +} + +void housekeeping_task_keymap(void) { if (!readPin(A0)) { reset_keyboard(); } } +#endif #ifdef USB_VBUS_PIN bool usb_vbus_state(void) { @@ -145,12 +150,13 @@ bool usb_vbus_state(void) { } #endif +#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill) void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { for (int32_t i = 0; i < 40; i++) { __asm__ volatile("nop" ::: "memory"); } } - +#endif #ifdef SWAP_HANDS_ENABLE const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h index 4f04811e54..3a23d5f370 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h @@ -18,23 +18,10 @@ #include_next "mcuconf.h" -#undef STM32_PWM_USE_ADVANCED -#define STM32_PWM_USE_ADVANCED TRUE +#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill) +# undef STM32_PWM_USE_ADVANCED +# define STM32_PWM_USE_ADVANCED TRUE -#undef STM32_PWM_USE_TIM1 -#define STM32_PWM_USE_TIM1 TRUE - -#undef STM32_PWM_USE_TIM2 -#define STM32_PWM_USE_TIM2 TRUE - -#undef STM32_PWM_USE_TIM4 -#define STM32_PWM_USE_TIM4 TRUE - -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE - -#undef STM32_SERIAL_USE_USART1 -#define STM32_SERIAL_USE_USART1 TRUE - -#undef STM32_ST_USE_TIMER -#define STM32_ST_USE_TIMER 5 +# undef STM32_PWM_USE_TIM4 +# define STM32_PWM_USE_TIM4 TRUE +#endif diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk index d655fbd5dc..12e9cecda0 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk @@ -1,34 +1,56 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER := tinyuf2 - -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -AUDIO_SUPPORTED = yes # is set to no in kb, needs to be forcibly enabled - -KEYBOARD_SHARED_EP = yes -MOUSE_SHARED_EP = yes - -EEPROM_DRIVER = spi -WS2812_DRIVER = pwm -SERIAL_DRIVER = usart -AUDIO_DRIVER = pwm_hardware -BACKLIGHT_DRIVER = pwm - -AUTOCORRECT_ENABLE = yes -CAPS_WORD_ENABLE = yes -SWAP_HANDS_ENABLE = yes -TAP_DANCE_ENABLE = yes -DEBOUNCE_TYPE = asym_eager_defer_pk -WPM_ENABLE = yes -LTO_ENABLE = no -# OPT = 3 +CUSTOM_UNICODE_ENABLE = no +CUSTOM_POINTING_DEVICE = no +CUSTOM_SPLIT_TRANSPORT_SYNC = no + +ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill) + # MCU name + # Bootloader selection + BOOTLOADER := tinyuf2 + + AUDIO_ENABLE = yes # Audio output + AUDIO_SUPPORTED = yes # is set to no in kb, needs to be forcibly enabled + AUDIO_DRIVER = pwm_hardware + + BACKLIGHT_DRIVER = pwm + + OVERLOAD_FEATURES = yes +endif + +ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/stemcell) + OVERLOAD_FEATURES = yes +endif +ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/splinky) + OVERLOAD_FEATURES = yes +endif +ifeq ($(strip $(MCU)), atmega32u4) + LTO_ENABLE = yes + BOOTLOADER = qmk-hid + BOOTLOADER_SIZE = 512 +endif + +ifeq ($(strip $(OVERLOAD_FEATURES)), yes) + BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite + MOUSEKEY_ENABLE = yes # Mouse keys + EXTRAKEY_ENABLE = yes # Audio control and System control + CONSOLE_ENABLE = yes # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + NKRO_ENABLE = yes # Enable N-Key Rollover + RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow + + KEYBOARD_SHARED_EP = yes + MOUSE_SHARED_EP = yes + + AUTOCORRECT_ENABLE = yes + CAPS_WORD_ENABLE = yes + SWAP_HANDS_ENABLE = yes + TAP_DANCE_ENABLE = yes + DEBOUNCE_TYPE = asym_eager_defer_pk + WPM_ENABLE = yes + LTO_ENABLE = no + # OPT = 3 + + CUSTOM_UNICODE_ENABLE = yes + CUSTOM_POINTING_DEVICE = yes + CUSTOM_SPLIT_TRANSPORT_SYNC = yes + +endif -- cgit v1.2.3 From af14b212b962ec455ec80f7527a919ae245bc2d9 Mon Sep 17 00:00:00 2001 From: Charly Delay <0xcharly@users.noreply.github.com> Date: Mon, 5 Dec 2022 05:58:12 +0900 Subject: Re-structure splinky support to handle versioning in the same fashion as for the teensy (#19123) --- .../bastardkb/charybdis/4x6/v2/splinky/config.h | 37 ---------------- .../bastardkb/charybdis/4x6/v2/splinky/info.json | 6 --- .../bastardkb/charybdis/4x6/v2/splinky/mcuconf.h | 23 ---------- .../bastardkb/charybdis/4x6/v2/splinky/readme.md | 6 --- .../bastardkb/charybdis/4x6/v2/splinky/rules.mk | 38 ---------------- .../bastardkb/charybdis/4x6/v2/splinky/v2/config.h | 35 --------------- .../bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk | 2 - .../bastardkb/charybdis/4x6/v2/splinky/v3/config.h | 35 --------------- .../bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk | 2 - .../bastardkb/charybdis/4x6/v2/splinky_2/config.h | 50 ++++++++++++++++++++++ .../bastardkb/charybdis/4x6/v2/splinky_2/info.json | 6 +++ .../bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h | 23 ++++++++++ .../bastardkb/charybdis/4x6/v2/splinky_2/readme.md | 5 +++ .../bastardkb/charybdis/4x6/v2/splinky_2/rules.mk | 36 ++++++++++++++++ .../bastardkb/charybdis/4x6/v2/splinky_3/config.h | 50 ++++++++++++++++++++++ .../bastardkb/charybdis/4x6/v2/splinky_3/info.json | 6 +++ .../bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h | 23 ++++++++++ .../bastardkb/charybdis/4x6/v2/splinky_3/readme.md | 5 +++ .../bastardkb/charybdis/4x6/v2/splinky_3/rules.mk | 36 ++++++++++++++++ 19 files changed, 240 insertions(+), 184 deletions(-) delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/rules.mk delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h delete mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_2/readme.md create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_3/readme.md create mode 100644 keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk (limited to 'keyboards/bastardkb/charybdis/4x6') diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h deleted file mode 100644 index 7d4ed86e84..0000000000 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2022 Charly Delay (@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 . - */ - -#pragma once - -/* Key matrix configuration. */ -#define MATRIX_ROW_PINS \ - { GP29, 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/4x6/v2/splinky/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json deleted file mode 100644 index 928a850860..0000000000 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/info.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "keyboard_name": "Charybdis (4x6) Splinky", - "usb": { - "device_version": "2.0.0" - } -} diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h deleted file mode 100644 index 0fdd67c3a2..0000000000 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky/mcuconf.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2022 Charly Delay (@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 . - */ - -#pragma once - -#include_next "mcuconf.h" - -#undef RP_S