Merge upstream master to 2022 Q4 breaking change

4 files changed, 0 insertions, 315 deletions

diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h
deleted file mode 100644
index b34a64a813..0000000000
--- a/keyboards/mixi/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
-    { D1, D4, F4 }, \
-    { D0, B4, F5 }, \
-    { C6, F7, B6 } \
-}
-
-#define ENCODERS_PAD_A { D7, B1 }
-#define ENCODERS_PAD_B { E6, B3 }
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
-#define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYER_BLINK
-#endif
diff --git a/keyboards/mixi/keymaps/default/keymap.c b/keyboards/mixi/keymaps/default/keymap.c
deleted file mode 100644
index d14a692a89..0000000000
--- a/keyboards/mixi/keymaps/default/keymap.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// please change this value to the desired layer definitions
-#define LAYERNUM 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*
-     * | Knob: Layer +/-                                |
-     * .------------------------------------------------.
-     * | Volume Mute | Media Play/Pause | Hold: Layer 2 |
-     * |-------------|------------------|---------------|
-     * | Media Prev  | Up               | Media Next    |
-     * |-------------|------------------|---------------|
-     * | Left        | Down             | Right         |
-     * '------------------------------------------------'
-     */
-    [0] =
-        LAYOUT(
-                KC_MUTE,  KC_MPLY, MO(2)  ,
-                KC_MPRV,  KC_UP  , KC_MNXT,
-                KC_LEFT, KC_DOWN , KC_RGHT
-              ),
-
-    /*
-     * | Knob: Layer +/-                                   |
-     * .---------------------------------------------------.
-     * | RGB Toggle     | Media Play/Pause | Hold: Layer 2 |
-     * |----------------|------------------|---------------|
-     * | Media Previous | RGB Bright+      | Media Next    |
-     * |----------------|------------------|---------------|
-     * | RGB Anim-      | RGB Bright-      | RGB Anim+     |
-     * '---------------------------------------------------'
-     */
-    [1] =
-        LAYOUT(
-                RGB_TOG , KC_TRNS, KC_TRNS,
-                KC_TRNS , RGB_VAI, KC_TRNS,
-                RGB_RMOD, RGB_VAD, RGB_MOD
-              ),
-
-    /*
-     * | Knob: Volume +/-                     |
-     * .--------------------------------------.
-     * | N/A          | N/A   | Hold: Layer 2 |
-     * |--------------|-------|---------------|
-     * | Clear EEPROM | Bootloader | Debug    |
-     * |--------------|-------|---------------|
-     * | N/A          | N/A   | N/A           |
-     * '--------------------------------------'
-     */
-    [2] =
-        LAYOUT(
-                KC_NO  , KC_NO, KC_TRNS,
-                EE_CLR,  QK_BOOT, DB_TOGG,
-                KC_NO  , KC_NO, KC_NO
-              )
-
-};
-
-const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_BLUE}
-        );
-const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_GREEN}
-        );
-const rgblight_segment_t PROGMEM _top_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_RED}
-        );
-
-const rgblight_segment_t* const PROGMEM _rgb_layers[] =
-RGBLIGHT_LAYERS_LIST(
-        _base_layer,
-        _middle_layer,
-        _top_layer
-        );
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = _rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-    switch (get_highest_layer(state)) {
-        case 0:
-            rgblight_blink_layer(0, 500);
-            break;
-        case 1:
-            rgblight_blink_layer(1, 500);
-            break;
-        case 2:
-            rgblight_blink_layer(2, 500);
-            break;
-    }
-    return state;
-}
-
-uint8_t selected_layer = 0;
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (layer_state_is(2)) {
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        } else {
-            if (clockwise && selected_layer < (LAYERNUM-2)) { /* Prevent switch to layer 2 using encoder */
-                selected_layer++;
-                layer_move(selected_layer);
-            } else if (!clockwise && selected_layer > 0) {
-                selected_layer--;
-                layer_move(selected_layer);
-            }
-        }
-    }
-    return true;
-}
diff --git a/keyboards/mixi/keymaps/via/keymap.c b/keyboards/mixi/keymaps/via/keymap.c
deleted file mode 100644
index ef5aace888..0000000000
--- a/keyboards/mixi/keymaps/via/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// please change this value to the desired layer definitions
-#define LAYERNUM 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*
-     * | Knob: Layer +/-                                |
-     * .------------------------------------------------.
-     * | Volume Mute | Media Play/Pause | Hold: Layer 2 |
-     * |-------------|------------------|---------------|
-     * | Media Prev  | Up               | Media Next    |
-     * |-------------|------------------|---------------|
-     * | Left        | Down             | Right         |
-     * '------------------------------------------------'
-     */
-    [0] =
-        LAYOUT(
-                KC_MUTE,  KC_MPLY, MO(2)  ,
-                KC_MPRV,  KC_UP  , KC_MNXT,
-                KC_LEFT, KC_DOWN , KC_RGHT
-              ),
-
-    /*
-     * | Knob: Layer +/-                                   |
-     * .---------------------------------------------------.
-     * | RGB Toggle     | Media Play/Pause | Hold: Layer 2 |
-     * |----------------|------------------|---------------|
-     * | Media Previous | RGB Bright+      | Media Next    |
-     * |----------------|------------------|---------------|
-     * | RGB Anim-      | RGB Bright-      | RGB Anim+     |
-     * '---------------------------------------------------'
-     */
-    [1] =
-        LAYOUT(
-                RGB_TOG , KC_TRNS, KC_TRNS,
-                KC_TRNS , RGB_VAI, KC_TRNS,
-                RGB_RMOD, RGB_VAD, RGB_MOD
-              ),
-
-    /*
-     * | Knob: Volume +/-                     |
-     * .--------------------------------------.
-     * | N/A          | N/A   | Hold: Layer 2 |
-     * |--------------|-------|---------------|
-     * | Clear EEPROM | Bootloader | Debug    |
-     * |--------------|-------|---------------|
-     * | N/A          | N/A   | N/A           |
-     * '--------------------------------------'
-     */
-    [2] =
-        LAYOUT(
-                KC_NO  , KC_NO, KC_TRNS,
-                EE_CLR,  QK_BOOT, DB_TOGG,
-                KC_NO  , KC_NO, KC_NO
-              ),
-
-    /*
-     * | Knob: N/A       |
-     * .-----------------.
-     * | N/A | N/A | N/A |
-     * |-----------------|
-     * | N/A | N/A | N/A |
-     * |-----------------|
-     * | N/A | N/A | N/A |
-     * '-----------------'
-     */
-    [3] =
-        LAYOUT(
-                KC_NO, KC_NO, KC_NO,
-                KC_NO, KC_NO, KC_NO,
-                KC_NO, KC_NO, KC_NO
-              )
-
-};
-
-const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_BLUE}
-        );
-const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_GREEN}
-        );
-const rgblight_segment_t PROGMEM _top_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, RGBLED_NUM, HSV_RED}
-        );
-
-const rgblight_segment_t* const PROGMEM _rgb_layers[] =
-RGBLIGHT_LAYERS_LIST(
-        _base_layer,
-        _middle_layer,
-        _top_layer
-        );
-
-void keyboard_post_init_user(void) {
-    rgblight_layers = _rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-    switch (get_highest_layer(state)) {
-        case 0:
-            rgblight_blink_layer(0, 500);
-            break;
-        case 1:
-            rgblight_blink_layer(1, 500);
-            break;
-        case 2:
-            rgblight_blink_layer(2, 500);
-            break;
-    }
-    return state;
-}
-
-uint8_t selected_layer = 0;
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (layer_state_is(2)) {
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        } else {
-            if (clockwise && selected_layer < (LAYERNUM-2)) { /* Prevent switch to layer 2 using encoder */
-                selected_layer++;
-                layer_move(selected_layer);
-            } else if (!clockwise && selected_layer > 0) {
-                selected_layer--;
-                layer_move(selected_layer);
-            }
-        }
-    }
-    return true;
-}
diff --git a/keyboards/mixi/mixi.c b/keyboards/mixi/mixi.c
deleted file mode 100644
index f99c942f2d..0000000000
--- a/keyboards/mixi/mixi.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "mixi.h"
-
-void eeconfig_init_kb(void) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_enable(); // Enable RGB underglow by default
-    rgblight_sethsv(0, 255, 255);
-#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // Set to RGB_RAINBOW_SWIRL animation by default
-#endif
-#endif
-
-    eeconfig_update_kb(0);
-    eeconfig_init_user();
-}