[Keymap] Drashna update for post Q2 merge (#17241)

6 files changed, 41 insertions, 27 deletions

diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
index 290ea22c5f..dde663b6ac 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
@@ -105,8 +105,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      _______, _______,    _______, _______
     ),
     [_ADJUST] = LAYOUT_4x6_right_wrapper(
-        KC_MAKE, _________________ADJUST_L1_________________,                      _________________ADJUST_R1_________________, KC_RST,
-        VRSN,    _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, EEP_RST,
+        QK_MAKE, _________________ADJUST_L1_________________,                      _________________ADJUST_R1_________________, QK_BOOT,
+        VRSN,    _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, EE_CLR,
         UC_MOD,  _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, TG_MODS,
                           HPT_DWLI, HPT_DWLD,                                                        TG_GAME, TG_DBLO,
                                             HPT_TOG, HPT_BUZ,                               KC_NUKE,
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 6f19332a62..5f0350810c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 CRC8_USE_TABLE
 #define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index 5cd269e311..990b835843 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
@@ -58,3 +58,9 @@ bool usb_vbus_state(void) {
     return readPin(USB_VBUS_PIN);
 }
 #endif
+
+void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
+    for (int32_t i = 0; i < 40; i++) {
+        __asm__ volatile("nop" ::: "memory");
+    }
+}
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 2a7a18f01b..31539062b3 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -17,13 +17,19 @@
 #pragma once
 
 #define DEBOUNCE 45
-#define ENCODER_DEFAULT_POS 0x3
 
 #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
+#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
+
+#define ENCODER_DEFAULT_POS 0x3
+
+#define SECURE_UNLOCK_SEQUENCE \
+    {                          \
+        { 2, 1 }, { 2, 2 }, { 2, 3 }, { 2, 4 } \
+    }
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 82fd4cbea3..223649e8bf 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -120,25 +120,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      _______, _______,      _______, _______
     ),
     [_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,
+        QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE,                 KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, QK_BOOT,
+        VRSN,    _________________ADJUST_L1_________________,                        _________________ADJUST_R1_________________, EE_CLR,
         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,
+                                            _______, QK_RBT,                                  KC_NUKE,
                                                      _______, _______,               _______,
                                                      _______, _______,      KC_NUKE, _______
     ),
 };
 
-#define BASE_ENCODERS { { KC_VOLD, KC_VOLU }, { KC_WH_D, KC_WH_U } }
 
 #ifdef ENCODER_MAP_ENABLE
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_DEFAULT_LAYER_1] = BASE_ENCODERS,
-    [_DEFAULT_LAYER_2] = BASE_ENCODERS,
-    [_DEFAULT_LAYER_3] = BASE_ENCODERS,
-    [_DEFAULT_LAYER_4] = BASE_ENCODERS,
+    [_DEFAULT_LAYER_1] = { { KC_VOLD, KC_VOLU }, { KC_WH_D, KC_WH_U } },
+    [_DEFAULT_LAYER_2] = { { _______, _______ }, { _______, _______ } },
+    [_DEFAULT_LAYER_3] = { { _______, _______ }, { _______, _______ } },
+    [_DEFAULT_LAYER_4] = { { _______, _______ }, { _______, _______ } },
     [_GAMEPAD]         = { { _______, _______ }, { _______, _______ } },
     [_DIABLO]          = { { _______, _______ }, { _______, _______ } },
     [_MOUSE]           = { { _______, _______ }, { KC_WH_D, KC_WH_U } },
@@ -188,15 +187,15 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 #endif
 
 #ifdef OLED_ENABLE
-extern uint16_t typing_mode;
+#    include "keyrecords/unicode.h"
 
 oled_rotation_t oled_init_keymap(oled_rotation_t rotation) {
     return OLED_ROTATION_180;
 }
 
-void oled_render_large_display(void) {
-    if (is_keyboard_left()) {
-        render_wpm_graph(54, 64);
+void oled_render_large_display(bool side) {
+    if (side) {
+        render_wpm_graph(56, 64);
     } else {
         oled_advance_page(true);
         oled_advance_page(true);
@@ -214,25 +213,25 @@ void oled_render_large_display(void) {
         oled_set_cursor(1, 14);
         oled_write_ln_P(PSTR("Unicode:"), false);
         switch (typing_mode) {
-            case KC_WIDE:
+            case UCTM_WIDE:
                 oled_write_P(PSTR("        Wide"), false);
                 break;
-            case KC_SCRIPT:
+            case UCTM_SCRIPT:
                 oled_write_P(PSTR("      Script"), false);
                 break;
-            case KC_BLOCKS:
+            case UCTM_BLOCKS:
                 oled_write_P(PSTR("      Blocks"), false);
                 break;
-            case KC_REGIONAL:
+            case UCTM_REGIONAL:
                 oled_write_P(PSTR("    Regional"), false);
                 break;
-            case KC_AUSSIE:
+            case UCTM_AUSSIE:
                 oled_write_P(PSTR("      Aussie"), false);
                 break;
-            case KC_ZALGO:
+            case UCTM_ZALGO:
                 oled_write_P(PSTR("       Zalgo"), false);
                 break;
-            case KC_NOMODE:
+            case UCTM_NO_MODE:
                 oled_write_P(PSTR("      Normal"), false);
                 break;
             default:
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 4cad07ef66..72824cf055 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -32,6 +32,9 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
     AUTOCORRECTION_ENABLE        = no
     CAPS_WORD_ENABLE             = yes
 endif
+ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
+    BOOTLOADER = tinyuf2
+endif
 # DEBOUNCE_TYPE = sym_eager_pk
 
 OLED_DRIVER = custom