Merge upstream master to 2022 Q4 breaking change

2 files changed, 0 insertions, 300 deletions

diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
deleted file mode 100644
index 0ac1cc4a6e..0000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#define USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_TERM 150
-#define TAPPING_TOGGLE 2
-
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 12
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
deleted file mode 100644
index 39b171dcdc..0000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
+++ /dev/null
@@ -1,281 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum rorschach_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // Qwerty
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Function Keys (similar to _NUMBERS; used with _NUMBERS for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer, accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer, accessed outside of tri-layer feature)
-};
-
-enum rorschach_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  NUMPAD = TG(_NUMPAD),
-  ADJUST = MO(_ADJUST2),
-  SPCFN  = LT(_FUNCTION, KC_SPC),
-  BSPCFN = LT(_FUNCTION2, KC_BSPC),
-  ENTNS  = LT(_NUMBERS, KC_ENT),
-  DELNS  = LT(_NUMBERS2, KC_DEL),
-  CTLESC = CTL_T(KC_ESC),
-  ALTAPP = ALT_T(KC_APP),
-  NKROTG = MAGIC_TOGGLE_NKRO,
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPLEQ,
-  PMNUN,
-  PSLPAS
-};
-
-void dance_LAYER_finished(qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-[ADJ]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL]   = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ]   = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN]   = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS]   = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL]   = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPLEQ]  = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMNUN]  = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSLPAS] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak
-*  (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |  Tab  |   Q   |   W   |   F   |   P   |   G   |                  |   J   |   L   |   U   |   Y   |   ;   |   \   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |Esc/Ctl|   A   |   R   |   S   |   T   |   D   |                  |   H   |   N   |   E   |   I   |   O   |   '   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  | SC Sft|   Z   |   X   |   C   |   V   |   B   |                  |   K   |   M   |   ,   |   .   |   /   | SC Sft|
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/FN|                  |Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          | Ent/NS|  Bspc |  | Enter |Del/NS2|
-*                                          `---------------'  `---------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_TAB,  KC_Q,   KC_W,    KC_F,    KC_P,   KC_G,                    KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,   KC_R,    KC_S,    KC_T,   KC_D,                    KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,                    KC_K,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV, KC_LBRC, KC_RBRC, ALTAPP, SPCFN,                   BSPCFN, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                             ENTNS, KC_BSPC,  KC_ENT, DELNS
-),
-
-/* QWERTY
-*  (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |  Tab  |   Q   |   W   |   E   |   R   |   T   |                  |   Y   |   U   |   I   |   O   |   P   |   \   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |Esc/Ctl|   A   |   S   |   D   |   F   |   G   |                  |   H   |   J   |   K   |   L   |   ;   |   '   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  | SC Sft|   Z   |   X   |   C   |   V   |   B   |                  |   N   |   M   |   ,   |   .   |   /   | SC Sft|
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/FN|                  |Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          | Ent/NS|  Bspc |  | Enter |Del/NS2|
-*                                          `---------------'  `---------------'
-*/
-[_QWERTY] = LAYOUT(
-  KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,   KC_T,                    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,   KC_S,    KC_D,    KC_F,   KC_G,                    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,                    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV, KC_LBRC, KC_RBRC, ALTAPP, SPCFN,                   BSPCFN, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                             ENTNS, KC_BSPC,  KC_ENT, DELNS
-),
-
-/* Number/symbol layer
-*  (Multiple characters: single-tap for first, double-tap for second)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |   6   |   7   |   8   |   9   |   0   |                  |   ^   |   &   |   *   |   (   |   )   |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |   1   |   2   |   3   |   4   |   5   |                  |   !   |   @   |   #   |   $   |   %   |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |   .   |  / *  |  - _  |  + =  |                  |  ` ~  |  [ {  |  ] }  |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),                   TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,                    _______,  _______,  _______,  _______, _______, _______,
-                                                  _______, _______,  _______, _______
-),
-
-/* Number/Function Key layer
-*  (Multiple characters: single-tap for first, double-tap for second)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |   6   |   7   |   8   |   9   |   0   |                  |   F7  |   F8  |   F9  |   F10 |   F11 |   F12 |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |   1   |   2   |   3   |   4   |   5   |                  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |   .   |  / *  |  - _  |  + =  |                  |  ` ~  |  [ {  |  ] }  |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMBERS2] = LAYOUT(
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12,
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,
-  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),                   TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,                    _______,  _______,  _______,  _______, _______, _______,
-                                                  _______, _______,  _______, _______
-),
-
-/* Function layer
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |       |       |   Up  |       |       |                  |       |       |   Up  | Ctrl+Y|       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | Ctrl+A|  Left |  Down | Right |C+A+Tab|                  |  PgUp | Right |  Down |  Left |  Home |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | Ctrl+Z| Ctrl+X| Ctrl+C| Ctrl+V|  Bspc |                  |  PgDn |  Mute |  Vol- |  Vol+ |  End  |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |       |       |       |       |       |       |                  |       |       |  Prev |  Play |  Next |  Stop |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-  _______, _______,    _______,    _______,    _______,    _______,                    _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP,
-                                                           _______, _______,  _______, _______
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-  _______, _______,    _______,    _______,    _______,    _______,                    _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP,
-                                                           _______, _______,  _______, _______
-),
-
-/* Numpad layer
-*  (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |  KP 6 |  KP 7 |  KP 8 |  KP 9 |  KP 0 |                  | NumLk |  KP 7 |  KP 8 |  KP 9 |  KP / |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |  KP 1 |  KP 2 |  KP 3 |  KP 4 |  KP 5 |                  |  Tab  |  KP 4 |  KP 5 |  KP 6 |  KP * |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | NumLk |  KP . |KP/ KP*| KP- _ | KP+ = |                  |       |  KP 1 |  KP 2 |  KP 3 |  KP - |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |  KP 0 |   =   |  KP . |  KP + |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  | KP Ent|       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, KC_P6,   KC_P7,    KC_P8,      KC_P9,     KC_P0,                      KC_NUM,  KC_P7, KC_P8,  KC_P9,   KC_PSLS, _______,
-  _______, KC_P1,   KC_P2,    KC_P3,      KC_P4,     KC_P5,                      KC_TAB,  KC_P4, KC_P5,  KC_P6,   KC_PAST, _______,
-  _______, KC_NUM,  KC_PDOT,  TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                  _______, KC_P1, KC_P2,  KC_P3,   KC_PMNS, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),   _______,   _______,                    _______, KC_P0, KC_EQL, KC_PDOT, KC_PPLS, _______,
-                                                     _______, _______,  KC_PENT, _______
-),
-
-/* Adjust layer
-*  (Enter/Number + Delete/Number2 to access; Numpad is a toggle)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |Colemak| Qwerty|       |       |       |                  | Numpad|       |       | Ctrl+Y|       | QK_BOOT |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |       |       |       |       |                  |       |NKROTog|       |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |       |       |       |       |                  |       |       |       |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |       |       |       |       |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-                                               _______, _______,  _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-                                               _______, _______,  _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAK);
-        layer_off ( _QWERTY);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _ADJUST);
-		layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _ADJUST);
-		layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-  }
-  return true;
-}