Refactor `1upkeyboards/sweet16v2` (#25610)

6 files changed, 42 insertions, 203 deletions

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 3978235e20..babbf38940 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1632,6 +1632,12 @@
     "1upkeyboards/sweet16": {
         "target": "1upkeyboards/sweet16/v1"
     },
+    "1upkeyboards/sweet16v2/kb2040": {
+        "target": "1upkeyboards/sweet16v2"
+    },
+    "1upkeyboards/sweet16v2/pro_micro": {
+        "target": "1upkeyboards/sweet16v2"
+    },
     "25keys/aleth42": {
         "target": "25keys/aleth42/rev1"
     },
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
deleted file mode 100644
index 40a0ec4039..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
+++ /dev/null
@@ -1,143 +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": {
-        "bootmagic": true,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false,
-        "rgb_matrix": true
-    },
-    "qmk": {
-        "locking": {
-            "enabled": true,
-            "resync": true
-        }
-    },
-    "ws2812": {
-        "pin": "GP6",
-        "driver": "vendor"
-    },
-    "matrix_pins": {
-        "cols": ["GP2", "GP9", "GP8", "GP7"],
-        "rows": ["GP26", "GP1", "GP18", "GP5"]
-    },
-    "diode_direction": "COL2ROW",
-    "dynamic_keymap": {
-        "layer_count": 10
-    },
-    "encoder": {
-        "enabled": true,
-        "rotary": [
-            {"pin_a": "GP27", "pin_b": "GP28"},
-            {"pin_a": "GP4", "pin_b": "GP3"}
-        ]
-    },
-    "rgb_matrix": {
-        "animmations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "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}
-        ],
-        "sleep": true
-    },
-    "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}
-            ]
-        }
-    }
-}
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json b/keyboards/1upkeyboards/sweet16v2/keyboard.json
index d8ff291e69..b84a43ff40 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
+++ b/keyboards/1upkeyboards/sweet16v2/keyboard.json
@@ -3,8 +3,7 @@
     "keyboard_name": "sweet16v2",
     "url": "1upkeyboards.com/shop/keyboard-kits/macro-pads/sweet-16-v2-macropad-kit/",
     "maintainer": "ziptyze",
-    "bootloader": "atmel-dfu",
-    "processor": "atmega32u4",
+    "development_board": "elite_c",
     "usb": {
         "device_version": "1.0.0",
         "pid": "0x5518",
@@ -15,7 +14,6 @@
         "encoder": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
         "rgb_matrix": true
     },
     "qmk": {
@@ -36,7 +34,6 @@
         "layer_count": 10
     },
     "encoder": {
-        "enabled": true,
         "rotary": [
             {"pin_a": "F6", "pin_b": "F5"},
             {"pin_a": "D4", "pin_b": "D0"}
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
deleted file mode 100644
index 6ccf21e18f..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
+++ /dev/null
@@ -1,41 +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/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_ortho_4x4(
-    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
-    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
-    MO(1),    KC_P0,    KC_PDOT,  KC_PENT
-  ),
-
-  [1] = LAYOUT_ortho_4x4(
-    RM_TOGG,   RM_HUEU,    RM_SATU,    RM_VALU,
-    RM_NEXT,   RM_HUED,    RM_SATD,    RM_VALD,
-    RM_SPDD,   RM_SPDU,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,    KC_TRNS,    QK_BOOT
-  )
-};
-
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),      ENCODER_CCW_CW(RM_VALD, RM_VALU)  },
-    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS),      ENCODER_CCW_CW(KC_TRNS, KC_TRNS)  }
-};
-#endif
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.json b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.json
new file mode 100644
index 0000000000..fd2a0dc766
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.json
@@ -0,0 +1,28 @@
+{
+    "keyboard": "1upkeyboards/sweet16v2",
+    "keymap": "default",
+    "coonfig": {
+        "features": {
+            "encoder_map": true
+        }
+    },
+    "layout": "LAYOUT_ortho_4x4",
+    "layers": [
+        [
+            "KC_P7", "KC_P8", "KC_P8",   "KC_PMNS",
+            "KC_P4", "KC_P5", "KC_P6",   "KC_PPLS",
+            "KC_P1", "KC_P2", "KC_P3",   "KC_PSLS",
+            "MO(1)", "KC_P0", "KC_PDOT", "KC_PENT"
+        ],
+        [
+            "RM_TOGG", "RM_HUEU", "RM_SATU", "RM_VALU",
+            "RM_NEXT", "RM_HUED", "RM_SATD", "RM_VALD",
+            "RM_SPDD", "RM_SPDU", "_______", "_______",
+            "_______", "_______", "_______", "QK_BOOT"
+        ]
+    ],
+    "encoders": [
+        [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "RM_VALD", "cw": "RM_VALU"}],
+        [{"ccw": "_______", "cw": "_______"}, {"ccw": "_______", "cw": "_______"}]
+    ]
+}
diff --git a/keyboards/1upkeyboards/sweet16v2/readme.md b/keyboards/1upkeyboards/sweet16v2/readme.md
index e3f5859f96..eacaf0d0ce 100644
--- a/keyboards/1upkeyboards/sweet16v2/readme.md
+++ b/keyboards/1upkeyboards/sweet16v2/readme.md
@@ -1,26 +1,18 @@
 # sweet16v2
 
-A 4x4 macropad with RGB inswitch lighting and underglow. 
+A 4x4 macropad with per-key RGB lighting and underglow.
 
 * Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
 * Hardware Supported: 1upkeyboards Sweet 16 v2
 * Hardware Availability: [1upkeyboards](https://1upkeyboards.com/)
 
-Make example for this keyboard using an atmel-based controller (after setting up your build environment):
+Make example for this keyboard (after setting up your build environment):
 
-    make 1upkeyboards/sweet16v2/promicro:default
+    make 1upkeyboards/sweet16v2:default
 
-Flashing example for this keyboard using an atmel-based controller:
+Flashing example for this keyboard:
 
-    make 1upkeyboards/sweet16v2/promicro:default:flash
-
-Make example for this keyboard using an rp2040-based controller (after setting up your build environment):
-
-    make 1upkeyboards/sweet16v2/kb2040:default
-
-Flashing example for this keyboard using an rp2040-based controller:
-
-    make 1upkeyboards/sweet16v2/kb2040:default:flash
+    make 1upkeyboards/sweet16v2:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
@@ -30,10 +22,10 @@ Enter the bootloader in 3 ways for atmel-based controllers:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 
 
 Enter the bootloader in 2 ways for rp2040-based controllers:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
-* **Bootsel button**: Hold the bootsel button on controller and plug in the keyboard
\ No newline at end of file
+* **Bootsel button**: Hold the bootsel button on controller and plug in the keyboard