Merge upstream master to 2022 Q4 breaking change

3 files changed, 0 insertions, 180 deletions

diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
deleted file mode 100644
index 3b0a332c42..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2022 ziptyze
- *
- * 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 DYNAMIC_KEYMAP_LAYER_COUNT 10
-#define RGB_DI_PIN GP6
-#define RGB_MATRIX_LED_COUNT 20
-#define RGBLED_NUM 20
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_SAT
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-/* 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
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
deleted file mode 100644
index 91fa580354..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-    "manufacturer": "1upkeyboards",
-    "keyboard_name": "sweet16v2",
-    "url": "1upkeyboards.com/shop/keyboard-kits/macro-pads/sweet-16-v2-macropad-kit/",
-    "maintainer": "ziptyze",
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "board": "GENERIC_RP_RP2040",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x5518",
-        "vid": "0x6F75"
-    },
-    "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
-    },
-    "matrix_pins": {
-        "cols": ["GP2",  "GP9", "GP8",  "GP7"],
-        "rows": ["GP26", "GP1", "GP18", "GP5"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "enabled": true,
-        "rotary": [
-            {
-                "pin_a": "GP27",
-                "pin_b": "GP28"
-            },
-            {
-                "pin_a": "GP4",
-                "pin_b": "GP3"
-            }
-        ]
-    },
-    "rgb_matrix": {
-        "driver": "WS2812",
-        "layout": [
-            { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 },
-            { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 },
-            { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 },
-            { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 },
-            { "flags": 2, "x": 196, "y": 17 },
-            { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 },
-            { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 },
-            { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 },
-            { "flags": 2, "x": 28, "y": 17 },
-            { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 },
-            { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 },
-            { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 },
-            { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 },
-            { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 },
-            { "flags": 2, "x": 196, "y": 47 },
-            { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 },
-            { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 },
-            { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 },
-            { "flags": 2, "x": 28, "y": 47 },
-            { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 }
-        ]
-    },
-    "community_layouts": [
-        "ortho_4x4"
-    ],
-    "layouts": {
-        "LAYOUT_ortho_4x4": {
-            "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [3, 0], "x": 0, "y": 3 },
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "x": 2, "y": 3 },
-                { "matrix": [3, 3], "x": 3, "y": 3 }
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
deleted file mode 100644
index 997fce7e65..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor