Merge upstream master to 2022 Q4 breaking change

15 files changed, 0 insertions, 896 deletions

diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h
deleted file mode 100644
index 2d65035a8a..0000000000
--- a/keyboards/idobao/id61/config.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-// #define MATRIX_ROWS 5
-// #define MATRIX_COLS 15
-
-/* ----------------
- * RGB Matrix stuff
- * ---------------- */
-
-#define RGB_DI_PIN F0
-
-// RGB Matrix config
-#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)
-
-    #ifndef ID61_DISABLE_UNDERGLOW
-        #define RGB_MATRIX_LED_COUNT 71
-    #else
-        #define RGB_MATRIX_LED_COUNT 61  // = 71 - 10
-    #endif
-
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED     // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200  // limits maximum brightness of LEDs to {x} out of 255. If not defined maximum brightness is set to 255
-
-    #define RGB_MATRIX_KEYPRESSES
-
-    #define ENABLE_RGB_MATRIX_SOLID_COLOR               // Static single color
-    #define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-    #define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-    #define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-    #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_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradient Chevron shaped scrolling left to right
-    #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_DUAL_BEACON               // Full gradient spinning around center of keyboard
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning 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
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight amount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight amount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight amount and then back down in a wave to the right
-
-    /* RGB_MATRIX_FRAMEBUFFER_EFFECTS) */
-    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-    /* RGB_MATRIX_KEYPRESSES) | defined(RGB_MATRIX_KEYRELEASES) */
-    #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_MULTIWIDE  // Hue & value pulse near multiple key hits 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_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits 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_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & 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
-#endif  // RGB_MATRIX_ENABLE
-
-/* -----------------------
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- * ----------------------- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-// #define NO_ACTION_LAYER
-// #define NO_ACTION_TAPPING
-// #define NO_ACTION_ONESHOT
diff --git a/keyboards/idobao/id61/id61.c b/keyboards/idobao/id61/id61.c
deleted file mode 100644
index f6338c7133..0000000000
--- a/keyboards/idobao/id61/id61.c
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "id61.h"
-
-#define __ NO_LED
-
-#if defined(RGB_MATRIX_ENABLE)
-
-/* Pre-key
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │60 │59 │58 │57 │56 │55 │54 │53 │52 │51 │50 │49 │48 │  47   │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │ 46  │45 │44 │43 │42 │41 │40 │39 │38 │37 │36 │35 │34 │ 33  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │  32  │31 │30 │29 │28 │27 │26 │25 │24 │23 │22 │21 │   20   │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │   19   │18 │17 │16 │15 │14 │13 │12 │11 │10 │ 9 │    8     │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │ 7  │ 6  │ 5  │            4           │ 3  │ 2  │ 1  │ 0  │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- *
- * Underglow (from top / [Esc] = top left)
- * ┌────┬────┬────┬────┬────┐
- * │ 61 │ 62 │ 63 │ 64 │ 65 │
- * ├────┴────┴────┴────┴────┤
- * ├────┬────┬────┬────┬────┤
- * │ 70 │ 69 │ 68 │ 67 │ 66 │
- * └────┴────┴────┴────┴────┘
- */
-
-led_config_t g_led_config = { {
-    // Key Matrix to LED Index
-    { 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47 },
-    { 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33 },
-    { 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, __ },
-    { 19, __, 18, 17, 16, 15, 14, 13, 12, 11, 10,  9,  8, __ },
-    {  7,  6,  5, __, __, __,  4, __, __, __,  3,  2,  1,  0 },
-}, {
-    // LED Index to Physical Position
-    // generated from: https://xelus.netlify.app/guides/KLE_to_RGB_parser
-    /* NB: Reverse order! */
-    {224,64 }, {204,64 }, {184,64 }, {163,64 },                                  {103,64 },                                  { 42,64 }, { 22,64 }, {  2,64 },
-    {212,48 },            {182,48 }, {165,48 }, {149,48 }, {133,48 }, {117,48 }, {101,48 }, { 85,48 }, { 69,48 }, { 52,48 }, { 36,48 }, { 10,48 },
-    {216,32 }, {190,32 }, {174,32 }, {157,32 }, {141,32 }, {125,32 }, {109,32 }, { 93,32 }, { 77,32 }, { 61,32 }, { 44,32 }, { 28,32 }, {  6,32 },
-    {222,16 }, {202,16 }, {186,16 }, {170,16 }, {153,16 }, {137,16 }, {121,16 }, {105,16 }, { 89,16 }, { 73,16 }, { 57,16 }, { 40,16 }, { 24,16 }, {  4,16 },
-    {218,0  }, {194,0  }, {178,0  }, {161,0  }, {145,0  }, {129,0  }, {113,0  }, { 97,0  }, { 81,0  }, { 65,0  }, { 48,0  }, { 32,0  }, { 16,0  }, {  0,0  }
-    // underglow LEDs (positions pushed to nearest edge to match edge key colors)
-    #ifndef ID61_DISABLE_UNDERGLOW
-    , {  0,0  }, { 56,0  }, { 112,0  }, {168,0  }, {224,0  },
-    {224,64 }, {168,64 }, {112,64 }, { 56,64 }, { 0,64 }
-    #endif
-}, {
-    // LED Index to Flag
-    /* NB: Reverse order! */
-    1, 1, 1, 1,          4,          1, 1, 1,
-    1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 9,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-    // underglow LEDs
-    #ifndef ID61_DISABLE_UNDERGLOW
-    , 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2
-    #endif
-} };
-
-#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id61/id61.h b/keyboards/idobao/id61/id61.h
deleted file mode 100644
index d9bef6d021..0000000000
--- a/keyboards/idobao/id61/id61.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
deleted file mode 100644
index 2980d0bfdc..0000000000
--- a/keyboards/idobao/id61/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "manufacturer": "IDOBAO",
-    "keyboard_name": "ID61",
-    "maintainer": "vinorodrigues",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "debounce": 5,
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"],
-        "rows": ["B0", "B1", "B2", "B3", "F7"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://idobao.net/search?type=product&q=id61*",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x0061",
-        "vid": "0x6964"
-    },
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x":0, "y":0 },
-                { "label": "1!", "matrix": [0, 1], "x":1, "y":0 },
-                { "label": "2@", "matrix": [0, 2], "x":2, "y":0 },
-                { "label": "3#", "matrix": [0, 3], "x":3, "y":0 },
-                { "label": "4$", "matrix": [0, 4], "x":4, "y":0 },
-                { "label": "5%", "matrix": [0, 5], "x":5, "y":0 },
-                { "label": "6^", "matrix": [0, 6], "x":6, "y":0 },
-                { "label": "7&", "matrix": [0, 7], "x":7, "y":0 },
-                { "label": "8*", "matrix": [0, 8], "x":8, "y":0 },
-                { "label": "9(", "matrix": [0, 9], "x":9, "y":0 },
-                { "label": "0)", "matrix": [0, 10], "x":10, "y":0 },
-                { "label": "-_", "matrix": [0, 11], "x":11, "y":0 },
-                { "label": "=+", "matrix": [0, 12], "x":12, "y":0 },
-                { "label": "Backspace", "matrix": [0, 13], "x":13, "y":0, "w":2 },
-
-                { "label": "Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-                { "label": "Q", "matrix": [1, 1], "x":1.5, "y":1 },
-                { "label": "W", "matrix": [1, 2], "x":2.5, "y":1 },
-                { "label": "E", "matrix": [1, 3], "x":3.5, "y":1 },
-                { "label": "R", "matrix": [1, 4], "x":4.5, "y":1 },
-                { "label": "T", "matrix": [1, 5], "x":5.5, "y":1 },
-                { "label": "Y", "matrix": [1, 6], "x":6.5, "y":1 },
-                { "label": "U", "matrix": [1, 7], "x":7.5, "y":1 },
-                { "label": "I", "matrix": [1, 8], "x":8.5, "y":1 },
-                { "label": "O", "matrix": [1, 9], "x":9.5, "y":1 },
-                { "label": "P", "matrix": [1, 10], "x":10.5, "y":1 },
-                { "label": "[{", "matrix": [1, 11], "x":11.5, "y":1 },
-                { "label": "]}", "matrix": [1, 12], "x":12.5, "y":1 },
-                { "label": "\\|", "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 },
-
-                { "label": "Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-                { "label": "A", "matrix": [2, 1], "x":1.75, "y":2 },
-                { "label": "S", "matrix": [2, 2], "x":2.75, "y":2 },
-                { "label": "D", "matrix": [2, 3], "x":3.75, "y":2 },
-                { "label": "F", "matrix": [2, 4], "x":4.75, "y":2 },
-                { "label": "G", "matrix": [2, 5], "x":5.75, "y":2 },
-                { "label": "H", "matrix": [2, 6], "x":6.75, "y":2 },
-                { "label": "J", "matrix": [2, 7], "x":7.75, "y":2 },
-                { "label": "K", "matrix": [2, 8], "x":8.75, "y":2 },
-                { "label": "L", "matrix": [2, 9], "x":9.75, "y":2 },
-                { "label": ";:", "matrix": [2, 10], "x":10.75, "y":2 },
-                { "label": "'\"", "matrix": [2, 11], "x":11.75, "y":2 },
-                { "label": "Enter", "matrix": [2, 12], "x":12.75, "y":2, "w":2.25 },
-
-                { "label": "Shift", "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-                { "label": "Z", "matrix": [3, 2], "x":2.25, "y":3 },
-                { "label": "X", "matrix": [3, 3], "x":3.25, "y":3 },
-                { "label": "C", "matrix": [3, 4], "x":4.25, "y":3 },
-                { "label": "V", "matrix": [3, 5], "x":5.25, "y":3 },
-                { "label": "B", "matrix": [3, 6], "x":6.25, "y":3 },
-                { "label": "N", "matrix": [3, 7], "x":7.25, "y":3 },
-                { "label": "M", "matrix": [3, 8], "x":8.25, "y":3 },
-                { "label": ",<", "matrix": [3, 9], "x":9.25, "y":3 },
-                { "label": ".>", "matrix": [3, 10], "x":10.25, "y":3 },
-                { "label": "/?", "matrix": [3, 11], "x":11.25, "y":3 },
-                { "label": "Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 },
-
-                { "label": "Ctrl", "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-                { "label": "GUI", "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-                { "label": "Alt", "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-                { "label": "Space", "matrix": [4, 6], "x":3.75, "y":4, "w":6.25 },
-                { "label": "Fn", "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-                { "label": "Alt", "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-                { "label": "Menu", "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
-                { "label": "Ctrl", "matrix": [4, 13], "x":13.75, "y":4, "w":1.25 }
-            ]
-        }
-    }
-}
diff --git a/keyboards/idobao/id61/keymaps/default/keymap.c b/keyboards/idobao/id61/keymaps/default/keymap.c
deleted file mode 100644
index 0476f18024..0000000000
--- a/keyboards/idobao/id61/keymaps/default/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backspc│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
-     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  Shift   │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-     * │Ctrl│Win │Alt │                        │ Fn │Alt │Menu│Ctrl│
-     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-     */
-    [0] = LAYOUT_60_ansi(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RALT, KC_APP,  KC_RCTL
-    ),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-     * │ ~ │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-     * │     │   │ ↑ │   │   │Tog│Hu+│Sa+│Br+│Sp+│PSc│Hom│End│     │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-     * │      │ ← │ ↓ │ → │   │Mod│Hu-│Sa-│Br-│Sp-│PUp│PDn│        │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
-     * │        │   │   │   │   │Rst│NKR│   │   │Ins│Del│    ↑     │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-     * │    │    │    │                        │    │ ←  │ ↓  │ →  │
-     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-     */
-    [1] = LAYOUT_60_ansi(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-        _______, _______, KC_UP,   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_PSCR, KC_HOME, KC_END,  _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_PGUP, KC_PGDN, _______,
-        _______,          _______, _______, _______, _______, QK_BOOT, NK_TOGG, _______, _______, KC_INS,  KC_DEL,  KC_UP,
-        _______, _______, _______,                            _______,                            _______, KC_LEFT, KC_DOWN, KC_RGHT
-    )
-};
diff --git a/keyboards/idobao/id61/keymaps/idobao/config.h b/keyboards/idobao/id61/keymaps/idobao/config.h
deleted file mode 100644
index 81568ec7ae..0000000000
--- a/keyboards/idobao/id61/keymaps/idobao/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Denwir D60 has solid back case - no underglow LED's are visible. */
-#define ID61_DISABLE_UNDERGLOW
diff --git a/keyboards/idobao/id61/keymaps/idobao/keymap.c b/keyboards/idobao/id61/keymaps/idobao/keymap.c
deleted file mode 100644
index e670ca7b3e..0000000000
--- a/keyboards/idobao/id61/keymaps/idobao/keymap.c
+++ /dev/null
@@ -1,332 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "specialk.h"
-#include "version.h"
-
-typedef union {
-    uint32_t raw;
-    struct {
-        bool in_arrow_mode:1;
-        #ifdef RGB_MATRIX_ENABLE
-        bool rgb_disable_perkey:1;
-        #ifndef ID61_DISABLE_UNDERGLOW
-        bool rgb_disable_underglow:1;
-        #endif  // ID61_DISABLE_UNDERGLOW
-        #endif  // RGB_MATRIX_ENABLE
-    };
-} user_config_t;
-
-enum {
-    _BASE = 0,
-    _FN1,
-    _FN2,
-    _FN3
-};
-
-enum {
-    KC_MCON = USER00,  // macOS Open Mission Control
-    KC_LPAD,           // macOS Open Launchpad
-    KB_ARRW,           // toggle right modifiers are arrows feature
-    KB_RSFT,           // right shift or up arrow
-    KB_RALT,           // right alt or left arrow
-    KB_RAPP,           // menu or down arrow (Windows Menu)
-    KB_RCOM,           // right gui or left arrow (macOS Command)
-    KB_ROPT,           // right alt or down arrow (macOS Option)
-    KB_RCTL,           // right ctrl ot right arrow
-    KB_VRSN            // debug, type version
-};
-
-enum macos_consumer_usages {
-    _AC_SHOW_ALL_WINDOWS = 0x29F,  // mapped to KC_MCON
-    _AC_SHOW_ALL_APPS    = 0x2A0   // mapped to KC_LPAD
-};
-
-/* Special Keys */
-#define SK_LT1C LT(_FN1, KC_CAPS)  // Layer Tap 1, i.e., Tap = Caps Lock, Hold = Layer 1
-#define SK_LT2A LT(_FN2, KC_APP)   // Layer Tap 2, i.e., Tap = Menu, Hold = Layer 2
-
-/* key matrix */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backspc│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-     * │*Caps*│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │  *Caps* => Tap = Caps Lock, Hold = Layer 1 (Fn1)
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
-     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  ↑Shift  │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-     * │Ctrl│Win │Alt │                        │Fn1 │←Alt│↓Mnu│→Ctl│
-     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-     */
-    [_BASE] = LAYOUT_60_ansi(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,
-        SK_LT1C, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT, KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KB_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(_FN1), KB_RALT, KB_RAPP, KB_RCTL
-    ),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-     * │ ' │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│  Del  │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-     * │ArwMd│   │ ↑ │   │   │Tog│Hu+│Sa+│Br+│Sp+│PSc│Hom│End│ Ins │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-     * │      │ ← │ ↓ │ → │   │Mod│Hu-│Sa-│Br-│Sp-│   │PUp│        │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
-     * │        │   │   │   │Ver│Rst│NKR│   │   │   │PDn│          │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-     * │    │    │    │                        │    │    │    │    │
-     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-     */
-    [_FN1] = LAYOUT_60_ansi(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KB_ARRW, _______, KC_UP,   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_PSCR, KC_HOME, KC_END,  KC_INS,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, KC_PGUP, _______,
-        _______,          _______, _______, _______, KB_VRSN, QK_BOOT, NK_TOGG, _______, _______, _______, KC_PGDN, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-     * │      │   │   │   │   │   │   │   │   │   │   │   │        │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
-     * │        │   │   │   │   │   │   │   │   │   │   │          │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-     * │    │    │    │                        │    │    │    │    │
-     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-     */
-    [_FN2] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-
-    [_FN3] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    )
-};
-
-user_config_t user_config;
-
-#ifdef RGB_MATRIX_ENABLE
-
-/*
- * RGB Stuff
- */
-
-#define ID61_CAPS_LOCK_KEY_INDEX 32  // position of Caps Lock key
-
-#define ID61_CAPS_LOCK_MAX_BRIGHTNESS 0xFF
-#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #undef ID61_CAPS_LOCK_MAX_BRIGHTNESS
-    #define ID61_CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#endif
-
-#define ID61_CAPS_LOCK_VAL_STEP 8
-#ifdef RGB_MATRIX_VAL_STEP
-    #undef ID61_CAPS_LOCK_VAL_STEP
-    #define ID61_CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
-#endif
-
-void ID61_update_rgb_mode(void) {
-    uint8_t flags = LED_FLAG_ALL;
-
-    if (user_config.rgb_disable_perkey
-        #ifndef ID61_DISABLE_UNDERGLOW
-        && user_config.rgb_disable_underglow
-        #endif  // ID61_DISABLE_UNDERGLOW
-        ) {
-        flags = 0;  // All OFF Condition
-    } else {
-        if (user_config.rgb_disable_perkey) {
-            #ifndef ID61_DISABLE_UNDERGLOW
-            flags = LED_FLAG_UNDERGLOW | 0xF0;
-            #else
-            flags = 0xF0;
-            #endif  // ID61_DISABLE_UNDERGLOW
-        }
-        #ifndef ID61_DISABLE_UNDERGLOW
-        if (user_config.rgb_disable_underglow) {
-            flags = LED_FLAG_MODIFIER | LED_FLAG_KEYLIGHT | LED_FLAG_INDICATOR | 0xF0;
-        }
-        #endif  // ID61_DISABLE_UNDERGLOW
-    }
-
-    if (flags == 0) {
-        rgb_matrix_set_flags(0);
-        rgb_matrix_set_color_all(HSV_OFF);
-    } else {
-        rgb_matrix_set_flags(flags);
-        rgb_matrix_enable_noeeprom();
-    }
-
-    eeconfig_update_kb(user_config.raw);  // write back to EEPROM
-}
-
-void ID61_get_rgb_mode(void) {
-    user_config.raw = eeconfig_read_kb();  // read config from EEPROM
-    ID61_update_rgb_mode();
-}
-
-void keyboard_post_init_user(void) {
-    ID61_get_rgb_mode();
-}
-
-void eeconfig_init_user(void) {
-    // EEPROM is getting reset!
-    user_config.raw = 0;
-    ID61_update_rgb_mode();
-}
-
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    // Caps Lock key stuff
-
-    if (host_keyboard_led_state().caps_lock) {
-        uint8_t v = rgb_matrix_get_val();
-        if (v < ID61_CAPS_LOCK_VAL_STEP) {
-            v = ID61_CAPS_LOCK_VAL_STEP;
-        } else if (v < (ID61_CAPS_LOCK_MAX_BRIGHTNESS - ID61_CAPS_LOCK_VAL_STEP)) {
-            if (!user_config.rgb_disable_perkey) {
-                v += ID61_CAPS_LOCK_VAL_STEP;  // inc. by one more step than current brightness
-            }  // else leave as current brightness
-        } else {
-            v = ID61_CAPS_LOCK_MAX_BRIGHTNESS;
-        }
-        rgb_matrix_set_color(ID61_CAPS_LOCK_KEY_INDEX, v, v, v);  // white, brightness adjusted
-    } else if (user_config.rgb_disable_perkey) {
-        rgb_matrix_set_color(ID61_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
-    }
-}
-
-#endif  // RGB_MATRIX_ENABLE
-
-/*
- * Extra keys and RGB Toggle handler
- */
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-
-        // handle RGB toggle key - this ensures caps lock always works
-        #ifdef RGB_MATRIX_ENABLE
-
-        case QK_BOOT:
-            if (record->event.pressed) {
-                rgb_matrix_set_color_all(RGB_MATRIX_MAXIMUM_BRIGHTNESS, 0, 0);  // All red
-                rgb_matrix_driver.flush();
-            }
-            return true;
-
-        case RGB_TOG:
-            /* roll through the LED modes
-             * |    Level    | Per-key | Underglow |
-             * |-------------|---------|-----------|
-             * | 0 (default) |   on    |    on     |
-             * |     1       |   OFF   |    on     |
-             * |     2       |   on    |    OFF    |
-             * |     3       |   OFF   |    OFF    |
-             *
-             * for ID61_DISABLE_UNDERGLOW
-             * |    Level    | Per-key |
-             * |-------------|---------|
-             * | 0 (default) |   on    |
-             * |     1       |   OFF   |
-             */
-            if (record->event.pressed) {
-                if ( (!user_config.rgb_disable_perkey)
-                    #ifndef ID61_DISABLE_UNDERGLOW
-                    && (!user_config.rgb_disable_underglow)
-                    #endif  // ID61_DISABLE_UNDERGLOW
-                    ) {
-                    user_config.rgb_disable_perkey = 1;
-
-                #ifndef ID61_DISABLE_UNDERGLOW
-
-                } else if ( user_config.rgb_disable_perkey && (!user_config.rgb_disable_underglow) ) {
-                    user_config.rgb_disable_perkey = 0;
-                    user_config.rgb_disable_underglow = 1;
-
-                } else if ( (!user_config.rgb_disable_perkey) && user_config.rgb_disable_underglow ) {
-                    user_config.rgb_disable_perkey = 1;
-
-                #endif  // ID61_DISABLE_UNDERGLOW
-
-                } else {
-                    user_config.rgb_disable_perkey = 0;
-                    #ifndef ID61_DISABLE_UNDERGLOW
-                    user_config.rgb_disable_underglow = 0;
-                    #endif  // ID61_DISABLE_UNDERGLOW
-                }
-                ID61_update_rgb_mode();
-            }
-            return false;
-
-        case EE_CLR:
-            if (!record->event.pressed) {  // on release
-                ID61_get_rgb_mode();
-            }
-            return true;  // let this one pass on
-
-        #endif  // RGB_MATRIX_ENABLE
-
-        case KB_ARRW:
-            if (record->event.pressed) {
-                user_config.in_arrow_mode ^= 1;
-            }
-            return false;
-
-        case KB_RSFT: return ID61_process_special_k(keycode, record, user_config.in_arrow_mode, KC_RSFT, KC_UP, KC_PGUP);
-