`develop` -> `master`, 2023q4 edition

author: Nick Brassel <nick@tzarc.org> 2023-11-28 16:39:48 +1100
committer: Nick Brassel <nick@tzarc.org> 2023-11-28 16:40:47 +1100
commit: 0115951de12bd4c798a43a380651c34552552e85 (patch)
tree: 62999011ae782d93aa6dc9c889615db2a840cafc /keyboards/rgbkb
parent: 0379d1f59e58cefa18cdb72ba1b77507d1108ae6 (diff)
parent: 4d99e0a23cff02f4c6e55e093b5de08a9be0df7c (diff)
32 files changed, 36 insertions, 1170 deletions
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index fd2e366614..87a7fe1319 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -41,9 +41,6 @@
 #endif
 
 /* Split Transport Features */
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
 #define RGB_MATRIX_LED_COUNT 98
@@ -119,6 +116,3 @@
 
 #define TOUCH_UPDATE_INTERVAL 33
 #define OLED_UPDATE_INTERVAL 33
-
-#define WEAR_LEVELING_BACKING_SIZE 4096
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/rgbkb/mun/keymaps/default/config.h b/keyboards/rgbkb/mun/keymaps/default/config.h
index 9fbbfc5901..88bdc06dee 100644
--- a/keyboards/rgbkb/mun/keymaps/default/config.h
+++ b/keyboards/rgbkb/mun/keymaps/default/config.h
@@ -19,5 +19,3 @@
 // 20m timeout (20m * 60s * 1000mil)
 // #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define STM32_ONBOARD_EEPROM_SIZE 2048
diff --git a/keyboards/rgbkb/mun/keymaps/via/config.h b/keyboards/rgbkb/mun/keymaps/via/config.h
index 002081a1c8..a0f581b50a 100644
--- a/keyboards/rgbkb/mun/keymaps/via/config.h
+++ b/keyboards/rgbkb/mun/keymaps/via/config.h
@@ -24,5 +24,3 @@
 // 224B per layer right now
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
-
-#define STM32_ONBOARD_EEPROM_SIZE 2048
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json
index 5d380de5c7..96d1a18e81 100644
--- a/keyboards/rgbkb/mun/rev1/info.json
+++ b/keyboards/rgbkb/mun/rev1/info.json
@@ -37,6 +37,11 @@
         "io_delay": 5
     },
     "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B8", "pin_b": "A14"},
@@ -47,7 +52,14 @@
         "tap_keycode_delay": 5
     },
     "split": {
-        "soft_serial_pin": "A9"
+        "soft_serial_pin": "A9",
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true
+            }
+        }
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 18dfc8edf7..4269e3b0a1 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -2,7 +2,7 @@
 VPATH += keyboards/rgbkb/common
 SRC += touch_encoder.c
 SRC += common_oled.c
-QUANTUM_LIB_SRC += i2c_master.c
+I2C_DRIVER_REQUIRED = yes
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c
index 023c766de6..d175be3641 100644
--- a/keyboards/rgbkb/pan/pan.c
+++ b/keyboards/rgbkb/pan/pan.c
@@ -22,7 +22,7 @@
 #        include "ws2812.h"
 
 // LED color buffer
-LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
+rgb_led_t rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
 
 static void init(void) {}
 
