Merge upstream master to 2022 Q4 breaking change

4 files changed, 0 insertions, 574 deletions

diff --git a/keyboards/numatreus/config.h b/keyboards/numatreus/config.h
deleted file mode 100644
index 8683518123..0000000000
--- a/keyboards/numatreus/config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2019 yohei <yohewi@gmail.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
-
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D2, D1, D0, D4 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-//#define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
-// keyboard RGB LED support
-//    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
-#define RGBLED_NUM 6
-
-#define RGBLIGHT_LIMIT_VAL 200
-#define RGBLIGHT_VAL_STEP 17
-
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-
-#if defined(RGBLIGHT_ENABLE)
-// USB_MAX_POWER_CONSUMPTION value for stonehenge30 keyboard
-//  120  RGBoff, OLEDoff
-//  120  OLED
-//  330  RGB 6
-//  300  RGB 32
-//  310  OLED & RGB 32
-  #define USB_MAX_POWER_CONSUMPTION 400
-#else
-  // fix iPhone and iPad power adapter issue
-  // iOS device need lessthan 100
-  #define USB_MAX_POWER_CONSUMPTION 100
-#endif
-
-
-/*
- * 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/numatreus/keymaps/default/keymap.c b/keyboards/numatreus/keymaps/default/keymap.c
deleted file mode 100644
index 50c426a40f..0000000000
--- a/keyboards/numatreus/keymaps/default/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-enum layer_number {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT( /* Qwerty */
-     /*
-   * 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     ,     .     /
-   * SFT    TAB    CTL    LW   space bksp||ALT   Ent   RS    -     '     =
-   */
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
-    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
-    KC_LSFT, KC_TAB, KC_LCTL,  MO(_LOWER), KC_SPC, KC_BSPC, KC_LALT, KC_ENT,  MO(_RAISE), KC_MINS, KC_QUOT,  KC_PEQL
-  ),
-
-   /*
-   *  1       2     3     4     5        ||     6    7     8     9    0
-   * F1     F2      F3    F4    F5       ||     F6   F7    F8    F9    F10
-   * F11    F12     (     )     &        ||     `     [      ]   +   \
-   * lower  insert super shift space bksp|| alt Ent   fn    .    -    =
-   */
-  [_RAISE] = LAYOUT( /* [> RAISE <] */
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,   KC_9, KC_0 ,
-    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_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_LBRC, KC_RBRC, KC_PSLS, KC_BSLS ,
-    KC_NO,   KC_INS,  KC_LGUI, KC_LSFT, KC_SPC, KC_BSPC, KC_LALT, KC_ENT,  KC_TRNS, KC_DOT, KC_PMNS, KC_EQL  ),
-
-
-  /*
-   * !        @     #    $     %        ||       ^    &    *     (    )
-   *  DEL    ESC                        ||      PGDN  PGUP PSCR
-   *  CAPS  volup        ENT   reset    ||                        UP  
-   *       voldn  super shift space bspc||  alt  ent        LEFT  DOWN  RGHT
-   */
-  [_LOWER] = LAYOUT( /* [> LOWER <] */
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                 KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN  ,
-    KC_DEL,  KC_ESC,  KC_NO,   KC_NO,   KC_NO,                   KC_PGDN,  KC_PGUP,   KC_PSCR,  KC_NO,  KC_NO,
-    KC_CAPS, KC_VOLU, KC_NO,   KC_ENT,  QK_BOOT,                   KC_NO,    KC_NO,     KC_NO,    KC_UP,  KC_NO  ,
-    KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_SPC, KC_BSPC, KC_LALT, KC_ENT,  KC_NO,     KC_LEFT, KC_DOWN, KC_RGHT ) 
-    
-};
diff --git a/keyboards/numatreus/keymaps/hdbx/keymap.c b/keyboards/numatreus/keymaps/hdbx/keymap.c
deleted file mode 100644
index dc68453961..0000000000
--- a/keyboards/numatreus/keymaps/hdbx/keymap.c
+++ /dev/null
@@ -1,230 +0,0 @@
-// WindowsでJIS配列として認識しているときに、オシャレなUS配列用キーキャップを使うためのキーマップです。
-// Google日本語入力の場合、以下のキー設定を行うとLower,Raiseのタップでそれぞれ半角入力と全角入力を切り替えできるようになります。
-//  ・Henkan（入力文字なし/直接入力）に「IMEを有効化」を割り当て
-//  ・Muhenkan（入力文字なし/直接入力）に「IMEを無効化」を割り当て
-
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"     // qmk_firmware-master/quantum/keymap_extras/keymap_japanese.h 日本語キーボード設定用
-#include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-    _QWERTY,
-    _HDBX,
-    _LOWER,
-    _RAISE,
-    _GAME,
-    _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  HDBX,
-  MCR1,                // マクロ1
-  MCR2,                // マクロ2
-  MCR3,                // マクロ3
-  MCR4,                // マクロ4
-  MCR5,                // マクロ5
-  WN_SCLN,              // タップでJISの「:」  シフトでJISの「;」 (Windows)
-  DM_PLY1,
-  DM_PLY2,
-  DM_REC1,
-  DM_REC2,
-  DM_RSTP,
-};
-
-// Use Dynamic macro
-
-// Fillers to make layering more clear
-#define LOWER   LT(_LOWER, JP_MHEN)    // タップで無変換     ホールドでLower
-#define RAISE   LT(_RAISE, JP_HENK)    // タップで変換       ホールドでRaise
-#define GUI_ESC GUI_T(KC_ESC)          // タップでESC        ホールドでGUI
-#define SFT_BS  SFT_T(KC_BSPC)         // タップでBackSpace  ホールドでSHIFT
-#define CTL_ENT CTL_T(KC_ENT)          // タップでEnter      ホールドでCTRL
-#define CTL_TAB CTL_T(KC_TAB)          // タップでTAB        ホールドでCTRL
-#define SFT_DEL SFT_T(KC_DEL)          // タップでDELETE     ホールドでSHIFT
-#define ALT_LBR ALT_T(JP_LBRC)         // タップで[          ホールドでALT
-#define SFT_RBR SFT_T(JP_RBRC)         // タップで]          ホールドでSHIFT
-#define SFT_SPC S(KC_SPC)              // Shift + Space
-#define WN_CAPS S(KC_CAPS)             // Caps Lock           (Windows)
-#define GAME    TO(_GAME)              // _GAMEレイヤーへ移動
-#define ADJUST  TO(_ADJUST)            // _ADJUSTレイヤーへ移動
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty配列
-   * ,----------------------------------.             ,----------------------------------.
-   * |   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  |   ,  |   .  |   /  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |Alt/[ |WINESC|   ~  |Sft/Bs|Lower |CtlEnt|Space |Raise |CtrlTb|   -  |   '  |Sft/] |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    WN_SCLN,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-      ALT_LBR, GUI_ESC, JP_TILD, SFT_BS,  LOWER,   CTL_ENT,  KC_SPC,   RAISE,   CTL_TAB, KC_MINS, JP_QUOT, SFT_RBR
-      ),
-
-  /* HDBX配列 デフォルトレイヤーをこの配列にしたい場合は、AdjustレイヤーでK (Lower + Raise + K)
-   * ,----------------------------------.             ,----------------------------------.
-   * |   Q  |   W  |   E  |   ,  |   .  |             |   Y  |   D  |   P  |   F  |   :  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   A  |   I  |   O  |   U  |   G  |             |   M  |   N  |   T  |   R  |   S  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   Z  |   X  |   C  |   V  |   B  |             |   H  |   J  |   K  |   L  |   /  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |Alt/[ |WINESC|   ~  |Sft/Bs|Lower |CtlEnt|Space |Raise |CtrlTb|   -  |   '  |Sft/] |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_HDBX] = LAYOUT(
-      KC_Q,    KC_W,    KC_E,    KC_COMM, KC_DOT,                      KC_Y,    KC_D,    KC_P,    KC_F,    WN_SCLN,
-      KC_A,    KC_I,    KC_O,    KC_U,    KC_G,                        KC_M,    KC_N,    KC_T,    KC_R,    KC_S,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SLSH,
-      ALT_LBR, GUI_ESC, JP_TILD, SFT_BS,  LOWER,   CTL_ENT,  KC_SPC,   RAISE,   CTL_TAB, KC_MINS, JP_QUOT, SFT_RBR
-      ),
-
-  /* Lower
-   * ,----------------------------------.             ,----------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |             |   7  |   8  |   9  |   .  | Bspc |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |  F6  |  F7  |  F8  |  F9  |  F10 |             |   4  |   5  |   6  |   +  |   *  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |Zen/Ha|ScLock|Pause |  F11 |  F12 |             |   1  |   2  |   3  |   -  |   /  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Alt  | WIN  |   `  |SftDel|Lower | Ctrl |SftSpc|Raise |   0  |   ,  |   =  |Enter |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT( 
-      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                       KC_7,    KC_8,    KC_9,    KC_DOT,  KC_BSPC,
-      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                      KC_4,    KC_5,    KC_6,    KC_PPLS, KC_PAST,
-      JP_ZKHK, KC_SCRL, KC_PAUS, KC_F11,  KC_F12,                      KC_1,    KC_2,    KC_3,    KC_PMNS, KC_PSLS,
-      KC_LALT, KC_LGUI, JP_GRV,  SFT_DEL, _______, KC_LCTL,  SFT_SPC,  _______, KC_0,    KC_COMM, JP_EQL,  KC_ENT
-      ),
-
-  /* Raise
-   * ,----------------------------------.             ,----------------------------------.
-   * |   !  |   @  |   #  |   $  |   %  |             | Home | App  | Ins  | Calc |PrtScr|
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   ^  |   &  |   *  |   \  |   |  |             | Left | Down |  Up  |Right |   ;  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   `  |   {  |   }  |   <  |   >  |             | End  | Mute |  (   |   )  |   ?  |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Alt  | WIN  |   `  | Del  |Lower | Ctrl | Caps |Raise | Ctrl |   _  |   "  |Shift |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-      KC_EXLM, JP_AT,   KC_HASH, KC_DLR,  KC_PERC,                     KC_HOME, KC_APP,  KC_INS,  KC_CALC, KC_PSCR,
-      JP_CIRC, JP_AMPR, JP_ASTR, JP_YEN,  JP_PIPE,                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN,
-      JP_GRV,  JP_LCBR, JP_RCBR, KC_LT,   KC_GT,                       KC_END,  KC_MUTE, JP_LPRN, JP_RPRN, KC_QUES,
-      KC_LALT, KC_LGUI, JP_GRV,  KC_DEL,  _______, KC_LCTL,  WN_CAPS,  _______, KC_RCTL, JP_UNDS, JP_DQUO, KC_RSFT
-      ),
-
-  /* GAME ゲームやテンキー固定で使用するレイヤーです。AdjustレイヤーでGを押下して遷移。戻るときはtoBaseから。
-   * ,----------------------------------.             ,----------------------------------.
-   * |   Q  |  Up  |   E  |   R  |   T  |             |   7  |   8  |   9  |   .  | Bspc |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * | Left | Down |Right |   F  |   G  |             |   4  |   5  |   6  |   +  |   *  |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |   Z  |   X  |   C  |   V  |   B  |             |   1  |   2  |   3  |   -  |   /  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Alt  | Esc  |  Tab |Shift |Space | Ctrl |toBase|   \  |   0  |   ,  |   =  |Enter |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_GAME] = LAYOUT(
-      KC_Q,    KC_UP,   KC_E,    KC_R,    KC_T,                        KC_7,    KC_8,    KC_9,    KC_DOT,  KC_BSPC,
-      KC_LEFT, KC_DOWN, KC_RGHT, KC_F,    KC_G,                        KC_4,    KC_5,    KC_6,    KC_PPLS, KC_PAST,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_1,    KC_2,    KC_3,    KC_PMNS, KC_PSLS,
-      KC_LALT, KC_ESC,  KC_TAB,  KC_LSFT, KC_SPC,  KC_LCTL,  ADJUST,   JP_YEN,  KC_0,    KC_COMM, JP_EQL,  KC_ENT
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,----------------------------------.             ,----------------------------------.
-   * | MCR1 | MCR2 | MCR3 | MCR4 | MCR5 |             |DyMcr1|DyMcr2|RcMcr1|RcMcr2|StpRec|
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |      |      |      |      |ToGAME|             |      |Qwerty| HDBX |      |      |
-   * |------+------+------+------+------|             |------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |QK_BOOT |      |      |      |      |      |      |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] =  LAYOUT(
-      MCR1,    MCR2,    MCR3,    MCR4,    MCR5,                DM_PLY1, DM_PLY2, DM_REC1, DM_REC2, DM_RSTP,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, GAME,                      XXXXXXX, QWERTY,  HDBX,    XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-      )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case HDBX:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_HDBX);
-      }
-      return false;
-      break;
-    static bool     lshift = false;
-    case WN_SCLN: // コロン「;:」
-      if (record->event.pressed) {
-        lshift = get_mods() & MOD_BIT(KC_LSFT);
-        if (lshift) {
-          unregister_code(KC_LSFT);
-          tap_code(JP_SCLN);
-        } else {
-          tap_code(JP_SCLN);
-        }
-      }
-      return false;
-      break;
-    case MCR1:
-      if (record->event.pressed) {
-        SEND_STRING("0123456789"); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR2:
-      if (record->event.pressed) {
-        SEND_STRING("hogehoge\n"); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR3:
-      if (record->event.pressed) {
-        SEND_STRING("hoge@hoge.hoge"); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR4:
-      if (record->event.pressed) {
-        SEND_STRING("\"\""SS_TAP(X_LEFT)); // 送信文字列
-      }
-      return false;
-      break;
-    case MCR5:
-      if (record->event.pressed) {
-        SEND_STRING("<>"SS_TAP(X_LEFT)); // 送信文字列
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/numatreus/keymaps/like_jis/keymap.c b/keyboards/numatreus/keymaps/like_jis/keymap.c
deleted file mode 100644
index fbcbea84c2..0000000000
--- a/keyboards/numatreus/keymaps/like_jis/keymap.c
+++ /dev/null
@@ -1,196 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-  _BASE = 0,
-  _NUMPAD,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  NUMPAD,
-  KANJI,
-  LOWER,
-  RAISE,
-  ADJUST,
-  RGBRST
-};
-
-enum tapdances{
-  TD_CODO = 0,
-  // TD_MNUB,
-};
-
-// Layer Mode aliases
-#define KC_LOWER LOWER
-#define KC_RAISE RAISE
-#define KC_ADJST ADJUST
-#define KC_DLNP NUMPAD //DF(_NUMPAD)
-#define KC_DLBS BASE //DF(_BASE)
-
-#define KC_ZSFT  LSFT_T(KC_Z)
-#define KC_MNSF  LSFT_T(KC_MINS)
-#define KC_ESCT  LCTL_T(KC_ESC)
-#define KC_TBAL  LALT_T(KC_TAB)
-#define KC_11SF  LSFT_T(KC_F11)
-#define KC_ALAP  LALT_T(KC_APP)
-#define KC_JEQL  LSFT(KC_MINS)
-#define KC_WLCK  LALT(KC_L)
-#define KC_SFEQ  LSFT(KC_MINS)
-#define KC_SFPL  LSFT(KC_SCLN)
-#define KC_SFAS  LSFT(KC_QUOT)
-
-#define KC_CODO  TD(TD_CODO)
-// #define KC_MNUB  TD(TD_MNUB)
-
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_CODO] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_DOT),
-  // [TD_MNUB] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, LSFT(JP_BSLS)),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-  //,----------------------------------.             ,----------------------------------.
-      KC_Q,  KC_W, KC_E,  KC_R,  KC_T,                KC_Y,  KC_U,  KC_I, KC_O,  KC_P,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-      KC_A,  KC_S, KC_D,  KC_F,  KC_G,                KC_H,  KC_J,  KC_K, KC_L, KC_ENT,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-    KC_ZSFT, KC_X, KC_C,  KC_V,  KC_B,                KC_N,  KC_M,  KC_CODO, KC_UP,  KC_MNSF,
-  //|------+------+------+------+------|------+------+------+------+------+------+------|
-    KC_ESCT, KC_TBAL, KC_LGUI, KC_LOWER, KC_BSPC, KC_BSPC, KC_SPC, KC_SPC, KC_RAISE, KC_LEFT, KC_DOWN, KC_RGHT
-  //|------+------+------+------+-------------+------+------+------+------+------+------|
-  ),
-
-  [_NUMPAD] = LAYOUT(
-  //,----------------------------------.             ,----------------------------------.
-    KC_P7,  KC_P8,  KC_P9, KC_PAST, KC_NUM,           KC_P7, KC_P8, KC_P9, KC_PAST, KC_NUM,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-    KC_P4,  KC_P5,  KC_P6, KC_PMNS, KC_PSLS,          KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PSLS,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-    KC_P1,  KC_P2,  KC_P3, KC_PPLS, KC_QUOT,          KC_P1, KC_P2, KC_P3, KC_PPLS, KC_QUOT,
-  //|------+------+------+------+------|------+------+------+------+------+------+------|
-   KC_DLBS, KC_P0, KC_PDOT, KC_SFEQ, KC_SPC, KC_DEL, KC_SPC, KC_DLBS, KC_P0, KC_PDOT, KC_SFEQ, KC_BSPC
-  //|------+------+------+------+-------------+------+------+------+------+------+------|
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,----------------------------------.             ,----------------------------------.
-    KC_F1,  KC_F2,  KC_F3,  KC_F4, KC_F5,            KC_MINS, KC_EQL, JP_YEN, KC_LBRC, KC_RBRC,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-    KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10,           XXXXXXX, XXXXXXX, KC_SCLN, KC_QUOT, KC_BSLS,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-    KC_11SF, KC_F12, KC_DLNP, KANJI, KC_ENT,         XXXXXXX, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS,
-  //|------+------+------+------+------|------+------+------+------+------+------+------|
-   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  //|------+------+------+------+-------------+------+------+------+------+------+------|
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,----------------------------------.             ,----------------------------------.
-     KC_1,  KC_2,  KC_3,  KC_4,  KC_5,                 KC_6,  KC_7, KC_8, KC_9, KC_0,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     KC_QUOT, KC_4, KC_5, KC_6, KC_MINS,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-  KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,        KC_SLSH, KC_1, KC_2, KC_3, KC_PPLS,
-  //|------+------+------+------+------|------+------+------+------+------+------+------|
-  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WLCK, KC_TRNS, KC_0, KC_DOT, KC_JEQL
-  //|------+------+------+------+-------------+------+------+------+------+------+------|
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,----------------------------------.             ,----------------------------------.
-   QK_BOOT,  RGBRST, AG_NORM, AG_SWAP, KC_CAPS,        XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_SCRL,      XXXXXXX, KC_WH_R, KC_WH_D,  KC_END, KC_PGDN,
-  //|------+------+------+------+------|             |------+------+------+------+------|
-   RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NUM,       XXXXXXX, KC_BTN1, KC_BTN2, KC_MS_U, XXXXXXX,
-  //|------+------+------+------+------|------+------+------+------+------+------+------|
-   KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R
-  //|------+------+------+------+-------------+------+------+------+------+------+------|
-  )
-};
-
-#define L_BASE _BASE
-#define L_NUMPAD (1<<_NUMPAD)
-
-static inline void update_change_layer(bool pressed, uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-
-  pressed ? layer_on(layer1) : layer_off(layer1);
-  IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2) ? layer_on(layer3) : layer_off(layer3);
-}
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  bool result = false;
-  switch (keycode) {
-    case BASE:
-      if (record->event.pressed) {
-        default_layer_set(L_BASE);
-      }
-      break;
-    case NUMPAD:
-      if (record->event.pressed) {
-        default_layer_set(L_NUMPAD);
-      }
-      break;
-    case LOWER:
-      update_change_layer(record->event.pressed, _LOWER, _RAISE, _ADJUST);
-      break;
-    case RAISE:
-      update_change_layer(record->event.pressed, _RAISE, _LOWER, _ADJUST);
-        break;
-    case KANJI:
-      if (record->event.pressed) {
-        if (keymap_config.swap_lalt_lgui == false) {
-          register_code(KC_LNG2);
-        } else {
-          tap_code16(A(KC_GRV));
-        }
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      break;
-    #ifdef RGBLIGHT_ENABLE
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGBRST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
-
-void matrix_init_user(void) {
-  #ifdef RGBLIGHT_ENABLE
-    RGB_current_mode = rgblight_config.mode;
-  #endif
-}