Merge upstream master to 2022 Q4 breaking change

2 files changed, 0 insertions, 709 deletions

diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
deleted file mode 100644
index 95485797cc..0000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-#define EE_HANDS
-
-#ifdef OLED_ENABLE
-#    define OLED_TIMEOUT 600000
-#endif
-
-// #define FORCE_NKRO
-
-#define QMK_ESC_OUTPUT F4  // usually COL
-#define QMK_ESC_INPUT D4   // usually ROW
-#define QMK_LED B0
-
-#define NO_ACTION_ONESHOT
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 12
-#    define RGB_MATRIX_VAL_STEP 10
-#    define RGB_MATRIX_SPD_STEP 10
-
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-
-// #undef ENABLE_RGB_MATRIX_CYCLE_ALL
-// #    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_MULTISPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#    define RGB_MATRIX_ANIMATION_SPEED_DEFAULT UINT8_MAX / 2
-#    define RGB_MATRIX_ANIMATION_SPEED_SLOW RGB_MATRIX_ANIMATION_SPEED_DEFAULT / 4
-#    define RGB_MATRIX_ANIMATION_SPEED_SLOWER RGB_MATRIX_ANIMATION_SPEED_SLOW / 3
-#endif
-
-#define TAPPING_TERM 140
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-
-#define TAPPING_TOGGLE 2
-
-#ifdef MOUSEKEY_ENABLE
-#    define MOUSEKEY_DELAY 0
-#    define MOUSEKEY_INTERVAL 16
-#    define MOUSEKEY_MAX_SPEED 6
-#    define MOUSEKEY_TIME_TO_MAX 36
-#    define MOUSEKEY_WHEEL_MAX_SPEED 4
-#    define MOUSEKEY_WHEEL_TIME_TO_MAX 100
-#endif
-
-#ifdef THEME_GODSPEED
-#   define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_godspeed.c"
-#   define THEME_HSV 132, 255, 125
-#endif
-
-#ifdef THEME_PULSE
-#   define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_pulse.c"
-#   define THEME_HSV 123, 255, 125
-#endif
-
-#ifdef THEME_LASER
-#   define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_laser.c"
-#   define THEME_HSV HSV_MAGENTA
-#endif
-
-#define NO_ACTION_ONESHOT
-
-#undef PRODUCT
-#define PRODUCT "Corne Keyboard"
-
-#define LCPC_KEYS KC_LCTL, KC_LSFT, KC_9
-#define RCPC_KEYS KC_RCTL, KC_RSFT, KC_0
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
deleted file mode 100644
index d77fc16e34..0000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ /dev/null
@@ -1,574 +0,0 @@
-#include QMK_KEYBOARD_H
-
-static uint32_t oled_timer = 0;
-
-#ifdef RGB_MATRIX_ENABLE
-    static uint32_t hypno_timer;
-#endif
-
-enum layer_names {
-  _COLEMAKDHM,
-  _GAMING,
-  _GAMING_EXT,
-  _NUMPAD,
-  _SYM,
-  _NAV,
-  _UTIL
-};
-
-enum custom_keycodes {
-    BSP_DEL = SAFE_RANGE,
-    RGB_RST,  // Reset RGB
-    RGB_UND,  // Toggle RGB underglow as layer indicator
-    RGB_IDL,  // RGB Idling animations
-    RGB_MAP,  // RGB_MATRIX_TYPING_HEATMAP
-    RGB_NXS,  // RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-    RGB_SOL,  // RGB_MATRIX_SOLID_COLOR
-    RGB_CYC,  // RGB_MATRIX_CYCLE_ALL
-    RGB_DUO,  // RGB_MATRIX_RAINBOW_PINWHEELS
-    RGB_SCR   // RGB_MATRIX_CYCLE_LEFT_RIGHT
-};
-
-typedef union {
-    uint32_t raw;
-    struct {
-        bool     rgb_layer_change        : 1;
-        bool     rgb_matrix_idle_anim    : 1;
-        uint8_t  rgb_matrix_active_mode  : 4;
-        uint8_t  rgb_matrix_idle_mode    : 4;
-        uint8_t  rgb_matrix_active_speed : 8;
-        uint8_t  rgb_matrix_idle_speed   : 8;
-        uint16_t rgb_matrix_idle_timeout : 16;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
-// Base layers
-#define COLEMAK DF(_COLEMAKDHM)
-#define GAMING  DF(_GAMING)
-
-// Layer toggle and switch
-#define T_NAV TT(_NAV)
-#define S_NAV MO(_NAV)
-
-#define T_SYM TT(_SYM)
-#define S_SYM MO(_SYM)
-
-// Layer keys with functionality on tap
-#define NAV_0 LT(_NAV, KC_0)
-#define TAB_NUM LT(_NUMPAD, KC_TAB)
-
-#define EXT_SF LT(_GAMING_EXT, KC_LSFT)
-
-// Tap/mod keys
-#define RCTL_BR RCTL_T(KC_RBRC)
-#define LCTL_BR LCTL_T(KC_LBRC)
-
-#define SFT_SPC LSFT_T(KC_SPACE)
-#define SFT_ENT RSFT_T(KC_ENTER)
-
-// Global tab forward and backward
-#define TAB_FWD LCTL(KC_TAB)
-#define TAB_BCK LCTL(LSFT(KC_TAB))
-#define TAB_CLS LCTL(KC_W)
-
-#define WIN_CLS LALT(KC_F4)
-
-// CTRL become parens keys on NAV and NUM layers
-#define LCT_PRN SC_LCPO
-#define RCT_PRN SC_RCPC
-
-// €
-#define KC_EUR ALGR(KC_5)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAKDHM] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                         KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, BSP_DEL,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      TAB_NUM,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                         KC_M,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      LCTL_BR,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                         KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, RCTL_BR,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,   T_SYM, SFT_SPC,    SFT_ENT,   T_NAV, KC_RGUI \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_GAMING] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, KC_BSPC,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       KC_TAB, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, KC_RCTL,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______,  EXT_SF,  KC_SPC,    _______, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_GAMING_EXT] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV,    KC_1,    KC_2, _______,    KC_3,    KC_4,                      _______, _______, _______, _______, _______,  KC_DEL,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LBRC, KC_RBRC, _______, _______, _______, KC_BSLS,                      _______, _______, _______, _______, _______, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-         KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                      _______, _______, _______, _______, _______, _______,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,     KC_ENT, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_NUMPAD] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       KC_EUR,   KC_P7,   KC_P8,   KC_P9, XXXXXXX, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_PPLS,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,                        KC_EQL,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PAST,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______,   KC_P0,  KC_DOT \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_SYM] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_MINS, KC_PLUS,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      LCT_PRN, XXXXXXX, XXXXXXX, XXXXXXX,  KC_EUR, XXXXXXX,                       KC_EQL, KC_PIPE,   KC_LT,   KC_GT, KC_BSLS, RCT_PRN,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______,   S_SYM, _______,    _______, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_NAV] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_GRV,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_PGUP, KC_HOME,   KC_UP,  KC_END, XXXXXXX, KC_BSPC,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_TILD,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                      KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      LCT_PRN,  KC_F11,  KC_F12,  KC_INS, KC_PSCR, KC_CAPS,                      WIN_CLS, TAB_BCK, TAB_CLS, TAB_FWD, XXXXXXX, RCT_PRN,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+---------|
-                                          _______, _______, _______,    _______,   S_NAV, _______ \
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_UTIL] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      QK_BOOT, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, COLEMAK,                      RGB_IDL, RGB_MAP, RGB_NXS, XXXXXXX, RGB_HUD, RGB_HUI,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_RST, XXXXXXX, KC_MSTP, KC_VOLD, KC_MPLY,  GAMING,                      RGB_UND, RGB_DUO, RGB_SCR, RGB_SPI, RGB_SAD, RGB_SAI,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-       EE_CLR, KC_SLEP, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX,                      RGB_TOG, RGB_SOL, RGB_CYC, RGB_SPD, RGB_VAD, RGB_VAI,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          _______, _______, _______,    _______, _______, _______ \
-                                      //`--------------------------'  `--------------------------'
-  )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(default_layer_state)) {
-        case _COLEMAKDHM:
-            state = update_tri_layer_state(state, _SYM, _NAV, _UTIL);
-            break;
-        case _GAMING:
-            state = update_tri_layer_state(state, _GAMING_EXT, _NAV, _UTIL);
-            break;
-    }
-    return state;
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    } else {
-        return OLED_ROTATION_180;
-    }
-}
-
-void render_crkbd_logo(void) {
-    static const char PROGMEM crkbd_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,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-#    ifdef RGB_MATRIX_ENABLE
-const char *rgb_matrix_anim_oled_text(uint8_t mode) {
-    switch (mode) {
-        case RGB_MATRIX_TYPING_HEATMAP:
-            return PSTR("Heat ");
-        case RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS:
-            return PSTR("Nexus");
-        case RGB_MATRIX_SOLID_COLOR:
-            return PSTR("Solid");
-        case RGB_MATRIX_CYCLE_ALL:
-            return PSTR("Cycle");
-        case RGB_MATRIX_RAINBOW_PINWHEELS:
-            return PSTR("Wheel");
-        case RGB_MATRIX_CYCLE_LEFT_RIGHT:
-            return PSTR("Wave ");
-        default:
-            return PSTR("");
-    }
-}
-#    endif
-
-void render_status(void) {
-    // oled_write_P(PSTR("Layout: "), false);
-    switch (get_highest_layer(default_layer_state)) {
-        case _COLEMAKDHM:
-            oled_write_P(PSTR("TYPE "), false);
-            break;
-        case _GAMING:
-            oled_write_P(PSTR("GAME "), false);
-            break;
-    }
-
-    oled_write_P(PSTR("\n"), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_P(PSTR("     "), false);
-            break;
-        case _SYM:
-            oled_write_P(PSTR("Sym  "), false);
-            break;
-        case _NAV:
-            oled_write_P(PSTR("Nav  "), false);
-            break;
-        case _GAMING_EXT:
-            oled_write_P(PSTR("Ext  "), false);
-            break;
-        case _NUMPAD:
-            oled_write_P(PSTR("Num  "), false);
-            break;
-        case _UTIL:
-            oled_write_P(PSTR("Util "), false);
-            break;
-        default:
-            oled_write_P(PSTR("Unkn "), false);
-            break;
-    }
-    oled_write_P(PSTR("\n"), false);
-
-    uint8_t modifiers = get_mods();
-
-    oled_write_P((modifiers & MOD_MASK_SHIFT) ? PSTR("SHIFT") : PSTR("\n"), false);
-    oled_write_P((modifiers & MOD_MASK_CTRL) ? PSTR("CTRL ") : PSTR("\n"), false);
-    oled_write_P((modifiers & MOD_MASK_ALT) ? PSTR("ALT  ") : PSTR("\n"), false);
-    oled_write_P((modifiers & MOD_MASK_GUI) ? PSTR("SUPER") : PSTR("\n"), false);
-
-    oled_write_P(PSTR("\n"), false);
-
-    uint8_t led_usb_state = host_keyboard_leds();
-    oled_write_P(PSTR("Mode:"), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR(" NUM ") : PSTR("\n"), false);
-    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR(" CAPS") : PSTR("\n"), false);
-
-#    ifdef RGB_MATRIX_ENABLE
-    oled_write_P(PSTR("\n"), false);
-    oled_write_P(PSTR("\n"), false);
-
-    if (rgb_matrix_config.enable) {
-        if (user_config.rgb_matrix_idle_anim) {
-            oled_write_P(rgb_matrix_anim_oled_text(user_config.rgb_matrix_active_mode), false);
-            oled_write_P(rgb_matrix_anim_oled_text(user_config.rgb_matrix_idle_mode), false);
-        } else {
-            oled_write_P(PSTR("\n"), false);
-            oled_write_P(rgb_matrix_anim_oled_text(rgb_matrix_get_mode()), false);
-        }
-      } else {
-        oled_write_P(PSTR("\n"), false);
-        oled_write_P(PSTR("\n"), false);
-      }
-#    endif
-}
-
-bool oled_task_user(void) {
-    if (timer_elapsed32(oled_timer) > OLED_TIMEOUT) {
-        oled_off();
-        return;
-    } else {
-        oled_on();
-    }
-
-    if (is_keyboard_master()) {
-        render_status();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_crkbd_logo();
-        #ifdef RGB_MATRIX_ENABLE
-            if (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode) {
-                oled_scroll_left();  // Turns on scrolling
-            } else {
-              oled_scroll_off();
-            }
-        #endif
-    }
-    return false;
-}
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-
-extern led_config_t g_led_config;
-void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t led_type) {
-    HSV hsv = {hue, sat, val};
-    if (hsv.v > rgb_matrix_config.hsv.v) {
-        hsv.v = rgb_matrix_config.hsv.v;
-    }
-
-    RGB rgb = hsv_to_rgb(hsv);
-    for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-        }
-    }
-}
-
-void check_default_layer(uint8_t type) {
-    switch (get_highest_layer(default_layer_state)) {
-        case _COLEMAKDHM:
-            rgb_matrix_layer_helper(THEME_HSV, type);
-            break;
-        case _GAMING:
-            rgb_matrix_layer_helper(HSV_RED, type);
-            break;
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-  if (
-    user_config.rgb_layer_change && rgb_matrix_config.enable &&
-      (!user_config.rgb_matrix_idle_anim || rgb_matrix_get_mode() != user_config.rgb_matrix_idle_mode)
-  )
-    {
-        switch (get_highest_layer(layer_state)) {
-            case _GAMING_EXT:
-                rgb_matrix_layer_helper(HSV_PURPLE, LED_FLAG_UNDERGLOW);
-                break;
-            case _SYM:
-                rgb_matrix_layer_helper(HSV_GOLDENROD, LED_FLAG_UNDERGLOW);
-                break;
-            case _NAV:
-                rgb_matrix_layer_helper(HSV_SPRINGGREEN, LED_FLAG_UNDERGLOW);
-                break;
-            case _UTIL:
-                rgb_matrix_layer_helper(HSV_PINK, LED_FLAG_UNDERGLOW);
-                break;
-            case _NUMPAD:
-                rgb_matrix_layer_helper(HSV_CORAL, LED_FLAG_UNDERGLOW);
-                break;
-            default: {
-                check_default_layer(LED_FLAG_UNDERGLOW);
-                break;
-            }
-        }
-    }
-    return false;
-}
-
-void rgb_matrix_update_current_mode(uint8_t mode, uint8_t speed) {
-    rgb_matrix_config.speed = speed;
-    rgb_matrix_mode_noeeprom(mode);
-    eeconfig_update_user(user_config.raw);
-}
-
-void rgb_matrix_update_dynamic_mode(uint8_t mode, uint8_t speed, bool active) {
-    if (active) {
-        user_config.rgb_matrix_active_speed = speed;
-        user_config.rgb_matrix_active_mode  = mode;
-    } else {
-        user_config.rgb_matrix_idle_speed = speed;
-        user_config.rgb_matrix_idle_mode  = mode;
-    }
-}
-
-void rgb_matrix_update_mode(uint8_t mode, uint8_t speed, bool active) {
-    if (user_config.rgb_matrix_idle_anim) {
-        rgb_matrix_update_dynamic_mode(mode, speed, active);
-    }
-    if (active || !user_config.rgb_matrix_idle_anim) {
-        rgb_matrix_update_current_mode(mode, speed);
-    }
-}
-
-void rgb_matrix_set_defaults(void) {
-    rgb_matrix_config.enable = 1;
-    rgb_matrix_sethsv_noeeprom(THEME_HSV);
-
-    user_config.rgb_layer_change        = false;
-    user_config.rgb_matrix_idle_anim    = true;
-    user_config.rgb_matrix_idle_timeout = 60000;
-
-    rgb_matrix_update_dynamic_mode(RGB_MATRIX_CYCLE_ALL, RGB_MATRIX_ANIMATION_SPEED_SLOWER, false);
-    rgb_matrix_update_dynamic_mode(RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS, RGB_MATRIX_ANIMATION_SPEED_DEFAULT, true);
-
-    eeprom_update_block(&rgb_matrix_config, EECONFIG_RGB_MATRIX, sizeof(rgb_matrix_config));
-}
-
-void matrix_scan_rgb(void) {
-    if (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_active_mode && timer_elapsed32(hypno_timer) > user_config.rgb_matrix_idle_timeout) {
-        if (user_config.rgb_layer_change) {
-            rgb_matrix_layer_helper(0, 0, 0, LED_FLAG_UNDERGLOW);
-        }
-        rgb_matrix_update_current_mode(user_config.rgb_matrix_idle_mode, user_config.rgb_matrix_idle_speed);
-    }
-}
-
-void matrix_scan_user(void) {
-    static bool has_ran_yet;
-    if (!has_ran_yet) {
-        has_ran_yet = true;
-        startup_user();
-    }
-    matrix_scan_rgb();
-}
-
-void eeconfig_init_user(void) {
-    user_config.raw = 0;
-    rgb_matrix_mode_noeeprom(user_config.rgb_matrix_active_mode);
-    keyboard_init();
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-    rgb_matrix_set_defaults();
-    rgb_matrix_enable_noeeprom();
-}
-#endif
-
-void suspend_power_down_keymap(void) {
-    oled_off();
-    rgb_matrix_set_suspend_state(true);
-}
-
-void suspend_wakeup_init_keymap(void) {
-    oled_on();
-    rgb_matrix_set_suspend_state(false);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint8_t saved_mods   = 0;
-    uint16_t       temp_keycode = keycode;
-
-    oled_timer = timer_read32();
-
-#ifdef RGB_MATRIX_ENABLE
-    if (user_config.rgb_matrix_idle_anim) {
-        hypno_timer = timer_read32();
-        if (rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode) {
-            rgb_matrix_update_current_mode(user_config.rgb_matrix_active_mode, user_config.rgb_matrix_active_speed);
-            if (!user_config.rgb_layer_change) {
-                rgb_matrix_layer_helper(0, 0, 0, LED_FLAG_UNDERGLOW);
-            }
-        }
-    }
-#endif
-
-    // Filter out the actual keycode from MT and LT keys.
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-        temp_keycode &= 0xFF;
-    }
-
-    switch (temp_keycode) {
-        case BSP_DEL:
-            if (record->event.pressed) {
-                saved_mods = get_mods() & MOD_MASK_SHIFT;
-
-                if (saved_mods == MOD_MASK_SHIFT) {  // Both shifts pressed
-                    register_code(KC_DEL);
-                } else if (saved_mods) {   // One shift pressed
-                    del_mods(saved_mods);  // Remove any Shifts present
-                    register_code(KC_DEL);
-                    add_mods(saved_mods);  // Add shifts again
-                } else {
-                    register_code(KC_BSPC);
-                }
-            } else {
-                unregister_code(KC_DEL);
-                unregister_code(KC_BSPC);
-            }
-            return false;
-#ifdef RGB_MATRIX_ENABLE
-        case COLEMAK:
-            if (record->event.pressed) {
-                user_config.rgb_matrix_idle_timeout = 60000;
-                rgb_matrix_update_mode(RGB_MATRIX_CYCLE_ALL, RGB_MATRIX_ANIMATION_SPEED_SLOWER, false);
-            }
-            return true;
-        case GAMING:
-            if (record->event.pressed) {
-                if (!user_config.rgb_layer_change) {
-                    user_config.rgb_layer_change = true;
-                }
-                user_config.rgb_matrix_idle_timeout = 10000;
-                rgb_matrix_update_mode(RGB_MATRIX_RAINBOW_PINWHEELS, RGB_MATRIX_ANIMATION_SPEED_SLOW, false);
-            }
-            return true;
-        case RGB_RST:
-            if (record->event.pressed) {
-                rgb_matrix_set_defaults();
-                rgb_matrix_enable();
-            }
-            break;
-        case RGB_UND:  // Toggle separate underglow status
-            if (record->event.pressed) {
-                user_config.rgb_layer_change ^= 1;
-                eeconfig_update_user(user_config.raw);
-                if (user_config.rgb_layer_change) {
-                    layer_state_set(layer_state);  // This is needed to immediately set the layer color (looks better)
-                } else {
-                    rgb_matrix_layer_helper(0, 0, 0, LED_FLAG_UNDERGLOW);
-                }
-            }
-            break;
-        case RGB_IDL:  // Toggle idle/heatmap animation
-            if (record->event.pressed) {
-                user_config.rgb_matrix_idle_anim ^= 1;
-                if (user_config.rgb_matrix_idle_anim) {
-                    rgb_matrix_update_mode(user_config.rgb_matrix_active_mode, user_config.rgb_matrix_active_speed, true);
-                } else {
-                    rgb_matrix_update_current_mode(user_config.rgb_matrix_idle_mode, user_config.rgb_matrix_idle_speed);
-                }
-            }
-            break;
-        case RGB_MAP:
-            if (record->event.pressed) {
-                rgb_matrix_update_mode(RGB_MATRIX_TYPING_HEATMAP, rgb_matrix_config.speed, true);
-            }
-            break;
-        case RGB_NXS:
-            if (record->event.pressed) {
-                rgb_matrix_update_mode(RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS, RGB_MATRIX_ANIMATION_SPEED_DEFAULT, true);
-            }
-            break;
-        case RGB_SOL:
-            if (record->event.pressed) {
-                rgb_matrix_update_mode(RGB_MATRIX_SOLID_COLOR, rgb_matrix_config.speed, false);
-            }
-            break;
-        case RGB_CYC:
-            if (record->event.pressed) {
-                rgb_matrix_update_mode(RGB_MATRIX_CYCLE_ALL, RGB_MATRIX_ANIMATION_SPEED_SLOWER, false);
-            }
-            break;
-        case RGB_DUO:
-            if (record->event.pressed) {
-                rgb_matrix_update_mode(RGB_MATRIX_RAINBOW_PINWHEELS, RGB_MATRIX_ANIMATION_SPEED_SLOW, false);
-            }
-            break;
-        case RGB_SCR:
-            if (record->event.pressed) {
-                rgb_matrix_update_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT, RGB_MATRIX_ANIMATION_SPEED_SLOW, false);
-            }
-            break;
-#endif
-    }
-    return true;
-}