Merge remote-tracking branch 'origin/master' into develop

17 files changed, 430 insertions, 13 deletions

diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h
index b624b589bc..575e39892d 100644
--- a/keyboards/crkbd/keymaps/snowe/config.h
+++ b/keyboards/crkbd/keymaps/snowe/config.h
@@ -52,4 +52,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IGNORE_MOD_TAP_INTERRUPT
 //#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
 
-#define LAYER_STATE_8BIT
\ No newline at end of file
+#define LAYER_STATE_8BIT
+#define SPLIT_WPM_ENABLE
diff --git a/keyboards/crkbd/keymaps/snowe/keymap.c b/keyboards/crkbd/keymaps/snowe/keymap.c
index 4dfd6ecbeb..f5972d62db 100644
--- a/keyboards/crkbd/keymaps/snowe/keymap.c
+++ b/keyboards/crkbd/keymaps/snowe/keymap.c
@@ -57,6 +57,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   )
 // clang-format on
 #define LAYOUT_crkbd_base_wrapper(...) LAYOUT_crkbd_base(__VA_ARGS__)
+// clang-format off
+#define LAYOUT_crkbd_no_hold_shortcuts( \
+    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
+  ) \
+  LAYOUT_wrapper( \
+    KC_TAB,   K01,  K02, K03, K04, K05,     K06, K07, K08, K09, K0A, KC_MINS, \
+    GUI_ESC,  K11,  K12, K13, K14, K15,     K16, K17, K18, K19, K1A, KC_QUOT, \
+    KC_LSFT,  K21,  K22, K23, K24, K25,     K26, K27, K28, K29, K2A, KC_BSLS, \
+               KC_LCTL, LOWER, KC_BSPC,     KC_ENTER, SP_RAIS, KC_LALT                \
+  )
+// clang-format on
+#define LAYOUT_crkbd_no_hold_shortcuts_wrapper(...) LAYOUT_crkbd_no_hold_shortcuts(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
@@ -77,6 +91,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
         _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
     ),