diff --git a/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c
deleted file mode 100644
index 88ad2f85be..0000000000
--- a/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "kageurufu.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-extern keymap_config_t keymap_config;
-extern uint8_t is_master;
-
-/* Base Layout
-  * ,------------------------------------------------.  ,------------------------------------------------.
-  * |   `  |      |      |      |      |      |      |  |      |      |      |      |      |      | BkSp |
-  * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-  * | Tab  |      |      |      |      |      |      |  |      |      |      |      |      |      |   \  |
-  * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-  * | Esc  |      |      |      |      |      |      |  |      |      |      |      |      |      |   '  |
-  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-  * | Sft( |      |      |      |      |      |      |  |      |      |      |      |      |      | Sft) |
-  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-  * | Ctrl |  Win |  Win |  Alt |  FN  | Space|  RGB |  |  FN  |  FN  |   -  |   =  | Down | PgUp | PgDn |
-  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-  *                                    | Space| Bksp |  | Enter| Space|
-  *                                    `-------------'  `--------=----'
-  */
-#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__)
-#define _BASE_LAYOUT( \
-  _00, _01, _02, _03, _04,  _05, _06, _07, _08, _09, \
-  _10, _11, _12, _13, _14,  _15, _16, _17, _18, _19, \
-  _20, _21, _22, _23, _24,  _25, _26, _27, _28, _29 \
-) \
-EXPAND_LAYOUT( \
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   RGB_MOD,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-      KC_TAB,  _00,     _01,     _02,     _03,     _04,    KC_LBRC,  KC_RBRC, _05,     _06,     _07,     _08,     _09,     KC_BSLS, \
-      FN_ESC,  _10,     _11,     _12,     _13,     _14,    RGB_SAI,  RGB_VAI, _15,     _16,     _17,     _18,     _19,     KC_QUOT, \
-      SC_LSPO, _20,     _21,     _22,     _23,     _24,    RGB_SAD,  RGB_VAD, _25,     _26,     _27,     _28,     _29,     SC_RSPC, \
-      KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT, FN,      KC_SPC, FN,       FN,      KC_SPC,  KC_MINS, KC_EQL,  KC_DOWN, KC_PGUP, KC_PGDN, \
-                                                   KC_SPC, KC_BSPC,  KC_ENT,  KC_SPC \
-)
-#define BASE_LAYOUT(...) _BASE_LAYOUT(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = BASE_LAYOUT(
-      _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
-      _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
-      _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
-  ),
-
-  [_COLEMAK] = BASE_LAYOUT(
-      _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
-      _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
-      _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
-  ),
-
-  [_COLEMAK_DH] = BASE_LAYOUT(
-      ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
-      ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
-      ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
-  ),
-
-  [_FN] = EXPAND_LAYOUT(
-      ________________FUNCTION_L1________________, _______, KC_PSCR, ________________FUNCTION_R1________________,
-      ________________FUNCTION_L2________________, _______, _______, ________________FUNCTION_R2________________,
-      ________________FUNCTION_L3________________, _______, _______, ________________FUNCTION_R3________________,
-      ________________FUNCTION_L4________________, _______, _______, ________________FUNCTION_R4________________,
-      ________________FUNCTION_L5________________, ADJ,     ADJ,     ________________FUNCTION_R5________________,
-                                          _______, KC_DEL,  _______, _______
-      ),
-
-  [_ADJ] = EXPAND_LAYOUT(
-      _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________,
-      _________________ADJUST_L2_________________, _______, _______, _________________ADJUST_R2_________________,
-      _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________,
-      _________________ADJUST_L4_________________, _______, _______, _________________ADJUST_R4_________________,
-      _________________ADJUST_L5_________________, _______, _______, _________________ADJUST_R5_________________,
-                                          _______, _______, _______, _______
-      )
-};
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-    return true;
-}
-#endif
diff --git a/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
deleted file mode 100644
index 0399e8427a..0000000000
--- a/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Overridden build options from rev1 & rev2
-
-# Debug Options
-CONSOLE_ENABLE          = yes       # Console for debug(+400)
-COMMAND_ENABLE          = yes       # Commands for debug and configuration
-
-# RGB Options
-RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not enable with RGB Matrix
-LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
-RGB_MATRIX_ENABLE       = yes       # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-
-# Userspace implements their own LTO
-LTO_ENABLE = no
-
-
-
-# Do not edit past here
-
-include keyboards/$(KEYBOARD)/post_rules.mk
diff --git a/keyboards/rgbkb/sol/keymaps/xulkal/config.h b/keyboards/rgbkb/sol/keymaps/xulkal/config.h
deleted file mode 100644
index ab75c5419c..0000000000
--- a/keyboards/rgbkb/sol/keymaps/xulkal/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// Xulkal custom stuff
-#if KEYBOARD_rgbkb_sol_rev2
-    #define OLED_90ROTATION
-    #define RGB_MATRIX_TOG_LAYERS
-    #define RGB_MATRIX_HUE_STEP 8
-    #define RGB_MATRIX_SAT_STEP 8
-    #define RGB_MATRIX_VAL_STEP 8
-    #define RGB_MATRIX_SPD_STEP 8
-#endif
-
-#define ENCODER_RESOLUTION 2
diff --git a/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c b/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c
deleted file mode 100644
index c5bb86656a..0000000000
--- a/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "xulkal.h"
-
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__)
-
-// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty Layout
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * | GESC |   1  |   2  |  3   |  4   |  5   |   -  |  |   =  |  6   |  7   |  8   |  9   |  0   | BkSp |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |  E   |  R   |  T   |   [  |  |   ]  |  Y   |  U   |  I   |  O   |  P   |   \  |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |FN(CAPS)| A  |   S  |   D  |  F   |  G   |   `  |  |   '  |  H   |  J   |  K   |  L   |  ;   | Enter|
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Sft[ |   Z  |   X  |   C  |  V   |  B   | RGB  |  |RGBRST|  N   |  M   |  ,   |  .   |  /   | Sft] |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Ctl- |  Win | LOWER| RAISE| Alt  | Space| ENC1 |  | ENC2 | Space| Left |  Up  | Down | Right| Ctl= |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    | Space| DEL  |  | Enter| Space|
-   *                                    `-------------'  `-------------'
-   */
-  [_QWERTY] = EXPAND_LAYOUT(
-    _________________QWERTY_L1_________________,  KC_MINS,  KC_EQL,   _________________QWERTY_R1_________________,
-    _________________QWERTY_L2_________________,  KC_LBRC,  KC_RBRC,  _________________QWERTY_R2_________________,
-    _________________QWERTY_L3_________________,  KC_GRV,   KC_QUOT,  _________________QWERTY_R3_________________,
-    _________________QWERTY_L4_________________,  RGB_TOG,  RGBRST,   _________________QWERTY_R4_________________,
-    _________________QWERTY_L5_________________,  KC_ENC1,  KC_ENC2,  _________________QWERTY_R5_________________,
-                                         KC_SPC,  TD_DEL,   KC_ENT,   KC_SPC
-  ),
-
-#ifndef GAMELAYER_DISABLE
-  [_GAME] = EXPAND_LAYOUT(
-    ___________________GAME_L1_________________,  KC_MINS,  KC_EQL,   ___________________GAME_R1_________________,
-    ___________________GAME_L2_________________,  KC_LBRC,  KC_RBRC,  ___________________GAME_R2_________________,
-    ___________________GAME_L3_________________,  KC_GRV,   KC_QUOT,  ___________________GAME_R3_________________,
-    ___________________GAME_L4_________________,  RGB_TOG,  RGBRST,   ___________________GAME_R4_________________,
-    ___________________GAME_L5_________________,  KC_ENC1,  KC_ENC2,  ___________________GAME_R5_________________,
-                                         KC_SPC,  KC_DEL,   KC_ENT,   KC_SPC
-  ),
-#endif
-
-  [_LOWER] =  EXPAND_LAYOUT(
-    __________________LOWER_L1_________________, KC_PMNS, KC_PPLS, __________________LOWER_R1_________________,
-    __________________LOWER_L2_________________, _______, _______, __________________LOWER_R2_________________,
-    __________________LOWER_L3_________________, _______, _______, __________________LOWER_R3_________________,
-    __________________LOWER_L4_________________, _______, _______, __________________LOWER_R4_________________,
-    __________________LOWER_L5_________________, _______, _______, __________________LOWER_R5_________________,
-                                        _______, _______, _______, _______
-  ),
-
-  [_RAISE] = EXPAND_LAYOUT(
-    __________________RAISE_L1_________________, _______, _______, __________________RAISE_R1_________________,
-    __________________RAISE_L2_________________, _______, _______, __________________RAISE_R2_________________,
-    __________________RAISE_L3_________________, _______, _______, __________________RAISE_R3_________________,
-    __________________RAISE_L4_________________, _______, _______, __________________RAISE_R4_________________,
-    __________________RAISE_L5_________________, _______, _______, __________________RAISE_R5_________________,
-                                        _______, _______, _______, _______
-  ),
-
-#ifdef TRILAYER_ENABLED
-  [_ADJUST] = EXPAND_LAYOUT(
-    _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________,
-    _________________ADJUST_L2_________________, _______, _______, _________________ADJUST_R2_________________,
-    _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________,
-    _________________ADJUST_L4_________________, _______, _______, _________________ADJUST_R4_________________,
-    _________________ADJUST_L5_________________, _______, _______, _________________ADJUST_R5_________________,
-                                        _______, _______, _______, _______
-  ),
-#endif
-};
-
diff --git a/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk b/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk
deleted file mode 100644
index 9100034a72..0000000000
--- a/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Overridden build options from rev1 & rev2
-
-# RGB Options
-RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not enable with RGB Matrix
-LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
-RGB_MATRIX_ENABLE       = yes       # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-FULLHAND_ENABLE         = no        # Enables the additional 24 Full Hand LEDs
-SF_ENABLE               = no        # Enables the additional 38 Starfighter LEDs
-
-# Misc
-OLED_ENABLE     = yes       # Enable the OLED Driver
-
-# Not using the encoder for rev1
-ifeq ($(strip $(KEYBOARD)), rgbkb/sol/rev1)
-    ENCODER_ENABLE = no
-	RGB_OLED_MENU = no
-else
-	ENCODER_ENABLE = yes
-	RGB_OLED_MENU = 0
-endif
-
-# Do not edit past here
-
-include keyboards/$(KEYBOARD)/post_rules.mk
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 3a0b61bfd5..102ebcda95 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -41,15 +41,8 @@
 #endif
 
 /* Split Transport Features */
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
 #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
 
