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

5 files changed, 125 insertions, 38 deletions

diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json
index 5353a094e9..283d36673f 100644
--- a/keyboards/zoo/wampus/info.json
+++ b/keyboards/zoo/wampus/info.json
@@ -5,7 +5,7 @@
     "width": 19.75,
     "height": 5.25, 
     "layouts": {
-        "LAYOUT_alice": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
                 {"label":"Esc", "x":0.5, "y":0},
                 {"label":"`", "x":1.75, "y":0.25},
@@ -78,6 +78,79 @@
                 {"label":"Alt", "x":13, "y":4.25, "w":1.5},
                 {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
             ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"`", "x":1.75, "y":0.25},
+                {"label":"1", "x":2.75, "y":0.25},
+                {"label":"2", "x":3.75, "y":0},
+                {"label":"3", "x":4.75, "y":0.25},
+                {"label":"4", "x":5.75, "y":0.25},
+                {"label":"5", "x":6.75, "y":0.25},
+                {"label":"6", "x":7.75, "y":0.25},
+                {"label":"7", "x":11, "y":0.25},
+                {"label":"8", "x":12, "y":0.25},
+                {"label":"9", "x":13, "y":0.25},
+                {"label":"0", "x":14, "y":0.25},
+                {"label":"-", "x":15, "y":0},
+                {"label":"=", "x":16, "y":0.25},
+                {"label":"Backspace", "x":17, "y":0.25, "w":2},
+
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
+                {"label":"Q", "x":3, "y":1.25},
+                {"label":"W", "x":4.25, "y":1.25},
+                {"label":"E", "x":5.25, "y":1.25},
+                {"label":"R", "x":6.25, "y":1.25},
+                {"label":"T", "x":7.25, "y":1.25},
+                {"label":"Y", "x":10.5, "y":1.25},
+                {"label":"U", "x":11.5, "y":1.25},
+                {"label":"I", "x":12.5, "y":1.25},
+                {"label":"O", "x":13.5, "y":1.25},
+                {"label":"P", "x":14.75, "y":1.25},
+                {"label":"{", "x":15.75, "y":1.25},
+                {"label":"}", "x":16.75, "y":1.25},
+                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
+
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":2.25},
+                {"label":"S", "x":4.5, "y":2.25},
+                {"label":"D", "x":5.5, "y":2.25},
+                {"label":"F", "x":6.5, "y":2.25},
+                {"label":"G", "x":7.5, "y":2.25},
+                {"label":"H", "x":10.75, "y":2.25},
+                {"label":"J", "x":11.75, "y":2.25},
+                {"label":"K", "x":12.75, "y":2.25},
+                {"label":"L", "x":13.75, "y":2.25},
+                {"label":":", "x":15.25, "y":2.25},
+                {"label":"\"", "x":16.25, "y":2.25},
+                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
+
+                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
+                {"label":"Z", "x":3.75, "y":3.25},
+                {"label":"X", "x":5, "y":3.25},
+                {"label":"C", "x":6, "y":3.25},
+                {"label":"V", "x":7, "y":3.25},
+                {"label":"B", "x":8, "y":3.25},
+                {"label":"Fn", "x":10.25, "y":3.25},
+                {"label":"N", "x":11.25, "y":3.25},
+                {"label":"M", "x":12.25, "y":3.25},
+                {"label":"<", "x":13.25, "y":3.25},
+                {"label":">", "x":15, "y":3.25},
+                {"label":"?", "x":16, "y":3.25},
+                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
+                {"label":"Fn", "x":18.75, "y":3.25},
+
+                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
+                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
+                {"label":"Space", "x":6.5, "y":4.25, "w":2},
+                {"label":"Menu", "x":8.5, "y":4.25},
+                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
+                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
+                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/zoo/wampus/keymaps/default/keymap.c b/keyboards/zoo/wampus/keymaps/default/keymap.c
index 0c3a6d0c3f..83d49b0ef0 100644
--- a/keyboards/zoo/wampus/keymaps/default/keymap.c
+++ b/keyboards/zoo/wampus/keymaps/default/keymap.c
@@ -16,18 +16,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_alice(
-      KC_TILD, KC_1,      KC_2, KC_3,    KC_4, KC_5,   KC_6,    KC_7, KC_8,   KC_9,    KC_0,    KC_MINUS,  KC_EQUAL, KC_BSPC, KC_DEL,
-      KC_ESC,  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_BSLASH,
-      KC_PGUP, KC_CAPS,   KC_A, KC_S,    KC_D, KC_F,   KC_G,    KC_H, KC_J,   KC_K,    KC_L,    KC_SCOLON, KC_QUOTE, KC_ENT,
-      KC_PGDN, KC_LSHIFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,    KC_B, KC_N,   KC_M,    KC_COMM, KC_DOT,    KC_SLASH, KC_RSFT, KC_RGUI,
-               KC_LCTL,         KC_LALT,       KC_SPC, KC_LGUI,       KC_SPC, KC_RALT,                                        KC_RCTL
+  [0] = LAYOUT_alice_split_bs(
+      KC_ESC,     KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+      KC_PGUP,    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_PGDN,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
+                  KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_SPC,                    KC_RALT,                            KC_RCTL
   ),
-  [1] = LAYOUT_alice(
-      KC_TRNS,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-      RGB_TOG,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      RGB_MOD,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      RGB_RMOD, 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
+  [1] = LAYOUT_alice_split_bs(
+      RGB_TOG,    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
+      RGB_MOD,    KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      RGB_RMOD,   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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/zoo/wampus/keymaps/via/keymap.c b/keyboards/zoo/wampus/keymaps/via/keymap.c
index 2126be5e9f..b9620c67b1 100644
--- a/keyboards/zoo/wampus/keymaps/via/keymap.c
+++ b/keyboards/zoo/wampus/keymaps/via/keymap.c
@@ -16,32 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_alice(
-      KC_TILD, KC_1,      KC_2, KC_3,    KC_4, KC_5,   KC_6,    KC_7, KC_8,   KC_9,    KC_0,    KC_MINUS,  KC_EQUAL, KC_BSPC, KC_DEL,
-      KC_ESC,  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_BSLASH,
-      KC_PGUP, KC_CAPS,   KC_A, KC_S,    KC_D, KC_F,   KC_G,    KC_H, KC_J,   KC_K,    KC_L,    KC_SCOLON, KC_QUOTE, KC_ENT,
-      KC_PGDN, KC_LSHIFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,    KC_B, KC_N,   KC_M,    KC_COMM, KC_DOT,    KC_SLASH, KC_RSFT, KC_RGUI,
-               KC_LCTL,         KC_LALT,       KC_SPC, KC_LGUI,       KC_SPC, KC_RALT,                                        KC_RCTL
+  [0] = LAYOUT_alice_split_bs(
+      KC_ESC,     KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+      KC_PGUP,    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_PGDN,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
+                  KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_SPC,                    KC_RALT,                            KC_RCTL
   ),
-  [1] = LAYOUT_alice(
-      KC_TRNS,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-      RGB_TOG,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      RGB_MOD,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      RGB_RMOD, 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
+  [1] = LAYOUT_alice_split_bs(
+      RGB_TOG,    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
+      RGB_MOD,    KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      RGB_RMOD,   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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_alice(
-      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_alice_split_bs(
+      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,          KC_TRNS,                            KC_TRNS
   ),
-  [3] = LAYOUT_alice(
-      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_alice_split_bs(
+      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,          KC_TRNS,                            KC_TRNS
   )
 };
diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk
index 9b587fe31e..889e4d858b 100644
--- a/keyboards/zoo/wampus/rules.mk
+++ b/keyboards/zoo/wampus/rules.mk
@@ -23,4 +23,4 @@ OLED_DRIVER_ENABLE = no     # Enables the use of OLED displays
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
-LAYOUTS = alice
+LAYOUTS = alice alice_split_bs
diff --git a/keyboards/zoo/wampus/wampus.h b/keyboards/zoo/wampus/wampus.h
index a5cdeaf019..f74b58b516 100644
--- a/keyboards/zoo/wampus/wampus.h
+++ b/keyboards/zoo/wampus/wampus.h
@@ -20,12 +20,12 @@
 
 #define ____ KC_NO
 
-#define LAYOUT_alice( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-          K401,       K403,       K405, K406,       K408,       K410,                   K414  \
+#define LAYOUT_alice_split_bs( \
+    K100,  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+    K200,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K300,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K213, \
+           K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+           K401,       K403,       K405, K406, K408,             K410,                   K414  \
 ) { \
   { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, }, \
   { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \
@@ -33,3 +33,17 @@
   { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \
   { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \
 }
+
+#define LAYOUT_alice( \
+    K100,  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
+    K200,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K300,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
+           K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+           K401,       K403,       K405, K406, K408,             K410,                   K414  \
+) { \
+  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, }, \
+  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \
+  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, }, \
+  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \
+  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \
+}