[Keymap] Drashna Mouse keys and oled updates (#16556)

19 files changed, 438 insertions, 61 deletions

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
index aba169dbb5..1af9868855 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
@@ -58,9 +58,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MOUSE] = LAYOUT_charybdis_3x5(
-        _______, _______, _______, S_D_MOD, DPI_MOD,    KC_WH_U, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,    KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD,
         _______, _______, _______, _______, _______,    KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6,
-        _______, _______, _______, S_D_RMOD,DPI_RMOD,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
+        _______, _______, _______, _______, _______,    KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
                           _______, SNIPING, _______,    _______, _______
     ),
     [_LOWER] = LAYOUT_charybdis_3x5_wrapper(
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
index d868eae48e..05b5776ac3 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
@@ -21,8 +21,8 @@
 #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_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)
 
@@ -35,19 +35,9 @@
 #undef STM32_SPI_USE_SPI1
 #define STM32_SPI_USE_SPI1           TRUE
 
-#undef STM32_SPI_SPI1_RX_DMA_STREAM
-#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-#undef STM32_SPI_SPI1_TX_DMA_STREAM
-#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
 #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/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
index d23bf99aac..0cff2a7a2e 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
@@ -2,7 +2,10 @@
 MCU = STM32F411
 
 # Bootloader selection
-BOOTLOADER = stm32-dfu
+# BOOTLOADER = stm32-dfu
+BOOTLOADER := tinyuf2
+
+LTO_ENABLE := no
 
 BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
 KEYBOARD_SHARED_EP = yes
@@ -20,3 +23,5 @@ NKRO_ENABLE = yes
 CONSOLE_ENABLE = yes
 
 AUTOCORRECTION_ENABLE = yes
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/chconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/chconf.h
new file mode 100644
index 0000000000..8b55eaeef0
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/chconf.h
@@ -0,0 +1,38 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next <chconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
new file mode 100644
index 0000000000..f384318dc4
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2021 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
+
+#undef MATRIX_COL_PINS
+#define MATRIX_COL_PINS \
+    { B0, B1, B10, B3, B4, B5 }
+#undef MATRIX_COL_PINS_RIGHT
+#define MATRIX_COL_PINS_RIGHT \
+    { B0, B1, B10, B3, B4, B5 }
+
+#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 DIODE_DIRECTION ROW2COL
+#define SPLIT_HAND_PIN A3
+
+#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
+
+#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_PIN_SWAP // swap RX and TX pins on master
+// // To use the highest possible baudrate (3.75Mbit/s) uncomment the following
+// // line, this can result in dropped communications so lower the speed if there
+// // are many timeouts.
+// // #define SERIAL_USART_SPEED (STM32_PCLK2 >> 4)
+
+#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 PMW3360_CS_PIN
+#define PMW3360_CS_PIN                       B14
+#define PMW3360_CS_MODE 3
+#define PMW3360_CS_DIVISOR 64
+
+#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
+
+/* RGB Matrix. */
+
+#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
new file mode 100644
index 0000000000..97a288d7bd
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
@@ -0,0 +1,26 @@
+/* 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#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/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
new file mode 100644
index 0000000000..e26ffc14aa
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
@@ -0,0 +1,132 @@
+/**
+ * Copyright 2021 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/>.
+ */
+#include "drashna.h"
+
+#define LAYOUT_charybdis_4x6_wrapper(...) LAYOUT_charybdis_4x6(__VA_ARGS__)
+#define LAYOUT_charybdis_4x6_base( \
+    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
+  ) \
+  LAYOUT_charybdis_4x6_wrapper( \
+     KC_ESC,  ________________NUMBER_LEFT________________,            ________________NUMBER_RIGHT_______________, UC_CLUE, \
+     SH_TT,   K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A,     SH_TT, \
+     LALT_T(KC_TAB), K11, K12,  K13,     K14,     K15,                K16,     K17,     K18,     K19,     K1A,     RALT_T(K1B), \
+     OS_LSFT, CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT, \
+                                   KC_GRV, OS_LALT, OS_LGUI,    TT(_MOUSE),  KC_ENT, \
+                                           KC_SPC, BK_LWER,     DL_RAIS \
+    )
+
+#define LAYOUT_base_wrapper(...)       LAYOUT_charybdis_4x6_base(__VA_ARGS__)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
+        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+    ),
+
+    [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
+        ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
+        ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
+        ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
+    ),
+    [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
+        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
+        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
+        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
+    ),
+
+    [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
+        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
+        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
+        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
+    ),
+
+
+
+    [_MOUSE] = LAYOUT_charybdis_4x6(
+        _______, _______, _______, _______, _______, _______,   DRGSCRL, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, SNP_TOG,
+        _______, _______, _______, _______, _______, _______,   KC_WH_U, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,   KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
+        _______, _______, _______, _______, _______, _______,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+    ),
+    [_GAMEPAD] = LAYOUT_charybdis_4x6(
+        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,       _______, _______, _______, _______, _______, _______,
+        KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,       _______, _______, _______, _______, _______, _______,
+        KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,       _______, _______, _______, _______, _______, _______,
+        KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_H,       _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+    ),
+    [_DIABLO] = LAYOUT_charybdis_4x6(
+        KC_ESC,  KC_V,    KC_D,    KC_LALT, KC_NO,   KC_NO,      KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
+        KC_TAB,  KC_S,    KC_I,    KC_F,    KC_M,    KC_T,       _______, _______, _______, _______, _______, _______,
+        KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_G,       _______, _______, _______, _______, _______, _______,
+        KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,       _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+    ),
+    [_DIABLOII] = LAYOUT_charybdis_4x6(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_GRV,     _______, _______, _______, _______, _______, _______,
+        KC_TAB,  KC_A,    KC_T,    KC_Q,    KC_I,    KC_M,       _______, _______, _______, _______, _______, _______,
+        KC_S,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      _______, _______, _______, _______, _______, _______,
+        KC_LCTL, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,     _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+    ),
+
+    [_LOWER] = LAYOUT_charybdis_4x6_wrapper(
+        KC_F12,  _________________FUNC_LEFT_________________,    _________________FUNC_RIGHT________________, KC_F11,
+        _______, _________________LOWER_L1__________________,    _________________LOWER_R1__________________, _______,
+        _______, _________________LOWER_L2__________________,    _________________LOWER_R2__________________, KC_PIPE,
+        _______, _________________LOWER_L3__________________,    _________________LOWER_R3__________________, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+  ),
+
+    [_RAISE] = LAYOUT_charybdis_4x6_wrapper(
+        KC_F12,  _________________FUNC_LEFT_________________,    _________________FUNC_RIGHT________________, KC_F11,
+        KC_GRV,  _________________RAISE_L1__________________,    _________________RAISE_R1__________________, _______,
+        _______, _________________RAISE_L2__________________,    _________________RAISE_R2__________________, KC_BSLS,
+        _______, _________________RAISE_L3__________________,    _________________RAISE_R3__________________, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+  )
+
+};
+// clang-format on
+
+
+void matrix_init_keyemap(void) { setPinInputHigh(A0); }
+
+void matrix_scan_keymap(void) {
+    if (!readPin(A0)) {
+        reset_keyboard();
+    }
+}
+
+#ifdef USB_VBUS_PIN
+bool usb_vbus_state(void) {
+    setPinInputLow(USB_VBUS_PIN);
+    wait_us(5);
+    return readPin(USB_VBUS_PIN);
+}
+#endif
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
new file mode 100644
index 0000000000..0f60612d79
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
@@ -0,0 +1,44 @@
+/* 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 <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#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
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 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_GPT_USE_TIM4
+#define STM32_GPT_USE_TIM4 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
new file mode 100644
index 0000000000..ab86b1b8ba
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+# BOOTLOADER := tinyuf2
+
+LTO_ENABLE := no
+
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+KEYBOARD_SHARED_EP = yes
+MOUSE_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+
+MOUSEKEY_ENABLE = yes
+NKRO_ENABLE = yes
+CONSOLE_ENABLE = yes
+
+AUTOCORRECTION_ENABLE = yes
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
index d868eae48e..05b5776ac3 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
@@ -21,8 +21,8 @@
 #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_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)
 
@@ -35,19 +35,9 @@
 #undef STM32_SPI_USE_SPI1
 #define STM32_SPI_USE_SPI1           TRUE
 
-#undef STM32_SPI_SPI1_RX_DMA_STREAM
-#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-#undef STM32_SPI_SPI1_TX_DMA_STREAM
-#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
 #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/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index 51eb009aa5..81a308fd21 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Tractyl Manuform 5x6",
     "url": "",
-    "maintainer": "drashna",
     "layouts": {
         "LAYOUT_5x6_right": {
             "layout": [
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index c3a30d2bc8..2a7a18f01b 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -22,3 +22,8 @@
 #ifdef OLED_DRIVER_SH1107
 #    undef OLED_DISPLAY_128X64
 #endif
+
+#        define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
+#        define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
+#        define CHARYBDIS_MINIMUM_SNIPING_DPI 400
+#        define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 200
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index 570760cf66..82fd4cbea3 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -60,13 +60,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MOUSE] = LAYOUT_5x6_right(
-        _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                        KC_WH_U, DPI_MOD, DPI_RMOD,S_D_MOD, S_D_RMOD,DRGSCRL,
+        _______, _______, _______, _______, _______, _______,                        DRGSCRL, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, SNP_TOG,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_U, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
         _______, _______, _______, _______, _______, _______,                        KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
                           _______, _______,                                                            _______, _______,
                                             _______, _______,                                 KC_BTN3,
-                                                     _______, KC_ACCEL,              _______,
+                                                     _______, _______,               _______,
                                                      _______, _______,      _______, _______
     ),
     [_GAMEPAD] = LAYOUT_5x6_right(
@@ -104,30 +104,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _________________LOWER_L1__________________,                        _________________LOWER_R1__________________, _______,
         _______, _________________LOWER_L2__________________,                        _________________LOWER_R2__________________, KC_PIPE,
         _______, _________________LOWER_L3__________________,                        _________________LOWER_R3__________________, _______,
-                          _______, _______,                                                          _______, _______,
-                                            _______, _______,                               _______,
-                                                     _______, _______,             _______,
-                                                     _______, _______,    _______, _______
+                          _______, _______,                                                            _______, _______,
+                                            _______, _______,                                 _______,
+                                                     _______, _______,               _______,
+                                                     _______, _______,      _______, _______
     ),
     [_RAISE] = LAYOUT_5x6_right_wrapper(
-        KC_F12,  _________________FUNC_LEFT_________________,                      _________________FUNC_RIGHT________________, KC_F11,
-        KC_GRV,  _________________RAISE_L1__________________,                      _________________RAISE_R1__________________, _______,
-        _______, _________________RAISE_L2__________________,                      _________________RAISE_R2__________________, KC_BSLS,
-        _______, _________________RAISE_L3__________________,                      _________________RAISE_R3__________________, _______,
-                          _______, _______,                                                          _______, _______,
-                                            _______, _______,                               _______,
-                                                     _______, _______,             _______,
-                                                     _______, _______,    _______, _______
+        KC_F12,  _________________FUNC_LEFT_________________,                        _________________FUNC_RIGHT________________, KC_F11,
+        KC_GRV,  _________________RAISE_L1__________________,                        _________________RAISE_R1__________________, _______,
+        _______, _________________RAISE_L2__________________,                        _________________RAISE_R2__________________, KC_BSLS,
+        _______, _________________RAISE_L3__________________,                        _________________RAISE_R3__________________, _______,
+                          _______, _______,                                                            _______, _______,
+                                            _______, _______,                                 _______,
+                                                     _______, _______,               _______,
+                                                     _______, _______,      _______, _______
     ),
     [_ADJUST] = LAYOUT_5x6_right_wrapper(
-        KC_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE,               KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, KC_RST,
-        VRSN,    _________________ADJUST_L1_________________,                      _________________ADJUST_R1_________________, EEP_RST,
-        KEYLOCK, _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, TG_MODS,
-        UC_MOD,  _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, KC_MPLY,
-                   TG(_DIABLOII), AUTO_CTN,                                                          TG_GAME, TG_DBLO,
-                                            _______, REBOOT,                                KC_NUKE,
-                                                     _______, _______,             _______,
-                                                     _______, _______,    KC_NUKE, _______
+        KC_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE,                 KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, KC_RST,
+        VRSN,    _________________ADJUST_L1_________________,                        _________________ADJUST_R1_________________, EEP_RST,
+        KEYLOCK, _________________ADJUST_L2_________________,                        _________________ADJUST_R2_________________, TG_MODS,
+        UC_MOD,  _________________ADJUST_L3_________________,                        _________________ADJUST_R3_________________, KC_MPLY,
+                   TG(_DIABLOII), AUTO_CTN,                                                            TG_GAME, TG_DBLO,
+                                            _______, REBOOT,                                  KC_NUKE,
+                                                     _______, _______,               _______,
+                                                     _______, _______,      KC_NUKE, _______
     ),
 };
 
@@ -149,6 +149,16 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 };
 // clang-format on
 #else
+
+deferred_token encoder_token  = INVALID_DEFERRED_TOKEN;
+static int8_t  last_direction = -1;
+
+static uint32_t encoder_callback(uint32_t trigger_time, void *cb_arg) {
+    unregister_code(last_direction ? KC_WH_D : KC_WH_U);
+    last_direction = -1;
+    return 0;
+}
+
 bool encoder_update_user(uint8_t index, bool clockwise) {
 #    ifdef SWAP_HANDS_ENABLE
     if (swap_hands) {
@@ -158,7 +168,20 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
         tap_code_delay(clockwise ? KC_VOLD : KC_VOLU, 5);
     } else if (index == 1) {
-        tap_code_delay(clockwise ? KC_WH_D : KC_WH_U, 5);
+        if (last_direction != clockwise || encoder_token == INVALID_DEFERRED_TOKEN) {
+            uint8_t keycode = clockwise ? KC_WH_D : KC_WH_U;
+            last_direction  = clockwise;
+            if (encoder_token != INVALID_DEFERRED_TOKEN) {
+                if (cancel_deferred_exec(encoder_token)) {
+                    encoder_token = INVALID_DEFERRED_TOKEN;
+                }
+                unregister_code(clockwise ? KC_WH_U : KC_WH_D);
+            }
+            register_code(keycode);
+            encoder_token = defer_exec(MOUSEKEY_WHEEL_DELAY + MOUSEKEY_WHEEL_INTERVAL, encoder_callback, NULL);
+        } else {
+            extend_deferred_exec(encoder_token, MOUSEKEY_WHEEL_INTERVAL);
+        }
     }
     return false;
 }
@@ -167,7 +190,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 #ifdef OLED_ENABLE
 extern uint16_t typing_mode;
 
-oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+oled_rotation_t oled_init_keymap(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
 
 void oled_render_large_display(void) {
     if (is_keyboard_left()) {
@@ -176,13 +201,16 @@ void oled_render_large_display(void) {
         oled_advance_page(true);
         oled_advance_page(true);
 
+        // clang-format off
         static const char PROGMEM logo[] = {
             0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
             0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
             0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
         };
+        // clang-format on
         oled_write_P(logo, false);
 
+#    ifdef CUSTOM_UNICODE_ENABLE
         oled_set_cursor(1, 14);
         oled_write_ln_P(PSTR("Unicode:"), false);
         switch (typing_mode) {
@@ -204,10 +232,14 @@ void oled_render_large_display(void) {
             case KC_ZALGO:
                 oled_write_P(PSTR("       Zalgo"), false);
                 break;
-            default:
+            case KC_NOMODE:
                 oled_write_P(PSTR("      Normal"), false);
                 break;
+            default:
+                oled_write_P(PSTR("     Unknown"), false);
+                break;
         }
+#    endif
     }
 }
 #endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index 9ef58ab5ec..4cad07ef66 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -10,6 +10,7 @@ ENCODER_ENABLE                   = yes
 ENCODER_MAP_ENABLE               = yes
 AUTOCORRECTION_ENABLE            = yes
 CAPS_WORD_ENABLE                 = yes
+DEFERRED_EXEC_ENABLE             = yes
 
 ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
     RGBLIGHT_ENABLE              = no
diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h
index f9160ea148..821f9be9b6 100644
--- a/keyboards/handwired/tractyl_manuform/config.h
+++ b/keyboards/handwired/tractyl_manuform/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID               0x44DD
-#define MANUFACTURER            Drashna
 
 /* disable debug print */
 // #define NO_DEBUG