-/* LED Turbo DIP Switch */
-#define DIP_SWITCH_PINS { A14, B13 }
-#define DIP_SWITCH_PINS_RIGHT { A14, B0 }
-
 #define RGB_MATRIX_LED_COUNT 156
 #define RGB_MATRIX_SPLIT { 78, 78 }
 #define RGB_MATRIX_CENTER { 81, 28 }
@@ -125,6 +118,3 @@
 #define AUDIO_CLICKY
 #define AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
 #define AUDIO_DAC_OFF_VALUE 0
-
-#define WEAR_LEVELING_BACKING_SIZE 4096
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/rgbkb/sol3/keymaps/default/config.h b/keyboards/rgbkb/sol3/keymaps/default/config.h
index 7e46726115..88bdc06dee 100644
--- a/keyboards/rgbkb/sol3/keymaps/default/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/default/config.h
@@ -19,6 +19,3 @@
 // 20m timeout (20m * 60s * 1000mil)
 // #define RGB_MATRIX_TIMEOUT 1200000
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define STM32_ONBOARD_EEPROM_SIZE 2048
-
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h b/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
deleted file mode 100644
index b6416d9bf8..0000000000
--- a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/kageurufu> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. Frank Tackitt
- * ----------------------------------------------------------------------------
- */
-
-#pragma once
-
-// No need for the single versions when multi performance isn't a problem =D
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define DISABLE_RGB_MATRIX_SPLASH
-#define DISABLE_RGB_MATRIX_SOLID_SPLASH
-
-// 20m timeout (20m * 60s * 1000mil)
-// #define RGB_MATRIX_TIMEOUT 1200000
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-// 224B per layer right now
-#define DYNAMIC_KEYMAP_LAYER_COUNT 8
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
-
-#define STM32_ONBOARD_EEPROM_SIZE 2048
-
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
deleted file mode 100644
index 0f92110ff4..0000000000
--- a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/kageurufu> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. Frank Tackitt
- * ----------------------------------------------------------------------------
- */
-
-#include QMK_KEYBOARD_H
-#include "kageurufu.h"
-
-extern keymap_config_t keymap_config;
-
-/* Base Layout
-  * ,------------------------------------------------.  ,------------------------------------------------.
-  * |   `  |      |      |      |      |      |      |  |      |      |      |      |      |      | BkSp |
-  * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-  * | Tab  |      |      |      |      |      |      |  |      |      |      |      |      |      |   \  |
-  * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-  * | Esc  |      |      |      |      |      |      |  |      |      |      |      |      |      |   '  |
-  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-  * | Sft( |      |      |      |      |      |      |  |      |      |      |      |      |      | Sft) |
-  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-  * | Ctrl |  Win |  Win |  Alt |  FN  | Space|  RGB |  |  FN  |  FN  |   -  |   =  | Down | PgUp | PgDn |
-  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-  *                                    | Space| Bksp |  | Enter| Space|
-  *                                    `-------------'  `--------=----'
-  */
-#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__, \
-      KC_MNXT, KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU,                                                       KC_MNXT, KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU )
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = EXPAND_LAYOUT(
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    RGB_MOD,                   KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-      KC_TAB,  _________________QWERTY_L1_________________, KC_LBRC,                   KC_RBRC, _________________QWERTY_R1_________________, KC_BSLS,
-      FN_ESC,  _________________QWERTY_L2_________________, RGB_SAI,                   RGB_VAI, _________________QWERTY_R2_________________, KC_QUOT,
-      SC_LSPO, _________________QWERTY_L3_________________, RGB_SAD,                   RGB_VAD, _________________QWERTY_R3_________________, SC_RSPC,
-      KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT, FN,      KC_SPC,  KC_MUTE, KC_BSPC, KC_ENT,  FN,      KC_SPC,  KC_MINS, KC_EQL,  KC_DOWN, KC_PGUP, KC_PGDN
-  ),
-
-  [_FN] = EXPAND_LAYOUT(
-      ________________FUNCTION_L1________________, _______,                   KC_PSCR, ________________FUNCTION_R1________________,
-      ________________FUNCTION_L2________________, _______,                   _______, ________________FUNCTION_R2________________,
-      ________________FUNCTION_L3________________, _______,                   _______, ________________FUNCTION_R3________________,
-      ________________FUNCTION_L4________________, _______,                   _______, ________________FUNCTION_R4________________,
-      ________________FUNCTION_L5________________, ADJ,     KC_DEL,  _______, ADJ,     ________________FUNCTION_R5________________
-      ),
-
-  [_ADJ] = EXPAND_LAYOUT(
-      _________________ADJUST_L1_________________, _______,                   _______, _________________ADJUST_R1_________________,
-      _________________ADJUST_L2_________________, _______,                   _______, _________________ADJUST_R2_________________,
-      _________________ADJUST_L3_________________, _______,                   _______, _________________ADJUST_R3_________________,
-      _________________ADJUST_L4_________________, _______,                   _______, _________________ADJUST_R4_________________,
-      _________________ADJUST_L5_________________, _______, _______, _______, _______, _________________ADJUST_R5_________________
-
-      )
-
-};
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0]       = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU),
-                  ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1 ... 4] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______),
-                  ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
-};
-#endif
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk
deleted file mode 100644
index f1adcab005..0000000000
--- a/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/sol3/keymaps/via/config.h b/keyboards/rgbkb/sol3/keymaps/via/config.h
index ff1ff77472..7b7f806261 100644
--- a/keyboards/rgbkb/sol3/keymaps/via/config.h
+++ b/keyboards/rgbkb/sol3/keymaps/via/config.h
@@ -25,6 +25,3 @@
 // 224B per layer right now
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
-
-#define STM32_ONBOARD_EEPROM_SIZE 2048
-
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json
index b80161995f..c76e1f84dc 100644
--- a/keyboards/rgbkb/sol3/rev1/info.json
+++ b/keyboards/rgbkb/sol3/rev1/info.json
@@ -37,6 +37,14 @@
         "io_delay": 5
     },
     "diode_direction": "COL2ROW",