+    [_GAMING] = LAYOUT_crkbd_no_hold_shortcuts_wrapper(
+        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+    ),
 
     /* Lower
      * ,-----------------------------------------------. .-----------------------------------------------.
diff --git a/keyboards/ergodox_ez/keymaps/via/keymap.c b/keyboards/ergodox_ez/keymaps/via/keymap.c
new file mode 100644
index 0000000000..21ee23a3c2
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/via/keymap.c
@@ -0,0 +1,90 @@
+/* Copyright 2022 IFo Hancroft
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Default Layer
+    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
+    * | =       | 1       | 2       | 3       | 4       | 5       | Left    |                             | RIGHT   | 6       | 7       | 8       | 9       | 0       | -       |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * | Del     | Q       | W       | E       | R       | T       | L1      |                             | L1      | Y       | U       | I       | O       | P       | \       |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * | BkSp    | A       | S       | D       | F       | G       | Hyper   |                             | Meh     | H       | J       | K       | L       | ; / L2  | ' / CMD |
+    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
+    * | Shift   | Z/Ctrl  | X       | C       | V       | B       |                                                 | N       | M       | ,       | .       | //Ctrl  | Shift   |
+    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
+    * | Grv/L1  | "       | AltShf  | Left    | Right   |                                                                     | Up      | Down    | [       | ]       | ~L1     |
+    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
+    *
+    *                                                             *-------------------*         *-------------------*
+    *                                                             | App     | LGui    |         | Alt     | Ctrl/Esc|
+    *                                                   *---------+---------+---------|         |---------+---------+---------*
+    *                                                   |         |         | Home    |         | PgUp    |         |         |
+    *                                                   | Space   | BkSp    |---------|         |---------| Tab     | Enter   |
+    *                                                   |         |         | End     |         | PgDn    |         |         |
+    *                                                   *---------+---------+---------*         *---------+---------+---------*
+    */
+
+    LAYOUT_ergodox_pretty(
+        KC_EQL,       KC_1,        KC_2,          KC_3,    KC_4,     KC_5,          KC_LEFT,                          KC_RGHT,       KC_6,     KC_7,     KC_8,     KC_9,     KC_0,               KC_MINS,
+        KC_DEL,       KC_Q,        KC_W,          KC_E,    KC_R,     KC_T,          TG(1),                            TG(1),         KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,               KC_BSLS,
+        KC_BSPC,      KC_A,        KC_S,          KC_D,    KC_F,     KC_G,                                                           KC_H,     KC_J,     KC_K,     KC_L,     LT(2, KC_SCLN),     GUI_T(KC_QUOT),
+        KC_LSFT,      CTL_T(KC_Z), KC_X,          KC_C,    KC_V,     KC_B,          ALL_T(KC_NO),                     MEH_T(KC_NO),  KC_N,     KC_M,     KC_COMM,  KC_DOT,   CTL_T(KC_SLSH),     KC_RSFT,
+        LT(0,KC_GRV), KC_QUOT,     LALT(KC_LSFT), KC_LEFT, KC_RIGHT,                                                                           KC_UP,    KC_DOWN,  KC_LBRC,  KC_RBRC,            TT(1),
+
+                                                                     ALT_T(KC_APP), KC_LGUI,              KC_LALT,    CTL_T(KC_ESC),
+                                                                                    KC_HOME,              KC_PGUP,
+                                                           KC_SPC,   KC_BSPC,       KC_END,               KC_PGDN,    KC_TAB,        KC_ENT
+    ),
+
+    LAYOUT_ergodox_pretty(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
+
+                                                                    _______,  _______,            _______,  _______,
+                                                                              _______,            _______,
+                                                          _______,  _______,  _______,            _______,  _______,  _______
+    ),
+
+    LAYOUT_ergodox_pretty(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
+
+                                                                    _______,  _______,            _______,  _______,
+                                                                              _______,            _______,
+                                                          _______,  _______,  _______,            _______,  _______,  _______
+    ),
+
+    LAYOUT_ergodox_pretty(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
+
+                                                                    _______,  _______,            _______,  _______,
+                                                                              _______,            _______,
+                                                          _______,  _______,  _______,            _______,  _______,  _______
+    )
+};
diff --git a/keyboards/ergodox_ez/keymaps/via/rules.mk b/keyboards/ergodox_ez/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index 72aa27afcc..b7ad8de4e2 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -48,6 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
 
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/info.json
index 9a2f7dc01b..7afccc81c0 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/info.json
@@ -69,8 +69,9 @@
                 {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
                 {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K49 (B4,C7)", "x":10, "y":4},
+                {"label":"K4A (B4,C7)", "x":11, "y":4},
+                {"label":"K4B (B4,D0)", "x":12, "y":4},
                 {"label":"K4C (B4,D1)", "x":13, "y":4},
                 {"label":"K4D (B4,D2)", "x":14, "y":4},
                 {"label":"K4E (B4,D3)", "x":15, "y":4}
@@ -140,8 +141,8 @@
                 {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
                 {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K49 (B4,C7)", "x":10, "y":4, "w":1.25},
+                {"label":"K4A (B4,D0)", "x":11.25, "y":4, "w":1.25},
                 {"label":"K4C (B4,D1)", "x":13, "y":4},
                 {"label":"K4D (B4,D2)", "x":14, "y":4},
                 {"label":"K4E (B4,D3)", "x":15, "y":4}
@@ -212,8 +213,8 @@
                 {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
                 {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
                 {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K49 (B4,C7)", "x":10, "y":4, "w":1.25},
+                {"label":"K4A (B4,D0)", "x":11.25, "y":4, "w":1.25},
                 {"label":"K4C (B4,D1)", "x":13, "y":4},
                 {"label":"K4D (B4,D2)", "x":14, "y":4},
                 {"label":"K4E (B4,D3)", "x":15, "y":4}
diff --git a/keyboards/mechlovin/kay65/kay65.h b/keyboards/mechlovin/kay65/kay65.h
index 7da2a74969..1af2673dc1 100644
--- a/keyboards/mechlovin/kay65/kay65.h
+++ b/keyboards/mechlovin/kay65/kay65.h
@@ -24,13 +24,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      K1E,   \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2D, K2E,   \
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E,   \
-    K40, K41, K42,                K46,                K4A, K4B,      K4C, K4D, K4E    \
+    K40, K41, K42,                K46,           K49, K4A, K4B,      K4C, K4D, K4E    \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
     { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
     { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
 }
 
 #define LAYOUT_65_ansi_blocker( \
diff --git a/keyboards/mechlovin/kay65/keymaps/via/keymap.c b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
index 02e1b8578d..01a524e2a0 100644
--- a/keyboards/mechlovin/kay65/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
@@ -28,28 +28,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_PGDN,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                    KC_TRNS,KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [2] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                    KC_TRNS,KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [3] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                    KC_TRNS,KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
 
diff --git a/keyboards/sporewoh/banime40/banime40.c b/keyboards/sporewoh/banime40/banime40.c
new file mode 100644
index 0000000000..4e55c6116e
--- /dev/null
+++ b/keyboards/sporewoh/banime40/banime40.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2022 sporewoh
+
+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 "banime40.h"
diff --git a/keyboards/sporewoh/banime40/banime40.h b/keyboards/sporewoh/banime40/banime40.h
new file mode 100644
index 0000000000..98b2bcd098
--- /dev/null
+++ b/keyboards/sporewoh/banime40/banime40.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2022 sporewoh
+
+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 "quantum.h"
+
+#define LAYOUT_ortho_4x10( \
+      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
+      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
+      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
+) \
+{ \
+      {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \
+      {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
+      {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \
+      {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39} \
+}
diff --git a/keyboards/sporewoh/banime40/config.h b/keyboards/sporewoh/banime40/config.h
new file mode 100644
index 0000000000..58173b58be
--- /dev/null
+++ b/keyboards/sporewoh/banime40/config.h
@@ -0,0 +1,42 @@
+/*
+Copyright 2022 sporewoh
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xBEAF
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0000
+#define MANUFACTURER    sporewoh
+#define PRODUCT         banime40
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+/* pin-out for PCB */
+#define MATRIX_ROW_PINS { E6, D7, C6, D4 }
+#define MATRIX_COL_PINS { B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
+
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 10
diff --git a/keyboards/sporewoh/banime40/info.json b/keyboards/sporewoh/banime40/info.json
new file mode 100644
index 0000000000..36a7ee9eb5
--- /dev/null
+++ b/keyboards/sporewoh/banime40/info.json
@@ -0,0 +1,50 @@
+{
+    "keyboard_name": "banime40", 
+    "url": "https://github.com/ChrisChrisLoLo/banime40", 
+    "maintainer": "sporewoh", 
+    "layouts": {
+        "LAYOUT_ortho_4x10": {
+            "layout": [
+				{"w":1, "x":0, "y":0},
+				{"w":1, "x":1, "y":0}, 
+				{"w":1, "x":2, "y":0}, 
+				{"w":1, "x":3, "y":0}, 
+				{"w":1, "x":4, "y":0}, 
+				{"w":1, "x":5, "y":0}, 
+				{"w":1, "x":6, "y":0}, 
+				{"w":1, "x":7, "y":0}, 
+				{"w":1, "x":8, "y":0}, 
+				{"w":1, "x":9, "y":0}, 
+				{"w":1, "x":0, "y":1}, 
+				{"w":1, "x":1, "y":1}, 
+				{"w":1, "x":2, "y":1}, 
+				{"w":1, "x":3, "y":1}, 
+				{"w":1, "x":4, "y":1}, 
+				{"w":1, "x":5, "y":1}, 
+				{"w":1, "x":6, "y":1}, 
+				{"w":1, "x":7, "y":1}, 
+				{"w":1, "x":8, "y":1}, 
+				{"w":1, "x":9, "y":1}, 
+				{"w":1, "x":0, "y":2}, 
+				{"w":1, "x":1, "y":2}, 
+				{"w":1, "x":2, "y":2}, 
+				{"w":1, "x":3, "y":2}, 
+				{"w":1, "x":4, "y":2}, 
+				{"w":1, "x":5, "y":2}, 
+				{"w":1, "x":6, "y":2}, 
+				{"w":1, "x":7, "y":2}, 
+				{"w":1, "x":8, "y":2}, 
+				{"w":1, "x":9, "y":2}, 
+				{"w":1, "x":0, "y":3}, 
+				{"w":1, "x":1, "y":3}, 
+				{"w":1, "x":2, "y":3}, 
+				{"w":1, "x":3, "y":3}, 
+				{"w":1, "x":4, "y":3}, 
+				{"w":1, "x":5, "y":3}, 
+				{"w":1, "x":6, "y":3}, 
+				{"w":1, "x":7, "y":3}, 
+				{"w":1, "x":8, "y":3}, 
+				{"w":1, "x":9, "y":3}]
+        }
+    }
+}
diff --git a/keyboards/sporewoh/banime40/keymaps/default/keymap.c b/keyboards/sporewoh/banime40/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7c6f5073f7
--- /dev/null
+++ b/keyboards/sporewoh/banime40/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2022 sporewoh
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x10(
+    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,   LT(3,KC_MINS),
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,         KC_M,   KC_COMM, KC_DOT, LT(4,KC_SLSH),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, LT(2,KC_BSPC), LT(1,KC_SPC), KC_ENT, KC_APP,  KC_DEL, KC_ESC),
+  [1] = LAYOUT_ortho_4x10(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_TAB,  KC_NO,   KC_NO,   KC_GRV,  KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_MINS,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_EQL,  KC_MINS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+  [2] = LAYOUT_ortho_4x10(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10,
+    KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,
+    KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO),
+  [3] = LAYOUT_ortho_4x10(
+    KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL,
+    KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO)
+};
diff --git a/keyboards/sporewoh/banime40/keymaps/via/keymap.c b/keyboards/sporewoh/banime40/keymaps/via/keymap.c
new file mode 100644
index 0000000000..064b2f13c7
--- /dev/null
+++ b/keyboards/sporewoh/banime40/keymaps/via/keymap.c
@@ -0,0 +1,71 @@
+/*
+Copyright 2022 sporewoh
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x10(
+    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,   LT(3,KC_MINS),
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,         KC_M,   KC_COMM, KC_DOT, LT(4,KC_SLSH),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, LT(2,KC_BSPC), LT(1,KC_SPC), KC_ENT, KC_APP,  KC_DEL, KC_ESC),
+  [1] = LAYOUT_ortho_4x10(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_TAB,  KC_NO,   KC_NO,   KC_GRV,  KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_MINS,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_EQL,  KC_MINS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+  [2] = LAYOUT_ortho_4x10(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10,
+    KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,
+    KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO),
+  [3] = LAYOUT_ortho_4x10(
+    KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL,
+    KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO),
+  [4] = LAYOUT_ortho_4x10(
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO),
+  [5] = LAYOUT_ortho_4x10(
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO),
+  [6] = LAYOUT_ortho_4x10(
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO),
+  [7] = LAYOUT_ortho_4x10(
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO),
+  [8] = LAYOUT_ortho_4x10(
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO),
+  [9] = LAYOUT_ortho_4x10(
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO)
+};
diff --git a/keyboards/sporewoh/banime40/keymaps/via/rules.mk b/keyboards/sporewoh/banime40/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/sporewoh/banime40/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/sporewoh/banime40/readme.md b/keyboards/sporewoh/banime40/readme.md
new file mode 100644
index 0000000000..cd536880ae
--- /dev/null
+++ b/keyboards/sporewoh/banime40/readme.md
@@ -0,0 +1,27 @@
+# banime40 
+
+![](https://i.imgur.com/sHQyMfEh.jpeg)
+
+A hotswap gasket mount 4x10 that can support multiple layouts.
+
+* Keyboard Maintainer: [sporewoh](https://github.com/ChrisChrisLoLo)
+* Hardware Supported: Open source PCB files, Pro Micro compatible
+* Hardware Availability: PCBs and Case files available [here](https://github.com/ChrisChrisLoLo/banime40)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sporewoh/banime40:default
+
+Flashing example for this keyboard:
+
+    make sporewoh/banime40:default:flash
+
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
diff --git a/keyboards/sporewoh/banime40/rules.mk b/keyboards/sporewoh/banime40/rules.mk
new file mode 100644
index 0000000000..8c8ea8e825
--- /dev/null
+++ b/keyboards/sporewoh/banime40/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # 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 = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = ortho_4x10