diff --git a/keyboards/handwired/tractyl_manuform/info.json b/keyboards/handwired/tractyl_manuform/info.json
new file mode 100644
index 0000000000..7214e6773b
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/info.json
@@ -0,0 +1,4 @@
+{
+    "manufacturer": "QMK Community",
+    "maintainer": "Drashna Jael're"
+}
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
index 033146134d..0ae49b6397 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
@@ -247,7 +247,7 @@ static bool has_shift_mod(void) {
  *   - default DPI: internal table index/actual DPI
  *   - sniping DPI: internal table index/actual DPI
  */
-static void debug_charybdis_config_to_console(charybdis_config_t* config) {
+__attribute__((unused)) static void debug_charybdis_config_to_console(charybdis_config_t* config) {
 #    ifdef CONSOLE_ENABLE
     dprintf("(charybdis) process_record_kb: config = {\n"
             "\traw = 0x%04X,\n"
@@ -264,7 +264,6 @@ static void debug_charybdis_config_to_console(charybdis_config_t* config) {
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     if (!process_record_user(keycode, record)) {
-        debug_charybdis_config_to_console(&g_charybdis_config);
         return false;
     }
 #    ifndef NO_CHARYBDIS_KEYCODES
@@ -321,7 +320,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
         pointing_device_send();
     }
 #    endif  // !MOUSEKEY_ENABLE
-    debug_charybdis_config_to_console(&g_charybdis_config);
     return true;
 }
 
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
index 197aee985e..b62b6f7553 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
@@ -24,8 +24,6 @@
 #    include "4x6_right.h"
 #endif
 
-#ifdef POINTING_DEVICE_ENABLE
-#    ifndef NO_CHARYBDIS_KEYCODES
 enum charybdis_keycodes {
 #        ifdef VIA_ENABLE
     POINTER_DEFAULT_DPI_FORWARD = USER00,
@@ -50,8 +48,8 @@ enum charybdis_keycodes {
 #        define SNP_TOG SNIPING_MODE_TOGGLE
 #        define DRGSCRL DRAGSCROLL_MODE
 #        define DRG_TOG DRAGSCROLL_MODE_TOGGLE
-#    endif  // !NO_CHARYBDIS_KEYCODES
 
+#ifdef POINTING_DEVICE_ENABLE
 /** \brief Return the current DPI value for the pointer's default mode. */
 uint16_t charybdis_get_pointer_default_dpi(void);
 
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
index ddba0780a2..3ddcddbee3 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
@@ -20,6 +20,7 @@ ifeq ($(strip $(KEYBOARD)), splitkb/kyria/rev1/proton_c)
     CTPC                   = yes
     AUTOCORRECTION_ENABLE  = yes
     CAPS_WORD_ENABLE       = yes
+    OLED_DRIVER            = custom
     DEBUG_MATRIX_SCAN_RATE_ENABLE = api
 else
     LTO_ENABLE             = yes