Merge upstream master to 2022 Q4 breaking change

6 files changed, 0 insertions, 399 deletions

diff --git a/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c b/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c
deleted file mode 100644
index c1068a4d2b..0000000000
--- a/keyboards/montsinger/rebound/rev1/keymaps/curry/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "curry.h"
-
-#define LAYOUT_rebound_base( \
-        K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-        K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
-        K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
-    ) \
-    LAYOUT_ortho_4x12_wrapper( \
-        KC_TAB,  K01,     K02,     K03,     K04,     K05,     K06,     K07,     K08,     K09,     K0A,     KC_BSPC, \
-        KC_ESC,  K11,     K12,     K13,     K14,     K15,     K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
-        KC_LSFT, K21,     K22,     K23,     K24,     K25,     K26,     K27,     K28,     K29,     K2A,     KC_ENT,  \
-        ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
-    )
-#define LAYOUT_rebound_base_wrapper(...)       LAYOUT_rebound_base(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-#if defined(ENABLE_QWERTY)
-    [_QWERTY] = LAYOUT_rebound_base_wrapper(
-        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
-        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
-        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
-    ),
-#endif
-
-#if defined(ENABLE_COLEMAK)
-    [_COLEMAK] = LAYOUT_rebound_base_wrapper(
-        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
-        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
-        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
-    ),
-#endif
-
-#if defined(ENABLE_DVORAK)
-    [_DVORAK] = LAYOUT_rebound_base_wrapper(
-        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
-        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
-        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
-    ),
-#endif
-
-#if defined(ENABLE_WORKMAN)
-    [_WORKMAN] = LAYOUT_rebound_base_wrapper(
-        _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
-        _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
-        _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
-    ),
-#endif
-
-    [_LOWER] = LAYOUT_ortho_4x12_wrapper(
-        KC_F11,  _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_F12,
-        KC_GRV,  _________________LOWER_L2__________________, _________________LOWER_R2__________________, KC_PIPE,
-        _______, _________________LOWER_L3__________________, _________________LOWER_R3__________________, _______,
-        _______, ___________________BLANK___________________, ___________________BLANK___________________, _______
-    ),
-
-    [_RAISE] = LAYOUT_ortho_4x12_wrapper(
-        _______, _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_DEL,
-        KC_TILD, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS,
-        _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______,
-        _______, ___________________BLANK___________________, ___________________BLANK___________________, _______
-    ),
-
-    [_ADJUST] =  LAYOUT_ortho_4x12_wrapper(
-        KC_MAKE, ___________________BLANK___________________, _________________ADJUST_R1_________________, KC_RST,
-        VRSN,    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EE_CLR,
-        MG_NKRO, ___________________BLANK___________________, _________________ADJUST_R3_________________, _______,
-        _______, ___________________BLANK___________________, ___________________BLANK___________________, _______
-    )
-
-
-};
diff --git a/keyboards/montsinger/rebound/rev2/keymaps/rossman360/keymap.c b/keyboards/montsinger/rebound/rev2/keymaps/rossman360/keymap.c
deleted file mode 100644
index eeb20b5c76..0000000000
--- a/keyboards/montsinger/rebound/rev2/keymaps/rossman360/keymap.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rossman360.h"
-
-#define PGMOD LT(_NUM, KC_PGDN)
-#define TABMOD LT(_FN1, KC_TAB)
-#define SPCMOD LT(_FN1, KC_SPACE)
-#define ENTMOD LT(_FN2, KC_ENTER)
-#define ESCMOD LT(_NUM, KC_ESC)
-#define RSMOD LT(_FN1, KC_RSFT)
-
-enum layer_names {
-  _BASE,
-  _DEL,
-  _FN1,
-  _FN2,
-  _NUM,
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_BASE] = LAYOUT_all(
-    KC_ESC  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,          KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , NTAB  ,
-    JUMPBACK, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,          KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
-    KC_LSFT , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,          KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_MINS,
-    CMDBSP  , ALTDEL , KC_NO  , CTRLSP , TABMOD , PGMOD  , KC_Y   , ENTMOD , SPCMOD , MO(_DEL),KC_NO  , KC_BSPC, KC_DEL
-  ),
-
-[_FN1] = LAYOUT_all(
-    _______, TAB1   , TAB2   , TAB3   , TAB4   , _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
-    KC_CAPS, _______, _______, _______, _______, _______,          KC_HOME, KC_LEFT, KC_UP  , KC_RIGHT,KC_END , KC_NO  ,
-    _______, _______, XPANDR , _______, _______, _______,          _______, PMERGE , KC_DOWN, _______, _______, _______,
-    WREFRESH,_______, _______, _______, LWORD  , RWORD  , KC_Y   , RVOLD  , RVOLU  , _______, _______, _______, _______
-  ),
-
-[_FN2] = LAYOUT_all(
-    _______, SPEAK1 , SPEAK2 , SPEAK3 , SPEAK4 , _______,          _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, PARADOWN, CSPEAK, KC_Y   , _______, _______, _______, _______, _______, _______
-  ),
-
-[_DEL] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
-    REMCAPS, _______, _______, _______, _______, _______,          _______, KC_LEFT, KC_UP  ,KC_RIGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______, KC_DOWN, _______, _______, _______,
-    _______, _______, _______, KC_DEL , KC_BSPC, BWORD  , KC_Y   , _______, _______, _______, _______, _______, _______
-  ),
-
-[_NUM] = LAYOUT_all(
-    _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,          KC_6   , KC_7   , KC_8   , KC_9   , KC_MINS, KC_EQL,
-    KC_CAPS, _______, _______, _______, _______, _______,          KC_MINS, KC_4   , KC_5   , KC_6   , KC_COLN, _______,
-    _______, _______, _______, _______, _______, KC_LBRC,          KC_RBRC, KC_1   , KC_2   , KC_3   , KC_BSLS, _______,
-    _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_Y   , _______, _______, KC_0   , _______, _______, _______
-  )
-};
diff --git a/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c b/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c
deleted file mode 100644
index f82aa822d1..0000000000
--- a/keyboards/montsinger/rebound/rev3/keymaps/rossman360/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rossman360.h"
-
-#define PGMOD LT(_NUM, KC_PGDN)
-#define TABMOD LT(_FN1, KC_TAB)
-#define SPCMOD LT(_FN1, KC_SPACE)
-#define ENTMOD LT(_FN2, KC_ENTER)
-#define ESCMOD LT(_NUM, KC_ESC)
-#define RSMOD LT(_FN1, KC_RSFT)
-
-enum layer_names {
-  _BASE,
-  _DEL,
-  _FN1,
-  _FN2,
-  _NUM,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_BASE] = LAYOUT_all(
-    KC_ESC  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,          KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , NTAB  ,
-    JUMPBACK, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,MO(_DEL), KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
-    KC_LSFT , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , LM(_FN1, MOD_LALT), KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_MINS,
-    CMDBSP  , ALTDEL , KC_NO  , CTRLSP , KC_TAB , PGMOD  , QUIT   , ENTMOD , SPCMOD , MO(_DEL),KC_NO  , KC_BSPC, KC_DEL
-  ),
-
-[_FN1] = LAYOUT_all(
-    _______, TAB1   , TAB2   , TAB3   , TAB4   , _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_UP  , KC_RIGHT,KC_END , KC_NO  ,
-    _______, _______, XPANDR , _______, _______, _______, _______, _______, PMERGE , KC_DOWN, _______, _______, EMDASH ,
-    WREFRESH,_______, _______, _______, LWORD  , RWORD  , _______, KC_NO  , _______, KC_NO  , _______, _______, _______
-  ),
-
-[_FN2] = LAYOUT_all(
-    _______, SPEAK1 , SPEAK2 , SPEAK3 , SPEAK4 , _______,          _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, PARADOWN, CSPEAK, _______, _______, KC_NO  , KC_NO  , _______, _______, _______
-  ),
-
-[_DEL] = LAYOUT_all(
-    QK_BOOT, _______, _______, _______, _______, _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
-    REMCAPS, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_UP  ,KC_RIGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, _______,
-    _______, _______, _______, KC_DEL , KC_BSPC, BWORD  , _______, KC_NO  , KC_NO  , _______, _______, _______, _______
-  ),
-
-[_NUM] = LAYOUT_all(
-    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,          KC_6   , KC_7   , KC_8   , KC_9   , KC_MINS, KC_EQL,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_MINS, KC_4   , KC_5   , KC_6   , KC_COLN, _______,
-    _______, _______, _______, _______, _______, KC_LBRC, _______, KC_RBRC, KC_1   , KC_2   , KC_3   , KC_BSLS, _______,
-    _______, _______, _______, _______, _______, _______, _______, KC_NO  , KC_NO  , KC_0   , _______, _______, _______
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-   switch(get_highest_layer(layer_state)){
-case _BASE:
-    if (clockwise) {
-      tap_code16(KC_VOLD);
-    } else {
-      tap_code16(KC_VOLU);
-    }
-   break;
- case _FN1:
-    if (clockwise) {
-      tap_code16(S(KC_TAB));
-    } else {
-      tap_code16(KC_TAB);
-    }
-   break;
-}
-    return true;
-}
-
-#ifdef OLED_ENABLE
-bool oled_task_user(void) {
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR(""), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case _BASE:
-            oled_write_P(PSTR("Rebound\n"), false);
-            oled_write_P(PSTR("Rev3.1\n"), false);
-	    break;
-        case _FN1:
-            oled_write_P(PSTR("Fn\n"), false);
-            break;
-        case _FN2:
-            oled_write_P(PSTR("Para\n"), false);
-            break;
-            case _NUM:
-            oled_write_P(PSTR("Num\n"), false);
-            break;
-            case _DEL:
-            oled_write_P(PSTR("Del\n"), false);
-            break;
-        default:
-            // Or use the write_ln shortcut over adding '\n' to the end of your string
-            oled_write_ln_P(PSTR("Undefined"), false);
-}
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-
-    return false;
-}
-
-#endif
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c
deleted file mode 100644
index c534fe3c6d..0000000000
--- a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  Copyright 2018-2022 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  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/>.
-*/
-
-// See: users/ericgebhart.
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk
deleted file mode 100644
index 28b8714100..0000000000
--- a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable the tap dance feature.
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c
deleted file mode 100644
index 16cc4393d0..0000000000
--- a/keyboards/montsinger/rebound/rev4/keymaps/rossman360/keymap.c
+++ /dev/null
@@ -1,122 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rossman360.h"
-
-#define PGMOD LT(_NUM, KC_PGDN)
-#define TABMOD LT(_FN1, KC_TAB)
-#define SPCMOD LT(_FN1, KC_SPACE)
-#define ENTMOD LT(_FN2, KC_ENTER)
-#define ESCMOD LT(_NUM, KC_ESC)
-#define RSMOD LT(_FN1, KC_RSFT)
-#
-
-enum layer_names {
-  _BASE,
-  _DEL,
-  _FN1,
-  _FN2,
-  _NUM,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_BASE] = LAYOUT_all(
-    KC_ESC  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,          KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , NTAB  ,
-    JUMPBACK, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,MO(_DEL), KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
-    KC_LSFT , KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , LM(_FN1, MOD_LALT), KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_MINS,
-    CMDBSP  , ALTDEL , KC_NO  , CTRLSP , TABMOD , PGMOD  , QUIT   , ENTMOD , SPCMOD , MO(_DEL),KC_NO  , KC_BSPC, KC_DEL
-  ),
-
-[_FN1] = LAYOUT_all(
-    _______, TAB1   , TAB2   , TAB3   , TAB4   , _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
-    KC_CAPS, _______, _______, _______, _______, _______, _______, KC_HOME, KC_LEFT, KC_UP  , KC_RIGHT,KC_END , KC_NO  ,
-    _______, _______, XPANDR , _______, PMERGE , _______, _______, _______, PMERGE , KC_DOWN, _______, _______, EMDASH ,
-    WREFRESH,_______, _______, _______, LWORD  , RWORD  , _______, KC_NO  , _______, KC_NO  , _______, _______, _______
-  ),
-
-[_FN2] = LAYOUT_all(
-    _______, SPEAK1 , SPEAK2 , SPEAK3 , SPEAK4 , _______,          _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, PARADOWN, CSPEAK, _______, _______, KC_NO  , KC_NO  , _______, _______, _______
-  ),
-
-[_DEL] = LAYOUT_all(
-    QK_BOOT, _______, _______, _______, _______, _______,          _______, UNDO   , _______, _______, _______, CTAB   ,
-    REMCAPS, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_UP  ,KC_RIGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, _______,
-    _______, _______, _______, BLINE  , KC_BSPC, BWORD  , _______, KC_NO  , KC_NO  , _______, _______, _______, _______
-  ),
-
-[_NUM] = LAYOUT_all(
-    KC_GRV , KC_1   , KC_7   , KC_8   , KC_9   , KC_5   ,          KC_6   , KC_7   , KC_8   , KC_9   , KC_MINS, KC_EQL,
-    KC_CAPS, _______, KC_4   , KC_5   , KC_6   , KC_BSPC, KC_LBRC, KC_MINS, KC_4   , KC_5   , KC_6   , KC_COLN, _______,
-    KC_COMM, KC_DOT , KC_1   , KC_2   , KC_3   ,KC_ENTER, KC_RBRC, KC_RBRC, KC_1   , KC_2   , KC_3   , KC_BSLS, _______,
-    _______, _______, _______, _______, KC_0   , _______, _______, KC_NO  , KC_NO  , KC_0   , _______, _______, _______
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-   switch(get_highest_layer(layer_state)){
-case _BASE:
-    if (clockwise) {
-      tap_code16(KC_VOLD);
-    } else {
-      tap_code16(KC_VOLU);
-    }
-   break;
-case _DEL:
-    if (clockwise) {
-      tap_code16(KC_F11);
-    } else {
-      tap_code16(KC_F3);
-    }
-   break;
-
- case _FN1:
-    if (clockwise) {
-      tap_code16(S(KC_TAB));
-    } else {
-      tap_code16(KC_TAB);
-    }
-   break;
-}
-    return true;
-}
-
-#ifdef OLED_ENABLE
-bool oled_task_user(void) {
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR(""), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case _BASE:
-            oled_write_P(PSTR("Rebound\n"), false);
-            oled_write_P(PSTR("Rev3.1\n"), false);
-	    break;
-        case _FN1:
-            oled_write_P(PSTR("Fn\n"), false);
-            break;
-        case _FN2:
-            oled_write_P(PSTR("Para\n"), false);
-            break;
-            case _NUM:
-            oled_write_P(PSTR("Num\n"), false);
-            break;
-            case _DEL:
-            oled_write_P(PSTR("Del\n"), false);
-            break;
-        default:
-            // Or use the write_ln shortcut over adding '\n' to the end of your string
-            oled_write_ln_P(PSTR("Undefined"), false);
-}
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-
-    return false;
-}
-
-#endif