Squashed commit of the following:

commit ef788c6
Merge: aa33fb0 ae5bcaa
Author: QMK Bot <hello@qmk.fm>
Date:   Fri Jun 2 07:46:36 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit ae5bcaa
Author: yiancar <yiangosyiangou@cytanet.com.cy>
Date:   Fri Jun 2 08:45:54 2023 +0100

    [keyboard] Phoenix (qmk#21051)

    * Update keyboards/cablecardesigns/phoenix/

commit aa33fb0
Author: Joel Challis <git@zvecr.com>
Date:   Fri Jun 2 02:45:48 2023 +0100

    Revert "Add *_MATRIX_LED_COUNT generation/validation (qmk#19515)" (qmk#21109)

    This reverts commit 25c16b3.

commit 25c16b3
Author: Joel Challis <git@zvecr.com>
Date:   Fri Jun 2 02:42:49 2023 +0100

    Add *_MATRIX_LED_COUNT generation/validation (qmk#19515)

    * Add *_MATRIX_LED_COUNT parsing/validation

    * Disable parsing for now

    * Disable complexity check

commit 0a3ec7f
Author: Joel Challis <git@zvecr.com>
Date:   Thu Jun 1 21:12:25 2023 +0100

    Merge upstream uf2conv.py changes (qmk#21107)

commit a4ed6ad
Author: Ryan <fauxpark@gmail.com>
Date:   Fri Jun 2 02:25:08 2023 +1000

    Unicodemap keycodes rename (qmk#21092)

commit 45c9bc4
Merge: 857e9b7 b110a09
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 1 14:11:31 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit b110a09
Author: DeskDaily <65656486+DeskDaily@users.noreply.github.com>
Date:   Thu Jun 1 22:10:47 2023 +0800

    [Keyboard] Add lightweight65 keyboard (qmk#21034)

    Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
    Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>

commit 857e9b7
Merge: 6156972 c805c10
Author: QMK Bot <hello@qmk.fm>
Date:   Thu Jun 1 09:26:41 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit c805c10
Author: Sergi Meseguer <zigotica@gmail.com>
Date:   Thu Jun 1 11:25:49 2023 +0200

    [Keymap] z12 zigotica keymap tweaks (qmk#20990)

commit 0c9c4a4
Author: adiabatic <adiabatic@users.noreply.github.com>
Date:   Thu Jun 1 02:25:33 2023 -0700

    [Keymap] `zweihander-macos`: Don’t pretend to be a mouse (qmk#20997)

commit 6156972
Merge: 5a26e5e 81bc092
Author: QMK Bot <hello@qmk.fm>
Date:   Wed May 31 19:03:39 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 81bc092
Author: kkokdae <kkokdae@me.com>
Date:   Thu Jun 1 04:02:58 2023 +0900

    [Keymap] Modify kkokdae keymap for keyboardio/atreus (qmk#21037)

commit 5a26e5e
Author: 3araht <69518343+3araht@users.noreply.github.com>
Date:   Thu Jun 1 03:48:56 2023 +0900

    [Keymap] transpose added to giabalanai keymaps (qmk#21054)

commit 6a2de56
Merge: 04719c7 c2ddd77
Author: QMK Bot <hello@qmk.fm>
Date:   Wed May 31 18:47:46 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit c2ddd77
Author: CoffeeIsLife <36961653+CoffeeIsLife87@users.noreply.github.com>
Date:   Wed May 31 13:46:59 2023 -0500

    [Keymap] Cleanup coffeeislife87 keymap and remove features (qmk#21061)

    Co-authored-by: Drashna Jaelre <drashna@live.com>
    Co-authored-by: Fae <faenkhauser@gmail.com>

commit 04719c7
Author: Evgenii Vilkov <zzeneg@gmail.com>
Date:   Wed May 31 20:46:03 2023 +0200

    Fix backlight sync on suspend_power_down for split keyboards (qmk#21079)

commit b3a7f80
Merge: cc11b63 3a3e5ab
Author: QMK Bot <hello@qmk.fm>
Date:   Wed May 31 18:44:47 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 3a3e5ab
Author: Drashna Jaelre <drashna@live.com>
Date:   Wed May 31 11:44:06 2023 -0700

    [Keymap] Drashna Keymap updates for 0.21.0 (qmk#21073)

commit cc11b63
Merge: 23658cf 1411c79
Author: QMK Bot <hello@qmk.fm>
Date:   Tue May 30 18:25:04 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 1411c79
Author: Sergey Vlasov <sigprof@gmail.com>
Date:   Tue May 30 21:24:19 2023 +0300

    `qmk find`: Fix handling of functions in filters (qmk#21090)

    Functions in filters did not work properly except when used in the last
    (or only) filter.  The problem was caused by the peculiarity of the
    `lambda` behavior in Python — any variables from the outer scope are
    captured only by reference, therefore any subsequent reassignment of
    those variables is propagated to all lambdas created earlier in the same
    scope.  Together with the laziness of `filter()` (it returns an iterator
    which performs filtering on demand) this resulted in all function
    filters using the values of the `key` and `value` variables which
    correspond to the last filter in the sequence, therefore the result of
    filtering was wrong if some filter with a function was not the last one
    in the sequence.

    Apparently the shortest way to make a Python lambda capture some
    variables by value is to add arguments with default values for such
    variables (default values are evaluated when the lambda is created, and
    any subsequent reassignments in the outer scope no longer changes them).
    This makes filters with functions work properly even when such filters
    are not at the last position in the sequence.

commit 23658cf
Merge: ffeaf46 913691b
Author: QMK Bot <hello@qmk.fm>
Date:   Tue May 30 01:11:34 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 913691b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue May 30 02:10:57 2023 +0100

    Bump tj-actions/changed-files from 35 to 36 (qmk#21058)

    Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 35 to 36.
    - [Release notes](https://github.com/tj-actions/changed-files/releases)
    - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
    - [Commits](tj-actions/changed-files@v35...v36)

    ---
    updated-dependencies:
    - dependency-name: tj-actions/changed-files
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit ffeaf46
Merge: 0ffa4ef 1e2dedd
Author: QMK Bot <hello@qmk.fm>
Date:   Tue May 30 01:08:54 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 1e2dedd
Author: precondition <57645186+precondition@users.noreply.github.com>
Date:   Tue May 30 03:08:15 2023 +0200

    Remove outdated remarks regarding the default MT behavior (qmk#21077)

.github/workflows/format.yml

@@ -35,7 +35,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v35
+      uses: tj-actions/changed-files@v36
 
     - name: Run qmk formatters
       shell: 'bash {0}'

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v35
+      uses: tj-actions/changed-files@v36
 
     - name: Print info
       run: |

docs/feature_unicode.md

@@ -42,7 +42,7 @@ Add the following to your `rules.mk`:
 UNICODEMAP_ENABLE = yes
 ```
 
-Then add `X(i)` keycodes to your keymap, where _i_ is the desired character's index in the mapping table. This can be a numeric value, but it's recommended to keep the indices in an enum and access them by name.
+Then add `UM(i)` keycodes to your keymap, where _i_ is the desired character's index in the mapping table. This can be a numeric value, but it's recommended to keep the indices in an enum and access them by name.
 
 ```c
 enum unicode_names {
@@ -58,13 +58,13 @@ const uint32_t unicode_map[] PROGMEM = {
 };
 ```
 
-Then you can use `X(BANG)`, `X(SNEK)` etc. in your keymap.
+Then you can use `UM(BANG)`, `UM(SNEK)` etc. in your keymap.
 
 #### Lower and Upper Case
 
-Characters often come in lower and upper case pairs, such as å and Å. To make inputting these characters easier, you can use `XP(i, j)` in your keymap, where _i_ and _j_ are the mapping table indices of the lower and upper case character, respectively. If you're holding down Shift or have Caps Lock turned on when you press the key, the second (upper case) character will be inserted; otherwise, the first (lower case) version will appear.
+Characters often come in lower and upper case pairs, such as å and Å. To make inputting these characters easier, you can use `UP(i, j)` in your keymap, where _i_ and _j_ are the mapping table indices of the lower and upper case character, respectively. If you're holding down Shift or have Caps Lock turned on when you press the key, the second (upper case) character will be inserted; otherwise, the first (lower case) version will appear.
 
-This is most useful when creating a keymap for an international layout with special characters. Instead of having to put the lower and upper case versions of a character on separate keys, you can have them both on the same key by using `XP()`. This helps blend Unicode keys in with regular alphas.
+This is most useful when creating a keymap for an international layout with special characters. Instead of having to put the lower and upper case versions of a character on separate keys, you can have them both on the same key by using `UP()`. This helps blend Unicode keys in with regular alphas.
 
 Due to keycode size constraints, _i_ and _j_ can each only refer to one of the first 128 characters in your `unicode_map`. In other words, 0 ≤ _i_ ≤ 127 and 0 ≤ _j_ ≤ 127. This is enough for most use cases, but if you'd like to customize the index calculation, you can override the [`unicodemap_index()`](https://github.com/qmk/qmk_firmware/blob/71f640d47ee12c862c798e1f56392853c7b1c1a8/quantum/process_keycode/process_unicodemap.c#L36) function. This also allows you to, say, check Ctrl instead of Shift/Caps.
 

docs/getting_started_make_guide.md

@@ -109,7 +109,7 @@ This allows you to send Unicode characters using `UC(<code point>)` in your keym
 
 `UNICODEMAP_ENABLE`
 
-This allows you to send Unicode characters using `X(<map index>)` in your keymap. You will need to maintain a mapping table in your keymap file. All possible code points (up to `0x10FFFF`) are supported.
+This allows you to send Unicode characters using `UM(<map index>)` in your keymap. You will need to maintain a mapping table in your keymap file. All possible code points (up to `0x10FFFF`) are supported.
 
 `UCIS_ENABLE`
 

docs/keycodes.md

@@ -848,8 +848,8 @@ See also: [Unicode Support](feature_unicode.md)
 |Key                         |Aliases  |Description                                                     |
 |----------------------------|---------|----------------------------------------------------------------|
 |`UC(c)`                     |         |Send Unicode code point `c`, up to `0x7FFF`                     |
-|`X(i)`                      |         |Send Unicode code point at index `i` in `unicode_map`           |
-|`XP(i, j)`                  |         |Send Unicode code point at index `i`, or `j` if Shift/Caps is on|
+|`UM(i)`                     |         |Send Unicode code point at index `i` in `unicode_map`           |
+|`UP(i, j)`                  |         |Send Unicode code point at index `i`, or `j` if Shift/Caps is on|
 |`QK_UNICODE_MODE_NEXT`      |`UC_NEXT`|Cycle through selected input modes                              |
 |`QK_UNICODE_MODE_PREVIOUS`  |`UC_PREV`|Cycle through selected input modes in reverse                   |
 |`QK_UNICODE_MODE_MACOS`     |`UC_MAC` |Switch to macOS input                                           |

docs/tap_hold.md

@@ -296,7 +296,7 @@ However, this slightly different sequence will not be affected by the “permiss
 
 In the sequence above the dual-role key is released before the other key is released, and if that happens within the tapping term, the “permissive hold” mode will still choose the tap action for the dual-role key, and the sequence will be registered as `al` by the host. We could describe this as a “rolling press” (the two keys' key down and key up events behave as if you were rolling a ball across the two keys, first pressing each key down in sequence and then releasing them in the same order).
 
-?> The `PERMISSIVE_HOLD` option is not noticeable if you also enable `HOLD_ON_OTHER_KEY_PRESS` because the latter option considers both the “nested tap” and “rolling press” sequences like shown above as a hold action, not the tap action. `HOLD_ON_OTHER_KEY_PRESS` makes the Tap-Or-Hold decision earlier in the chain of key events, thus taking a precedence over `PERMISSIVE_HOLD`.  This remark also applies to default mod-taps.
+?> The `PERMISSIVE_HOLD` option is not noticeable if you also enable `HOLD_ON_OTHER_KEY_PRESS` because the latter option considers both the “nested tap” and “rolling press” sequences like shown above as a hold action, not the tap action. `HOLD_ON_OTHER_KEY_PRESS` makes the Tap-Or-Hold decision earlier in the chain of key events, thus taking a precedence over `PERMISSIVE_HOLD`.
 
 For more granular control of this feature, you can add the following to your `config.h`:
 
@@ -352,8 +352,6 @@ An example of a sequence that is affected by the “hold on other key press” m
 
 Normally, if you do all this within the `TAPPING_TERM` (default: 200ms), this will be registered as `al` by the firmware and host system.  With the `HOLD_ON_OTHER_KEY_PRESS` option enabled, the Layer Tap key is considered as a layer switch if another key is pressed, and the above sequence would be registered as `KC_RGHT` (the mapping of `L` on layer 2).
 
-?> The `HOLD_ON_OTHER_KEY_PRESS` option is essentially redundant with the default mod-tap behaviour. The only notable difference is that `HOLD_ON_OTHER_KEY_PRESS` reduces the delay before the key events are made visible to the host.
-
 For more granular control of this feature, you can add the following to your `config.h`:
 
 ```c

keyboards/a_dux/keymaps/daliusd/keymap.c

@@ -126,28 +126,28 @@ const uint32_t unicode_map[] PROGMEM = {
     [LT_CB] = 0x201c, // “
 };
 
-#define K_SNEK      X(SNEK)
-#define K_EURO      X(EURO)
-#define K_LT_A      XP(LT_S_A, LT_L_A)
-#define K_LT_AU     X(LT_L_A)
-#define K_LT_C      XP(LT_S_C, LT_L_C)
-#define K_LT_CU     X(LT_L_C)
-#define K_LT_E1     XP(LT_S_E1, LT_L_E1)
-#define K_LT_E1U    X(LT_L_E1)
-#define K_LT_E2     XP(LT_S_E2, LT_L_E2)
-#define K_LT_E2U    X(LT_L_E2)
-#define K_LT_I      XP(LT_S_I, LT_L_I)
-#define K_LT_IU     X(LT_L_I)
-#define K_LT_S      XP(LT_S_S, LT_L_S)
-#define K_LT_SU     X(LT_L_S)
-#define K_LT_U1     XP(LT_S_U1, LT_L_U1)
-#define K_LT_U1U    X(LT_L_U1)
-#define K_LT_U2     XP(LT_S_U2, LT_L_U2)
-#define K_LT_U2U    X(LT_L_U2)
-#define K_LT_Z      XP(LT_S_Z, LT_L_Z)
-#define K_LT_ZU     X(LT_L_Z)
-#define K_LT_OB     X(LT_OB)
-#define K_LT_CB     X(LT_CB)
+#define K_SNEK      UM(SNEK)
+#define K_EURO      UM(EURO)
+#define K_LT_A      UP(LT_S_A, LT_L_A)
+#define K_LT_AU     UM(LT_L_A)
+#define K_LT_C      UP(LT_S_C, LT_L_C)
+#define K_LT_CU     UM(LT_L_C)
+#define K_LT_E1     UP(LT_S_E1, LT_L_E1)
+#define K_LT_E1U    UM(LT_L_E1)
+#define K_LT_E2     UP(LT_S_E2, LT_L_E2)
+#define K_LT_E2U    UM(LT_L_E2)
+#define K_LT_I      UP(LT_S_I, LT_L_I)
+#define K_LT_IU     UM(LT_L_I)
+#define K_LT_S      UP(LT_S_S, LT_L_S)
+#define K_LT_SU     UM(LT_L_S)
+#define K_LT_U1     UP(LT_S_U1, LT_L_U1)
+#define K_LT_U1U    UM(LT_L_U1)
+#define K_LT_U2     UP(LT_S_U2, LT_L_U2)
+#define K_LT_U2U    UM(LT_L_U2)
+#define K_LT_Z      UP(LT_S_Z, LT_L_Z)
+#define K_LT_ZU     UM(LT_L_Z)
+#define K_LT_OB     UM(LT_OB)
+#define K_LT_CB     UM(LT_CB)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 

keyboards/abacus/keymaps/unicodemap/keymap.c

@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LOWER] = LAYOUT(
         NICKURL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
         _______, KC_F11, KC_F12, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_SNAKE, RGB_MODE_KNIGHT, RGB_MODE_GRADIENT, XXXXXXX, RGB_TOG,
-        _______, X(LOVEEYES), X(THINK), X(UPSIDEDOWN), X(NOMOUTH), X(PARTY), X(PEACH), X(HEART), X(EGGPLANT), X(EMOJI100), X(EMOJIB), RGB_HUI,
+        _______, UM(LOVEEYES), UM(THINK), UM(UPSIDEDOWN), UM(NOMOUTH), UM(PARTY), UM(PEACH), UM(HEART), UM(EGGPLANT), UM(EMOJI100), UM(EMOJIB), RGB_HUI,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______
     )
 

keyboards/adafruit/macropad/keymaps/drashna/config.h

@@ -0,0 +1,7 @@
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
+#define TAPPING_TERM 499

keyboards/adafruit/macropad/keymaps/drashna/keymap.c

@@ -0,0 +1,100 @@
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "drashna.h"
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+                          LT(1,KC_MUTE),
+        KC_ENT,  KC_0,    KC_BSPC,
+        KC_7,    KC_8,    KC_9,
+        KC_4,    KC_5,    KC_6,
+        KC_1,    KC_2,    KC_3
+    ),
+    [1] = LAYOUT(
+                          _______,
+        CK_TOGG, AU_TOGG, _______,
+        _______, _______, _______,
+        _______, _______, _______,
+        _______, _______, _______
+    ),
+};
+// clang-format on
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [1] = {ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+};
+#endif
+
+void render_oled_title(bool side) {
+    oled_write_P(PSTR("   Macropad  "), true);
+}
+
+void render_rgb_mode(uint8_t col, uint8_t line);
+
+void l_render_keylock_status(led_t led_usb_state, uint8_t col, uint8_t line) {
+    oled_set_cursor(col, line);
+#ifdef CAPS_WORD_ENABLE
+    led_usb_state.caps_lock |= is_caps_word_on();
+#endif
+    oled_write_P(PSTR(OLED_RENDER_LOCK_NUML), led_usb_state.num_lock);
+    oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR(OLED_RENDER_LOCK_CAPS), led_usb_state.caps_lock);
+    oled_write_P(PSTR(" "), false);
+    oled_write_P(PSTR(OLED_RENDER_LOCK_SCLK), led_usb_state.scroll_lock);
+}
+
+bool oled_task_keymap(void) {
+    oled_write_raw_P(header_image, sizeof(header_image));
+    oled_set_cursor(0, 1);
+    oled_write_raw_P(row_2_image, sizeof(row_2_image));
+    oled_set_cursor(4, 0);
+    render_oled_title(false);
+
+    render_kitty(0, 2);
+    render_matrix_scan_rate(1, 7, 2);
+
+#ifdef AUDIO_ENABLE
+    oled_set_cursor(7, 4);
+    bool l_is_audio_on = is_audio_on();
+
+    static const char PROGMEM audio_status[2][3] = {{0xE0, 0xE1, 0}, {0xE2, 0xE3, 0}};
+    oled_write_P(audio_status[l_is_audio_on], false);
+
+#    ifdef AUDIO_CLICKY
+    bool                      l_is_clicky_on            = is_clicky_on();
+    static const char PROGMEM audio_clicky_status[2][3] = {{0xF4, 0xF5, 0}, {0xF6, 0xF7, 0}};
+    oled_write_P(audio_clicky_status[l_is_clicky_on && l_is_audio_on], false);
+#    endif
+#endif
+
+    static const char PROGMEM cat_mode[3] = {0xF8, 0xF9, 0};
+    oled_write_P(cat_mode, get_keyboard_lock());
+
+#ifdef RGB_MATIRX_ENABLE
+    static const char PROGMEM rgb_layer_status[2][3] = {{0xEE, 0xEF, 0}, {0xF0, 0xF1, 0}};
+    oled_write_P(rgb_layer_status[rgb_matrix_is_enabled()], false);
+#endif
+
+#ifdef HAPTIC_ENABLE
+    static const char PROGMEM nukem_good[2] = {0xFA, 0};
+    oled_write_P(haptic_get_enable() ? nukem_good : PSTR(" "), false);
+#endif
+
+    l_render_keylock_status(host_keyboard_led_state(), 7, 5);
+    render_rgb_mode(1, 6);
+
+    for (uint8_t i = 1; i < 7; i++) {
+        oled_set_cursor(0, i);
+        oled_write_raw_P(display_border, sizeof(display_border));
+        oled_set_cursor(21, i);
+        oled_write_raw_P(display_border, sizeof(display_border));
+    }
+    oled_set_cursor(0, 7);
+    oled_write_raw_P(footer_image, sizeof(footer_image));
+
+    return false;
+}

keyboards/adafruit/macropad/keymaps/drashna/rules.mk

@@ -0,0 +1,3 @@
+ENCODER_MAP_ENABLE = yes
+DEBUG_MATRIX_SCAN_RATE_ENABLE = api
+WPM_ENABLE = yes

keyboards/atreus/keymaps/ridingqwerty/keymap.c

@@ -46,7 +46,7 @@
   { K75, K74, K73, K72, K71, K70   }  \
 }
 
-//#define ALPHA XP(UCM_LDEL, UCM_UDEL)
+//#define ALPHA UP(UCM_LDEL, UCM_UDEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_atreus_wrapper( /* Qwerty */

keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c

@@ -82,29 +82,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                           EE_CLR, KC_NUKE, _______,    _______, QK_BOOT
     ),
 };
-
-#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
-void keyboard_pre_init_keymap(void) {
-    setPinInputHigh(A0);
-}
-
-void housekeeping_task_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
-
-void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
-    for (int32_t i = 0; i < 40; i++) {
-        __asm__ volatile("nop" ::: "memory");
-    }
-}
-#endif

keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk

@@ -40,6 +40,4 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
     CUSTOM_UNICODE_ENABLE = yes
     CUSTOM_POINTING_DEVICE = yes
     CUSTOM_SPLIT_TRANSPORT_SYNC = yes
-
-    DEBOUNCE_TYPE = asym_eager_defer_pk
 endif

keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h

@@ -65,3 +65,5 @@
 #define BOOTMAGIC_LITE_EEPROM_COLUMN 0
 #define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 1
 #define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 0
+
+#define DEBOUNCE 15

keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c

@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                SFT_T(KC_SPACE),  ALT_T(KC_Q),      _______
     ),
     [_MOUSE] = LAYOUT_charybdis_4x6(
-        _______, _______, _______, _______, _______, _______,   _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______,
+        _______, _______, _______, _______, _______, _______,   _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, PD_JIGGLER,
         _______, _______, _______, _______, _______, _______,   KC_WH_U, _______, _______, _______, _______, DRGSCRL,
         _______, _______, _______, _______, _______, _______,   KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
         _______, _______, _______, _______, _______, _______,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
@@ -130,28 +130,6 @@ void keyboard_post_init_keymap(void) {
 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) {
-    setPinInputLow(USB_VBUS_PIN);
-    wait_us(5);
-    return readPin(USB_VBUS_PIN);
-}
-#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

keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk

@@ -1,6 +1,7 @@
 CUSTOM_UNICODE_ENABLE = no
 CUSTOM_POINTING_DEVICE = no
 CUSTOM_SPLIT_TRANSPORT_SYNC = no
+PER_KEY_TAPPING = yes
 
 ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill)
     # MCU name
@@ -16,16 +17,13 @@ ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill)
     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
+    EXTRAKEY_ENABLE = no
+else
+    OVERLOAD_FEATURES = yes
 endif
 
 ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
@@ -43,7 +41,6 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), 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

keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h

@@ -6,3 +6,5 @@
 #define CIRQUE_PINNACLE_TAP_ENABLE
 #define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
 #define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
+
+#define OLED_DISPLAY_128X128