+    "dip_switch": {
+        "pins": ["A14", "B13"]
+    },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A1", "pin_b": "A2"},
@@ -45,6 +53,11 @@
         ]
     },
     "split": {
+        "dip_switch": {
+            "right": {
+                "pins": ["A14", "B0"]
+            }
+        },
         "soft_serial_pin": "A9",
         "encoder": {
             "right": {
@@ -60,6 +73,13 @@
                 "cols": ["B9", "B8", "B4", "A6", "A3", "B10", "B12", "B11"],
                 "rows": ["B15", "B14", "A8", "A13", "A7", null]
             }
+        },
+        "transport": {
+            "sync": {
+                "indicators": true,
+                "layer_state": true,
+                "matrix_state": true
+            }
         }
     },
     "qmk": {
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 9cb54cfa15..227219e302 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -2,7 +2,7 @@
 VPATH += keyboards/rgbkb/common
 SRC += touch_encoder.c
 SRC += common_oled.c
-QUANTUM_LIB_SRC += i2c_master.c
+I2C_DRIVER_REQUIRED = yes
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h b/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h
deleted file mode 100644
index 016aeb1c56..0000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-  Copyright (c) 2020 Fred Silberberg
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#pragma once
-
-
-/* Select hand configuration */
-//#define MASTER_LEFT
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#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 RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-
-#undef  TAPPING_TERM
-#define TAPPING_TERM 150
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
deleted file mode 100644
index de8e9dd67c..0000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-  Copyright (c) 2020 Fred Silberberg
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-*/
-
-#include QMK_KEYBOARD_H
-#include "333fred.h"
-
-extern keymap_config_t keymap_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------.             .-----------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  |  -   |
- * |------+------+------+------+------+------|             |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+------|             |------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|             |------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |SHIFT |
- * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------|
- * | Ctrl |  F4  |  F5  |  GUI | Alt  | Bksp |Lwr/VM||Enter|Space |  NAV |   -  |   =  |  Alt | Del  |
- * `------------------------------------------------''-----------------------------------------------'
- */
-[BASE] = LAYOUT(
-  KC_GRV,        KC_1,         KC_2,  KC_3,    KC_4,    KC_5,                            KC_6,     KC_7,     KC_8,    KC_9,    KC_0,    KC_MINUS,
-  KC_TAB,        KC_Q,         KC_W,  KC_E,    KC_R,    KC_T,                            KC_Y,     KC_U,     KC_I,    KC_O,    KC_P,    KC_BSLS,
-  KC_ESC,        KC_A,         KC_S,  KC_D,    KC_F,    KC_G,                            KC_H,     KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X,  KC_C,    KC_V,    KC_B,                            KC_N,     KC_M,     KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT) ,
-  KC_LCTL,       KC_F4,        KC_F5, KC_LGUI, KC_LALT, KC_BSPC, TD(TD_SYM_VIM), KC_ENT, KC_SPACE, OSL(VIM), KC_MINS, KC_EQL,  KC_RALT, KC_DEL
-),
-
-/* Symbols
- * ,-----------------------------------------.              .-----------------------------------------.
- * | Caps |  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * |      |   !  |   @  |   (  |   )  |   |  |              |   7  |   8  |   9  |   *  |   )  |  F12 |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * |      |   #  |   $  |   {  |   }  |   `  |              |   4  |   5  |   6  |   +  |   }  |  |   |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * | APscr|   %  |   ^  |   [  |   ]  |   ~  |              |   1  |   2  |   3  |   \  | Vol- | Vol+ |
- * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
- * | Pscr |      | QK_BOOT|      |      | GAME |      ||      |   0  |   .  |   =  | Prev | Next | Play |
- * `------------------------------------------------- -------------------------------------------------'
- */
-[SYMB] = LAYOUT(
-    KC_CAPS,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6, KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11,
-    _______,     KC_EXLM, KC_AT,   KC_LPRN, KC_RPRN, KC_PIPE,                    KC_7,  KC_8,   KC_9,   KC_ASTR, KC_RPRN, KC_F12,
-    _______,     KC_HASH, KC_DLR,  KC_LCBR, KC_RCBR, KC_GRV,                     KC_4,  KC_5,   KC_6,   KC_PLUS, KC_RCBR, KC_PIPE,
-    PSCREEN_APP, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                    KC_1,  KC_2,   KC_3,   KC_BSLS, KC_VOLD, KC_VOLU,
-    KC_PSCR,     _______, QK_BOOT, _______, _______, TO(GAME), _______, _______, KC_0,  KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY
-),
-
-/* Vim Movement
- * ,-----------------------------------------.              .-----------------------------------------.
- * |      |      |      |      |      |      |              |      |      |      |      | QK_BOOT|      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * |      |RGBSAI|RGBVAI|RGBSAD| LSFT |      |              |      |      |      |      |      |      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * |      | DLeft|DRight| LCTRL| LGUI |      |              | Left | Down |  Up  | Right|      |      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * |      |RGBHUD|RGBVAD|RGBHUI|      |      |              |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      ||      |      |      |      |      |      |      |
- * `------------------------------------------------..------------------------------------------------'
- */
-[VIM] =  LAYOUT(
-    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, QK_BOOT, _______,
-    _______, RGB_SAI, RGB_VAI, RGB_SAD, KC_LSFT, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, DLEFT,   DRIGHT,  KC_LCTL, KC_LGUI, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-    _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______,                   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-
-/* Gaming mode (Raise)
- * All one-shot mods are disabled on this layer
- * ,-----------------------------------------.              .-----------------------------------------.
- * | ESC  |      |      |      |      |      |              |      |      |      |      |      |      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * |      |      |      |      |      |      |              |      |      |      |      |      |      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * | CTRL |      |      |      |      |      |              |      |      |      |      |      |      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * | Shift|   Z  |      |      |      |      |              |      |      |      |      |      |  GUI |
- * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
- * | Enter|      | Lock | Bksp |  Alt |  Spc | QK_BOOT||      | Lower| Left |  Up  | Down | Right|QWERTY|
- * `------------------------------------------------..-----------------------------------------------'
- */
-[GAME] =  LAYOUT(
-    KC_ESC,  _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-    _______, _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-    KC_LCTL, _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-    KC_LSFT, KC_Z,           _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI,
-    KC_ENT,  TG(GAME_ARROW), QK_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE)
-),
-/* Gaming Arrow mode (Raise)
- * Turns wasd into arrows
- * ,-----------------------------------------.              .-----------------------------------------.
- * | ESC  |      |      |      |      |      |              |      |      |      |      |      |      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * |      |      |  Up  |      |      |      |              |      |      |      |      |      |      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * | CTRL | Left | Down | Right|      |      |              |      |      |      |      |      |      |
- * |------+------+------+------+------+------|              |------+------+------+------+------+------|
- * | Shift|   Z  |      |      |      |      |              |      |      |      |      |      |  GUI |
- * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
- * | Enter|      | Lock | Bksp |  Alt |  Spc | QK_BOOT||      | Lower| Left |  Up  | Down | Right|QWERTY|
- * `------------------------------------------------..-----------------------------------------------'
- */
-[GAME_ARROW] =  LAYOUT(
-    KC_ESC,  _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_UP,   _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-    KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                    _______, _______, _______, _______, _______, _______,
-    KC_LSFT, KC_Z,    _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI,
-    KC_ENT,  _______, QK_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE)
-)
-};
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    tap_dance_process_keycode(keycode);
-    return true;
-}
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
deleted file mode 100644
index a5b4454073..0000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = yes
-KEY_LOCK_ENABLE = yes
-CONSOLE_ENABLE = no
-LTO_ENABLE = yes
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
deleted file mode 100644
index e4ece8082b..0000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2020 Casey Webster <casey@e1337.dev>
-
-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
-
-#define EE_HANDS
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/keymap.c
deleted file mode 100644
index 7001395669..0000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2020 Casey Webster <casey@e1337.dev>
- *
- * 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
-#include "rev1.h"
-#include "cwebster2.h"
-
-#define LAYOUT_zen_base( \
-    L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, \
-    L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, \
-    L21, L22, L23, L24, L25, R25, R24, R23, R22, R21,  \
-              L33, L34, L35, R35, R34, R33 \
-    ) \
-    LAYOUT_zen_wrapper ( \
-    KC_ESC,   KC_1, KC_2, KC_3, KC_4, KC_5,                                    KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, \
-    KC_GRV,   L01,  L02,  L03,  L04,  L05,                                     R05,  R04,  R03,  R02,  R01,  KC_BSLS, \
-    KC_CTLBS, L11,  L12,  L13,  L14,  L15,                                     R15,  R14,  R13,  R12,  R11,  KC_QUOT, \
-    KC_EQL,   L21,  L22,  L23,  L24,  L25,                                     R25,  R24,  R23,  R22,  R21,  KC_MINS, \
-    KC_LCCL, KC_LGUI,  SCMD_T(KC_LBRC), C_S_T(KC_MINS), L33, L34, L35, R35, R34, R33, TO(_GAME), KC_PSCR, KC_ALTCL, KC_LSFT \
-        )
-#define LAYOUT_zen_base_wrapper(...)       LAYOUT_zen_base(__VA_ARGS__)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * Base Layer: QWERTY
- */
-    [_QWERTY] = LAYOUT_zen_base_wrapper(
- /* ,-----------------------.                 ,-----------------------. */
-      _______QWERTY_L1______,                 _______QWERTY_R1______,
-      _______QWERTY_L2______,                 _______QWERTY_R2______,
-      _______QWERTY_L3______,                 _______QWERTY_R3______,
-              _______THUMBS_L_______,  _______THUMBS_R_______
- /*           `---------------------'  `---------------------' */
-    ),
-    [_COLEMAK] = LAYOUT_zen_wrapper(
- /* ,-----------------------.                 ,-----------------------. */
-     KC_ESC,   KC_1, KC_2, KC_3, KC_4, KC_5,                                    KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
-     KC_GRV,   _______COLEMAK_L1_____,                                                        _______COLEMAK_R1_____, KC_BSLS,
-     KC_CTLBS, _______COLEMAK_L2_____,                                                        _______COLEMAK_R2_____, KC_SCLN,
-     KC_EQL,   _______COLEMAK_L3_____,                                                        _______COLEMAK_R3_____, KC_MINS,
-     KC_LCCL, KC_LGUI, SCMD_T(KC_LBRC), C_S_T(KC_MINS), _______THUMBS_L_______,   _______THUMBS_R_______, TO(_QWERTY), KC_PSCR, KC_ALTCL, KC_LSFT
- /*           `---------------------'  `---------------------' */
-    ),
- // GAME layout -- qwerty without homerow mods
-    [_GAME] = LAYOUT_zen_wrapper(
- /* ,-------------------------------------------.                              ,-------------------------------------------. */
-    KC_ESC,   KC_1, KC_2, KC_3, KC_4, KC_5,                                    KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
-    KC_GRV,   _______QWERTY_L1______,                                     _______QWERTY_R1______, KC_BSLS,
-    KC_CTLBS, KC_A, KC_S, KC_D, KC_F, KC_G,                               KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
-    KC_EQL,   _______QWERTY_L3______,                                     _______QWERTY_R3______, KC_MINS,
-    KC_LCCL, KC_LGUI,  SCMD_T(KC_LBRC), C_S_T(KC_MINS), _______THUMBS_L_______,   _______THUMBS_R_______, TO(_COLEMAK), KC_PSCR, KC_ALTCL, KC_LSFT
- /*                        `----------------------------------'  `----------------------------------' */
-    ),
-    [_FN] = LAYOUT_zen_base_wrapper(
- /* ,-----------------------.                 ,-----------------------. */
-      _______FN_______L1____,                 _______INACTIVE_R1____,
-      _______FN_______L2____,                 _______INACTIVE_R2____,
-      _______FN_______L3____,                 _______NAV______R2____,
-              _______FN________T____,  _______INACTIVE__T____
- /*           `---------------------'  `---------------------' */
-      ),
-    [_SYMBOLS] = LAYOUT_zen_base_wrapper(
- /* ,-----------------------.                 ,-----------------------. */
-      _______SYM______L1____,                 _______INACTIVE_R1____,
-      _______SYM______L2____,                 _______INACTIVE_R2____,
-      _______SYM______L3____,                 _______INACTIVE_R3____,
-              _______SYM_______T____,  _______INACTIVE__T____
- /*           `---------------------'  `---------------------' */
-    ),
-    [_NUM] = LAYOUT_zen_base_wrapper(
- /* ,-----------------------.                 ,-----------------------. */
-      _______NUM______L1____,                 _______INACTIVE_R1____,
-      _______NUM______L2____,                 _______INACTIVE_R2____,
-      _______NUM______L3____,                 _______INACTIVE_R3____,
-              _______NUM_______T____,  _______INACTIVE__T____
- /*           `---------------------'  `---------------------' */
-      ),
-    [_NAV] = LAYOUT_zen_base_wrapper(
- /* ,-----------------------.                 ,-----------------------. */
-      _______INACTIVE_L1____,                 _______NAV______R1____,
-      _______INACTIVE_L2____,                 _______NAV______R2____,
-      _______INACTIVE_L3____,                 _______NAV______R3____,
-              _______INACTIVE__T____,  _______NAV_______T____
- /*           `---------------------'  `---------------------' */
-      ),
-    [_MOUSE] = LAYOUT_zen_base_wrapper(
- /* ,-----------------------.                 ,-----------------------. */
-      _______INACTIVE_L1____,                 _______MOUSE____R1____,
-      _______INACTIVE_L2____,                 _______MOUSE____R2____,
-      _______INACTIVE_L3____,                 _______MOUSE____R3____,
-              _______INACTIVE__T____,  _______MOUSE_____T____
- /*           `---------------------'  `---------------------' */
-      ),
-    [_MEDIA] = LAYOUT_zen_base_wrapper(
- /* ,-----------------------.                 ,-----------------------. */
-      _______INACTIVE_L1____,                 _______MEDIA____R1____,
-      _______INACTIVE_L2____,                 _______MEDIA____R2____,
-      _______INACTIVE_L3____,                 _______MEDIA____R3____,
-              _______INACTIVE__T____,  _______MEDIA_____T____
- /*           `---------------------'  `---------------------' */
-     ),
-};
-
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/rules.mk
deleted file mode 100644
index 632a5f610d..0000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/cwebster2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no
-RAW_ENABLE = yes
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c
deleted file mode 100644
index fe974e4248..0000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "kageurufu.h"
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-
-extern keymap_config_t keymap_config;
-extern uint8_t is_master;
-
-
-#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__)
-#define _BASE_LAYOUT( \
-  _00, _01, _02, _03, _04,  _05, _06, _07, _08, _09, \
-  _10, _11, _12, _13, _14,  _15, _16, _17, _18, _19, \
-  _20, _21, _22, _23, _24,  _25, _26, _27, _28, _29 \
-) \
-EXPAND_LAYOUT( \
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-      KC_TAB,  _00,     _01,     _02,     _03,     _04,                       _05,     _06,     _07,     _08,     _09,     KC_BSLS, \
-      FN_ESC,  _10,     _11,     _12,     _13,     _14,                       _15,     _16,     _17,     _18,     _19,     KC_QUOT, \
-      SC_LSPO, _20,     _21,     _22,     _23,     _24,                       _25,     _26,     _27,     _28,     _29,     SC_RSPC, \
-      KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT, FN,      KC_SPC, KC_BSPC,  KC_ENT,  KC_SPC,  KC_MINS, KC_EQL,  KC_DOWN, KC_PGUP, KC_PGDN \
-)
-#define BASE_LAYOUT(...) _BASE_LAYOUT(__VA_ARGS__)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = BASE_LAYOUT(
-      _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
-      _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
-      _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
-  ),
-
-  [_COLEMAK] = BASE_LAYOUT(
-      _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
-      _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
-      _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
-  ),
-
-  [_COLEMAK_DH] = BASE_LAYOUT(
-      ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
-      ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
-      ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
-  ),
-
-  [_FN] = EXPAND_LAYOUT(
-      ________________FUNCTION_L1________________,                   ________________FUNCTION_R1________________,
-      ________________FUNCTION_L2________________,                   ________________FUNCTION_R2________________,
-      ________________FUNCTION_L3________________,                   ________________FUNCTION_R3________________,
-      ________________FUNCTION_L4________________,                   ________________FUNCTION_R4________________,
-      ________________FUNCTION_L5________________, _______, KC_DEL,  ________________FUNCTION_R5________________
-      ),
-
-  [_ADJ] =  EXPAND_LAYOUT(
-      _________________ADJUST_L1_________________,                   _________________ADJUST_R1_________________,
-      _________________ADJUST_L2_________________,                   _________________ADJUST_R2_________________,
-      _________________ADJUST_L3_________________,                   _________________ADJUST_R3_________________,
-      _________________ADJUST_L4_________________,                   _________________ADJUST_R4_________________,
-      _________________ADJUST_L5_________________, _______, _______, _________________ADJUST_R5_________________
-      )
-};
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/config.h b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/config.h
deleted file mode 100644
index dc06487ce8..0000000000
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// place overrides here
-
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
deleted file mode 100644
index 984a829735..0000000000
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "kageurufu.h"
-
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-#define FN_CAPS  LT(_FN, KC_CAPS)
-
-// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns
-  /*  / Base Layout \
-   * /-----------------------------------------\  /-----------------------------------------\
-   * | GESC |  1   |  2   |  3   |  4   |  5   |  |  6   |  7   |  8   |  9   |  0   | BkSp |
-   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-   * | Tab  |      |      |      |      |      |  |      |      |      |      |      |   \  |
-   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-   * |FNCAPS|      |      |      |      |      |  |      |      |      |      |      |   '  |
-   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |  |      |      |      |      |      |Shift |
-   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-   * | Ctrl |  Win |  Alt |  RGB | ADJ  | Space|  | Space|  FN  | Left | Down | Up   |Right |
-   * \------+------+------+------+------+------/  \------+------+------+------+------+------/
-   */
-#define EXPAND_LAYOUT(...) LAYOUT_ortho_5x12(__VA_ARGS__)
-#define _BASE_LAYOUT( \
-  _00, _01, _02, _03, _04,  _05, _06, _07, _08, _09, \
-  _10, _11, _12, _13, _14,  _15, _16, _17, _18, _19, \
-  _20, _21, _22, _23, _24,  _25, _26, _27, _28, _29 \
-) \
-EXPAND_LAYOUT( \
-      QK_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-      KC_TAB,  _00,     _01,     _02,     _03,     _04,    _05,     _06,     _07,     _08,     _09,     KC_BSLS, \
-      FN_CAPS, _10,     _11,     _12,     _13,     _14,    _15,     _16,     _17,     _18,     _19,     KC_QUOT, \
-      KC_LSFT, _20,     _21,     _22,     _23,     _24,    _25,     _26,     _27,     _28,     _29,     KC_ENT, \
-      KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG,  ADJ,    KC_SPC, KC_SPC,  FN,      KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT \
-)
-#define BASE_LAYOUT(...) _BASE_LAYOUT(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = BASE_LAYOUT(
-    _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
-    _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
-    _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
-  ),
-
-  [_COLEMAK] = BASE_LAYOUT(
-    _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
-    _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
-    _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
-  ),
-
-  [_FN] = EXPAND_LAYOUT(
-    ________________FUNCTION_L1________________, ________________FUNCTION_R1________________,
-    ________________FUNCTION_L2________________, ________________FUNCTION_R2________________,
-    ________________FUNCTION_L3________________, ________________FUNCTION_R3________________,
-    ________________FUNCTION_L4________________, ________________FUNCTION_R4________________,
-    ________________FUNCTION_L5________________, ________________FUNCTION_R5________________
-  ),
-
-  [_ADJ] =  EXPAND_LAYOUT(
-    _________________ADJUST_L1_________________, _________________ADJUST_R1_________________,
-    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________,
-    _________________ADJUST_L3_________________, _________________ADJUST_R3_________________,
-    _________________ADJUST_L4_________________, _________________ADJUST_R4_________________,
-    _________________ADJUST_L5_________________, _________________ADJUST_R5_________________
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code(KC_PGDN);
-    } else {
-      tap_code(KC_PGUP);
-    }
-  } else if (index == 1) { /* Second encoder from slave */
-    if (clockwise) {
-      tap_code(KC_UP);
-    } else {
-      tap_code(KC_DOWN);
-    }
-  }
-    return true;
-}
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/readme.md b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/readme.md
deleted file mode 100644
index 35148c3b01..0000000000
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/readme.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# The Default Zygomorph Layout
-## Layout
-
-### Base modifier layout
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * | GESC |      |      |      |      |      |   -  |  |   =  |      |      |      |      |      | BkSp |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * | Tab  |      |      |      |      |      |   [  |  |   ]  |      |      |      |      |      |   \  |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |FN(CAPS)|    |      |      |      |      |   (  |  |   )  |      |      |      |      |      |   '  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |   {  |  |   }  |      |      |      |      |      |Shift |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Ctrl |  Win |  Alt |  RGB | ADJ  | Space| DEL  |  | Enter| Space|  FN  | Left | Down | Up   |Right |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    | Space| DEL  |  | Enter| Space|
-   *                                    `-------------'  `-------------'
-```
-
-### Qwerty alphas
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   Q  |   W  |   E  |   R  |   T  |      |  |      |   Y  |   U  |   I  |   O  |   P  |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   A  |   S  |   D  |   F  |   G  |      |  |      |   H  |   J  |   K  |   L  |   ;  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |   Z  |   X  |   C  |   V  |   B  |      |  |      |   N  |   M  |   ,  |   .  |   /  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-```
-
-### Colemak alphas
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   Q  |   W  |   F  |   P  |   B  |      |  |      |   J  |   L  |   U  |   Y  |   ;  |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |   A  |   R  |   S  |   T  |   G  |      |  |      |   K  |   N  |   E  |   I  |   O  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |   Z  |   X  |   C  |   D  |   V  |      |  |      |   M  |   H  |   ,  |   .  |   /  |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-```
-
-### Function (FN)
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |  |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | PGDN |  UP  | PGUP |      |      |      |  |      |      | PGDN |  UP  | PGUP | PRINT| HOME |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | LEFT | DOWN | RIGHT|      |      |      |  |      |      | LEFT | DOWN | RIGHT|INSERT| END  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |RGBMOD|      |      |      |  |      |      | PLAY | NEXT | MUTE | VOL- | VOL+ |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-```
-
-### Adjust (ADJ)
-```
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |  |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | SAD  | VAI  | SAI  | RESET|      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | HUD  | VAD  | HUI  |RGBRST|      |      |  |      |      |QWERTY|COLEMK|      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |RGBTOG|  HUI |  SAI | VAI  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |RGBMOD|      |      |      |  |      |      |      |RGBSMOD| HUD |  SAD | VAD  |
-   * `------+------+------+------+------+------+------|  |------+------+------+------+------+------+------'
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-```
-
-## Customize
-
-see `qmk_firmware/keyboards/sol/rev1/keymaps/default/rules.mk`
-
-```
-
-# Variables you can set for SOL
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-LED_ANIMATIONS = yes        # LED animations
-RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight (+8500)
-RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects. Can be very laggy (+1500)
-RGBLIGHT_FULL_POWER = no    # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
-UNICODE_ENABLE = no         # Unicode
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-ENCODER_ENABLE_CUSTOM = yes # Enable rotary encoder (+90)
-
-OLED_ENABLE = no            # OLED_ENABLE (+5000)
-IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
-
-
-```
-## Compile
-
-go to qmk top directory.
-```
-$ cd qmk_firmware
-```
-
-build
-```
-$ make rgbkb/sol:default
-```
-
-After the initial flash with AVRdudess, you should be able to flash using this:
-```
-$ make rgbkb/sol:default:dfu
-```
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
deleted file mode 100644
index b95d2edaaa..0000000000
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = yes       # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
-RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
-RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
-UNICODE_ENABLE = no         # Unicode
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-ENCODER_ENABLE = yes        # Enable rotary encoder
-OLED_ENABLE = no     # Enable the OLED Driver
-IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
-
-# Do not edit past here
-
-ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
-    OPT_DEFS += -DIOS_DEVICE_ENABLE
-else ifeq ($(strip $(RGBLIGHT_FULL_POWER)), yes)
-    OPT_DEFS += -DRGBLIGHT_FULL_POWER
-endif
-
-ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
-    OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
-endif
-
-ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
-    OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
-endif
-
-# Link time optimization, should save on firmware size
-LTO_ENABLE = yes
diff --git a/keyboards/rgbkb/zygomorph/keymaps/xulkal/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/xulkal/keymap.c
deleted file mode 100644
index 74c4c0cf50..0000000000
--- a/keyboards/rgbkb/zygomorph/keymaps/xulkal/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "xulkal.h"
-
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-#define EXPAND_LAYOUT(...) LAYOUT_ortho_5x12(__VA_ARGS__)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /*  / QWERTY \
-   * /-----------------------------------------\  /-----------------------------------------\
-   * | GESC |   1  |   2  |  3   |  4   |  5   |  |  6   |  7   |  8   |  9   |  0   | BkSp |
-   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |  E   |  R   |  T   |  |  Y   |  U   |  I   |  O   |  P   |   \  |
-   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-   * |FN(CAPS)| A  |   S  |   D  |  F   |  G   |  |  H   |  J   |  K   |  L   |  ;   | Enter|
-   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-   * | Sft[ |   Z  |   X  |   C  |  V   |  B   |  |  N   |  M   |  ,   |  .   |  /   | Sft] |
-   * |------+------+------+------+------+------|  |------+------+------+------+------+------|
-   * | Ctl- |  Win | LOWER| RAISE| Alt  | Space|  | Space| Left |  Up  | Down | Right| Ctl= |
-   * \------+------+------+------+------+------/  \------+------+------+------+------+------/
-   */
-  [_QWERTY] = EXPAND_LAYOUT(
-    _________________QWERTY_L1_________________,  _________________QWERTY_R1_________________,
-    _________________QWERTY_L2_________________,  _________________QWERTY_R2_________________,
-    _________________QWERTY_L3_________________,  _________________QWERTY_R3_________________,
-    _________________QWERTY_L4_________________,  _________________QWERTY_R4_________________,
-    _________________QWERTY_L5_________________,  _________________QWERTY_R5_________________
-  ),
-
-#ifndef GAMELAYER_DISABLE
-  [_GAME] = EXPAND_LAYOUT(
-    ___________________GAME_L1_________________,  ___________________GAME_R1_________________,
-    ___________________GAME_L2_________________,  ___________________GAME_R2_________________,
-    ___________________GAME_L3_________________,  ___________________GAME_R3_________________,
-    ___________________GAME_L4_________________,  ___________________GAME_R4_________________,
-    ___________________GAME_L5_________________,  ___________________GAME_R5_________________
-  ),
-#endif
-
-  [_LOWER] =  EXPAND_LAYOUT(
-    __________________LOWER_L1_________________,  __________________LOWER_R1_________________,
-    __________________LOWER_L2_________________,  __________________LOWER_R2_________________,
-    __________________LOWER_L3_________________,  __________________LOWER_R3_________________,
-    __________________LOWER_L4_________________,  __________________LOWER_R4_________________,
-    __________________LOWER_L5_________________,  __________________LOWER_R5_________________
-  ),
-
-  [_RAISE] = EXPAND_LAYOUT(
-    __________________RAISE_L1_________________,  __________________RAISE_R1_________________,
-    __________________RAISE_L2_________________,  __________________RAISE_R2_________________,
-    __________________RAISE_L3_________________,  __________________RAISE_R3_________________,
-    __________________RAISE_L4_________________,  __________________RAISE_R4_________________,
-    __________________RAISE_L5_________________,  __________________RAISE_R5_________________
-  ),
-
-#ifdef TRILAYER_ENABLED
-  [_ADJUST] = EXPAND_LAYOUT(
-    _________________ADJUST_L1_________________,  _________________ADJUST_R1_________________,
-    _________________ADJUST_L2_________________,  _________________ADJUST_R2_________________,
-    _________________ADJUST_L3_________________,  _________________ADJUST_R3_________________,
-    _________________ADJUST_L4_________________,  _________________ADJUST_R4_________________,
-    _________________ADJUST_L5_________________,  _________________ADJUST_R5_________________
-  ),
-#endif
-};
diff --git a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
deleted file mode 100644
index 69d469b1e9..0000000000
--- a/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = no        # Enable global lighting effects. Do not enable with RGB Matrix
-RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
-RGB_MATRIX_ENABLE = yes  	# Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
-SPLIT_RGB_MATRIX_ENABLE = yes # For split RGB Matrix support
-RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
-UNICODE_ENABLE = no         # Unicode
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-ENCODER_ENABLE = no         # Enable rotary encoder
-OLED_ENABLE = no     # Enable the OLED Driver
-IOS_DEVICE_ENABLE = no      # Limit max brightness to connect to IOS device (iPad,iPhone)
-LTO_ENABLE = no      # Enable optimizations to reduce firmware size. Also disables action macros and functions.
-
-# Do not edit past here
-
-ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
-    OPT_DEFS += -DIOS_DEVICE_ENABLE
-else ifeq ($(strip $(RGBLIGHT_FULL_POWER)), yes)
-    OPT_DEFS += -DRGBLIGHT_FULL_POWER
-endif
-
-ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
-    OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
-endif
-
-ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
-    OPT_DEFS += -DRGBLIGHT_SPLIT_ENABLE
-endif
-
-ifeq ($(strip $(SPLIT_RGB_MATRIX_ENABLE)), yes)
-    OPT_DEFS += -DSPLIT_TRANSPORT_MIRROR
-endif
author	Nick Brassel <nick@tzarc.org>	2023-11-28 16:39:48 +1100
committer	Nick Brassel <nick@tzarc.org>	2023-11-28 16:40:47 +1100
commit	0115951de12bd4c798a43a380651c34552552e85 (patch)
tree	62999011ae782d93aa6dc9c889615db2a840cafc /keyboards/rgbkb
parent	0379d1f59e58cefa18cdb72ba1b77507d1108ae6 (diff)
parent	4d99e0a23cff02f4c6e55e093b5de08a9be0df7c (diff)