Merge upstream master to 2022 Q4 breaking change

4 files changed, 0 insertions, 258 deletions

diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
deleted file mode 100644
index 8adae138df..0000000000
--- a/keyboards/xbows/numpad/config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.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/>.
- */
-#pragma once
-
-#include "config_common.h"
-
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 4
-#define MATRIX_ROW_PINS { B5, B4, C6, B6, D7, B3 }
-#define MATRIX_COL_PINS { D4, D6, B2, B1 }
-#define DIODE_DIRECTION COL2ROW
-#define DEBOUNCE 3
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_PROCESS_LIMIT 18
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED       // turn off effects when suspended
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-#    define RGB_MATRIX_CENTER \
-        { 30, 32 }
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
-#    define ENABLE_RGB_MATRIX_BREATHING           // Single hue brightness cycling animation
-#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL     // Single hue spinning spiral fades brightness
-#    define ENABLE_RGB_MATRIX_CYCLE_ALL           // Full keyboard solid hue cycling through full gradient
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT    // Full gradient scrolling left to right
-#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN       // Full gradient scrolling top to bottom
-#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN        // Full gradient scrolling out to in
-#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL      // Full gradient spinning pinwheel around center of keyboard
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL        // Full gradient spinning spiral around center of keyboard
-#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS   // Full dual gradients spinning two halfs of keyboard
-#    define ENABLE_RGB_MATRIX_RAINDROPS           // Randomly changes a single key's hue
-
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE   // Pulses keys hit to hue & value then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE          // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE     // Hue & value pulse near a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS    // Hue & value pulse the same column and row of a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SPLASH                  // Full gradient & value pulse away from a single key hit then fades value out
-#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH       // Hue & value pulse away from multiple key hits then fades value out
-
-#    define DRIVER_ADDR_1 0b1110111
-#    define DRIVER_COUNT 1
-#    define RGB_MATRIX_LED_COUNT 22
-#endif
diff --git a/keyboards/xbows/numpad/keymaps/default/keymap.c b/keyboards/xbows/numpad/keymaps/default/keymap.c
deleted file mode 100644
index 177478ef9f..0000000000
--- a/keyboards/xbows/numpad/keymaps/default/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.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/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   *
-   * |-------------------------------|
-   * |  Esc  |  Tab  |   BS  |   Fn  |
-   * |-------------------------------|
-   * |  NUM  |   /   |   *   |   =   |
-   * |-------------------------------|
-   * |   7   |  8    |   9   |   -   |
-   * |-------------------------------|
-   * |   4   |   5   |   6   |   +   |
-   * |-------------------------------|
-   * |   1   |  2   |    3   | ENTER |
-   * |-------------------------------|
-   * |        0     |    .   |
-   * |-----------------------|
-   */
-  [0] = LAYOUT(
-    KC_ESC ,  KC_TAB,   KC_BSPC,  MO(1),
-    KC_NUM,   KC_PSLS,  KC_PAST,  KC_EQL,
-    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
-    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-         KC_P0,       KC_PDOT),
-  [1] = LAYOUT(
-    QK_BOOT,   EE_CLR,    KC_TRNS,   KC_TRNS,
-    KC_CALC,   KC_MYCM,   KC_MSEL,   KC_MAIL,
-    RGB_MOD,   RGB_VAI,   RGB_HUI,   KC_VOLD,
-    RGB_SPD,   RGB_TOG,   RGB_SPI,   KC_VOLU,
-    KC_TRNS,   RGB_VAD,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,          KC_TRNS)
-};
diff --git a/keyboards/xbows/numpad/keymaps/via/keymap.c b/keyboards/xbows/numpad/keymaps/via/keymap.c
deleted file mode 100644
index 3fa5b77674..0000000000
--- a/keyboards/xbows/numpad/keymaps/via/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.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/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   *
-   * |-------------------------------|
-   * |  Esc  |  Tab  |   BS  |   Fn  |
-   * |-------------------------------|
-   * |  NUM  |   /   |   *   |   =   |
-   * |-------------------------------|
-   * |   7   |  8    |   9   |   -   |
-   * |-------------------------------|
-   * |   4   |   5   |   6   |   +   |
-   * |-------------------------------|
-   * |   1   |  2   |    3   | ENTER |
-   * |-------------------------------|
-   * |        0     |    .   |
-   * |-----------------------|
-   */
-  [0] = LAYOUT(
-    KC_ESC ,  KC_TAB,   KC_BSPC,  MO(1),
-    KC_NUM,   KC_PSLS,  KC_PAST,  KC_EQL,
-    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
-    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-    KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-         KC_P0,       KC_PDOT),
-  [1] = LAYOUT(
-    QK_BOOT,   EE_CLR,    KC_TRNS,   KC_TRNS,
-    KC_CALC,   KC_MYCM,   KC_MSEL,   KC_MAIL,
-    RGB_MOD,   RGB_VAI,   RGB_HUI,   KC_VOLD,
-    RGB_SPD,   RGB_TOG,   RGB_SPI,   KC_VOLU,
-    KC_TRNS,   RGB_VAD,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,          KC_TRNS),
-  [2] = LAYOUT(
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,          KC_TRNS),
-  [3] = LAYOUT(
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,          KC_TRNS)
-};
diff --git a/keyboards/xbows/numpad/numpad.c b/keyboards/xbows/numpad/numpad.c
deleted file mode 100644
index 4d6c256981..0000000000
--- a/keyboards/xbows/numpad/numpad.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 Shulin Huang <mumu@x-bows.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/>.
- */
- #include "numpad.h"
- #ifdef RGB_MATRIX_ENABLE
- const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
-
-  {0, C3_3,  C2_3, C1_3},   // L01
-  {0, C3_4,  C2_4, C1_4},   // L02
-  {0, C9_5,  C8_5, C7_5},   // L03
-  {0, C9_6,  C8_6, C7_6},   // L04
-
-  {0, C6_1,  C5_1, C4_1},   // L05
-  {0, C6_2,  C5_2, C4_2},   // L06
-  {0, C6_3,  C5_3, C4_3},   // L07
-  {0, C6_6,  C5_6, C4_6},   // L08
-
-  {0, C9_1,  C8_1, C7_1},   // L09
-  {0, C9_2,  C8_2, C7_2},   // L10
-  {0, C9_3,  C8_3, C7_3},   // L11
-  {0, C9_4,  C8_4, C7_4},   // L12
-
-  {0, C3_11,  C2_11, C1_11},   // L13
-  {0, C3_12,  C2_12, C1_12},   // L14
-  {0, C3_13,  C2_13, C1_13},   // L15
-  {0, C3_14,  C2_14, C1_14},   // L16
-
-  {0, C6_9,  C5_9, C4_9},      // L17
-  {0, C6_10,  C5_10, C4_10},   // L18
-  {0, C6_11,  C5_11, C4_11},   // L19
-  {0, C6_14,  C5_14, C4_14},   // L20
-
-  {0, C6_16,  C5_16, C4_16},   // L21
-  {0, C6_15,  C5_15, C4_15},   // L22
-
- };
-
- led_config_t g_led_config = { {
-     {  0,      1,      2,      3     },
-     {  4,      5,      6,      7     },
-     {  8,      9,      10,     11    },
-     {  12,     13,     14,     15    },
-     {  16,     17,     18,     19    },
-     {  20,     NO_LED, 21,     NO_LED}
- }, {
-    	{0,0},   {20,0},   {40,0},   {60,0},
-      {0,13},  {20,13},  {40,13},  {60,13},
-      {0,25},  {20,25},  {40,25},  {60,25},
-      {0,38},  {20,38},  {40,38},  {60,38},
-      {0,50},  {20,50},  {40,50},  {60,57},
-          {10,63},       {40,63}
- }, {
-     4, 4, 4, 4,
-     4, 4, 4, 4,
-     4, 4, 4, 4,
-     4, 4, 4, 4,
-     4, 4, 4, 4,
-      4,   4,
- } };
-
-
-bool rgb_matrix_indicators_kb(void) {
-    if (!rgb_matrix_indicators_user()) {
-        return false;
-    }
-    if (host_keyboard_led_state().num_lock) {
-        rgb_matrix_set_color(4, 0xFF, 0xFF, 0xFF);
-    }
-    return true;
-}
-
-#endif