[Keyboard] Add Axostudio Yeti hotswap version (#16820)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

18 files changed, 461 insertions, 4 deletions

diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
new file mode 100644
index 0000000000..559b62a81d
--- /dev/null
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -0,0 +1,92 @@
+/*
+Copyright 2022 kb-elmo
+
+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    0x525C
+#define PRODUCT_ID   0x9F9E
+#define DEVICE_VER   0x0001
+#define MANUFACTURER DZtech
+#define PRODUCT      Yeti RGB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Keyboard Matrix Assignments */
+
+#define MATRIX_ROW_PINS { E6, C6, B4, B5, B6 }
+#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, B7, D2, D3, D5 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* RGB Matrix */
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_SOLID_COLOR
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
+#    define RGB_DISABLE_AFTER_TIMEOUT 0         // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
+#    define DRIVER_ADDR_1 0b1010000
+#    define DRIVER_COUNT 1
+#    define DRIVER_LED_TOTAL 64
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
new file mode 100644
index 0000000000..d1debb4e35
--- /dev/null
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -0,0 +1,118 @@
+/* Copyright 2022 kb-elmo
+ *
+ * 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 "hotswap.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+    { 0, B_1,  A_1,  C_1 },
+    { 0, B_2,  A_2,  C_2 },
+    { 0, B_3,  A_3,  C_3 },
+    { 0, B_4,  A_4,  C_4 },  
+    { 0, B_5,  A_5,  C_5 },  
+    { 0, B_6,  A_6,  C_6 },   
+    { 0, B_7,  A_7,  C_7 }, 
+    { 0, B_8,  A_8,  C_8 },  
+    { 0, B_9,  A_9,  C_9 },  
+    { 0, B_10, A_10, C_10 },  
+    { 0, B_11, A_11, C_11 }, 
+    { 0, B_12, A_12, C_12 },     
+    { 0, B_13, A_13, C_13 },                          
+    { 0, B_14, A_14, C_14 },
+    { 0, B_15, A_15, C_15 },
+    
+    { 0, E_1,  D_1,  F_1 },        
+    { 0, E_2,  D_2,  F_2 },
+    { 0, E_3,  D_3,  F_3 },
+    { 0, E_4,  D_4,  F_4 },
+    { 0, E_5,  D_5,  F_5 },
+    { 0, E_6,  D_6,  F_6 },
+    { 0, E_7,  D_7,  F_7 },
+    { 0, E_8,  D_8,  F_8 },
+    { 0, E_9,  D_9,  F_9 },
+    { 0, E_10, D_10, F_10 },
+    { 0, E_11, D_11, F_11 },
+    { 0, E_12, D_12, F_12 },
+    { 0, E_13, D_13, F_13 },    
+    { 0, E_14, D_14, F_14 },    
+    { 0, E_15, D_15, F_15 },
+    
+    { 0, H_1,  G_1,  I_1 }, 
+    { 0, H_2,  G_2,  I_2 }, 
+    { 0, H_3,  G_3,  I_3 }, 
+    { 0, H_4,  G_4,  I_4 },
+    { 0, H_5,  G_5,  I_5 },
+    { 0, H_6,  G_6,  I_6 },
+    { 0, H_7,  G_7,  I_7 },
+    { 0, H_8,  G_8,  I_8 },
+    { 0, H_9,  G_9,  I_9 },
+    { 0, H_10, G_10, I_10 },
+    { 0, H_11, G_11, I_11 },
+    { 0, H_12, G_12, I_12 },
+    { 0, H_13, G_13, I_13 },
+    { 0, H_14, G_14, I_14 },
+
+    { 0, K_2,  J_2,  L_2 },
+    { 0, K_3,  J_3,  L_3 },
+    { 0, K_4,  J_4,  L_4 },    
+    { 0, K_5,  J_5,  L_5 },
+    { 0, K_6,  J_6,  L_6 },
+    { 0, K_7,  J_7,  L_7 },    
+    { 0, K_8,  J_8,  L_8 },    
+    { 0, K_9,  J_9,  L_9 },    
+    { 0, K_10, J_10, L_10 },
+    { 0, K_11, J_11, L_11 },    
+    { 0, K_12, J_12, L_12 },    
+    { 0, K_13, J_13, L_13 },                       
+    { 0, K_14, J_14, L_14 },
+
+    { 0, K_1,  J_1,  L_1 },
+    { 0, K_16, J_16, L_16 },
+    { 0, H_16, G_16, I_16 },
+    { 0, E_16, D_16, F_16 },    
+    { 0, B_16, A_16, C_16 },            
+    { 0, H_15, G_15, I_15 },
+    { 0, K_15, J_15, L_15 },    
+};
+
+led_config_t g_led_config = {
+    {
+        { 0,      1,  2,      3,      4,  5,  6,      7,  8,  9,      10, 11,     12,     13,      14 },
+        { 15,     16, 17,     18,     19, 20, 21,     22, 23, 24,     25, 26,     27,     28,      29 },
+        { 30,     31, 32,     33,     34, 35, 36,     37, 38, 39,     40, 41,     42,     NO_LED,  43 },
+        { NO_LED, 44, 45,     46,     47, 48, 49,     50, 51, 52,     53, 54,     55,     NO_LED,  56 },
+        { NO_LED, 57, NO_LED, 58, NO_LED, 59, 60, NO_LED, 61, NO_LED, 62, NO_LED, NO_LED, NO_LED,  63 }
+    }, {
+        {0, 0},{16, 0},{16*2, 0},{16*3, 0},{16*4, 0},{16*5, 0},{16*6, 0},{16*7, 0},{16*8, 0},{16*9, 0},{16*10, 0},{16*11, 0},{16*12, 0},{16*13, 0},{16*14, 0},
+        {0, 16},{16,16},{16*2,16},{16*3,16},{16*4,16},{16*5,16},{16*6,16},{16*7,16},{16*8,16},{16*9,16},{16*10,16},{16*11,16},{16*12,16},{16*13,16},{16*14,16},
+        {0,32},{16,32},{16*2,32},{16*3,32},{16*4,32},{16*5,32},{16*6,32},{16*7,32},{16*8,32},{16*9,32},{16*10,32},{16*11,32},{16*12,32},{16*14},
+        {16,48},{16*2,48},{16*3,48},{16*4,48},{16*5,48},{16*6,48},{16*7,48},{16*8,48},{16*9,48},{16*10,48},{16*11,48},{16*12,48},{16*14,48},
+        {16,64},{16*3,64},{16*5,64},{16*6,64},{16*8,64},{16*10,64},{16*14,64}
+    }, {
+        1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 
+        1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+           1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+           1,    1,    4, 1,    4,    1,          1
+    }
+};
+#endif
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
+    }
+}
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.h b/keyboards/axolstudio/yeti/hotswap/hotswap.h
new file mode 100644
index 0000000000..736f26ed7f
--- /dev/null
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 kb-elmo
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT( \
+    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,   k214,     \
+          k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,       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 }, \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214 }, \
+    { ____, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, ____, k314 }, \
+    { ____, k401, ____, k403, ____, k405, k406, ____, k408, ____, k410, ____, ____, ____, k414 }  \
+}
diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json
new file mode 100644
index 0000000000..72042a98a3
--- /dev/null
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -0,0 +1,75 @@
+{
+  "keyboard_name": "yeti hotswap",
+  "url": "https://axolstudio.ca/yeti",
+  "maintainer": "kb-elmo",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1.25, "y":0},
+        {"x":2.25, "y":0},
+        {"x":3.25, "y":0},
+        {"x":4.25, "y":0},
+        {"x":5.25, "y":0},
+        {"x":6.25, "y":0},
+        {"x":7.25, "y":0},
+        {"x":10.25, "y":0},
+        {"x":11.25, "y":0},
+        {"x":12.25, "y":0},
+        {"x":13.25, "y":0},
+        {"x":14.25, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0, "w":2},
+        {"x":0, "y":1},
+        {"x":1.25, "y":1, "w":1.5},
+        {"x":2.75, "y":1},
+        {"x":3.75, "y":1},
+        {"x":4.75, "y":1},
+        {"x":5.75, "y":1},
+        {"x":6.75, "y":1},
+        {"x":9.75, "y":1},
+        {"x":10.75, "y":1},
+        {"x":11.75, "y":1},
+        {"x":12.75, "y":1},
+        {"x":13.75, "y":1},
+        {"x":14.75, "y":1},
+        {"x":15.75, "y":1},
+        {"x":16.75, "y":1, "w":1.5},
+        {"x":0, "y":2},
+        {"x":1.25, "y":2, "w":1.75},
+        {"x":3, "y":2},
+        {"x":4, "y":2},
+        {"x":5, "y":2},
+        {"x":6, "y":2},
+        {"x":7, "y":2},
+        {"x":10, "y":2},
+        {"x":11, "y":2},
+        {"x":12, "y":2},
+        {"x":13, "y":2},
+        {"x":14, "y":2},
+        {"x":15, "y":2},
+        {"x":16, "y":2, "w":2.25},
+        {"x":1.25, "y":3, "w":2.25},
+        {"x":3.5, "y":3},
+        {"x":4.5, "y":3},
+        {"x":5.5, "y":3},
+        {"x":6.5, "y":3},
+        {"x":7.5, "y":3},
+        {"x":9.5, "y":3},
+        {"x":10.5, "y":3},
+        {"x":11.5, "y":3},
+        {"x":12.5, "y":3},
+        {"x":13.5, "y":3},
+        {"x":14.5, "y":3},
+        {"x":15.5, "y":3, "w":2.75},
+        {"x":1.25, "y":4, "w":1.5},
+        {"x":4.25, "y":4, "w":1.5},
+        {"x":5.75, "y":4, "w":2},
+        {"x":7.75, "y":4, "w":1.25},
+        {"x":9.5, "y":4, "w":2.75},
+        {"x":12.25, "y":4, "w":1.5},
+        {"x":16.75, "y":4, "w":1.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/axolstudio/yeti/hotswap/keymaps/default/keymap.c b/keyboards/axolstudio/yeti/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cb1ae43a64
--- /dev/null
+++ b/keyboards/axolstudio/yeti/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 kb-elmo
+ *
+ * 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(
+        KC_PAUS, KC_ESC,  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_PSCR, 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_F5,   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_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                            KC_RCTL
+    ),
+    [1] = LAYOUT(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,     KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    )
+};
diff --git a/keyboards/axolstudio/yeti/hotswap/keymaps/via/keymap.c b/keyboards/axolstudio/yeti/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..349bd1223d
--- /dev/null
+++ b/keyboards/axolstudio/yeti/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2022 kb-elmo
+ *
+ * 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(
+        KC_PAUS, KC_ESC,  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_PSCR, 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_F5,   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_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                            KC_RCTL
+    ),
+    [1] = LAYOUT(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,     KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/axolstudio/yeti/keymaps/via/rules.mk b/keyboards/axolstudio/yeti/hotswap/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/axolstudio/yeti/keymaps/via/rules.mk
+++ b/keyboards/axolstudio/yeti/hotswap/keymaps/via/rules.mk
diff --git a/keyboards/axolstudio/yeti/hotswap/readme.md b/keyboards/axolstudio/yeti/hotswap/readme.md
new file mode 100644
index 0000000000..79fad346f3
--- /dev/null
+++ b/keyboards/axolstudio/yeti/hotswap/readme.md
@@ -0,0 +1,27 @@
+# Axolstudio Yeti RGB
+
+![yeti](https://i.imgur.com/eoRH6W1l.png)
+
+**TGR Alice inspired board with some extra heft**
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: Axolstudio Yeti Hotswap RGB PCB
+* Hardware Availability: https://axolstudio.ca/yeti
+
+Make example for this keyboard (after setting up your build environment):
+
+    make axolstudio/yeti/hotswap:default
+
+Flashing example for this keyboard:
+
+    make axolstudio/yeti/hotswap: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 3 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
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/axolstudio/yeti/hotswap/rules.mk b/keyboards/axolstudio/yeti/hotswap/rules.mk
new file mode 100644
index 0000000000..52474311b1
--- /dev/null
+++ b/keyboards/axolstudio/yeti/hotswap/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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
+RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
+
+LTO_ENABLE = yes
diff --git a/keyboards/axolstudio/yeti/config.h b/keyboards/axolstudio/yeti/soldered/config.h
index 34b47bbcac..34b47bbcac 100644
--- a/keyboards/axolstudio/yeti/config.h
+++ b/keyboards/axolstudio/yeti/soldered/config.h
diff --git a/keyboards/axolstudio/yeti/info.json b/keyboards/axolstudio/yeti/soldered/info.json
index 7d256ccf36..9c6c122ce3 100644
--- a/keyboards/axolstudio/yeti/info.json
+++ b/keyboards/axolstudio/yeti/soldered/info.json
@@ -1,5 +1,5 @@
 {
-  "keyboard_name": "yeti",
+  "keyboard_name": "yeti soldered",
   "url": "https://axolstudio.ca/yeti",
   "maintainer": "kb-elmo",
   "layouts": {
diff --git a/keyboards/axolstudio/yeti/keymaps/default/keymap.c b/keyboards/axolstudio/yeti/soldered/keymaps/default/keymap.c
index b1ae3feb89..b1ae3feb89 100644
--- a/keyboards/axolstudio/yeti/keymaps/default/keymap.c
+++ b/keyboards/axolstudio/yeti/soldered/keymaps/default/keymap.c
diff --git a/keyboards/axolstudio/yeti/keymaps/via/keymap.c b/keyboards/axolstudio/yeti/soldered/keymaps/via/keymap.c
index 63b688b7a3..63b688b7a3 100644
--- a/keyboards/axolstudio/yeti/keymaps/via/keymap.c
+++ b/keyboards/axolstudio/yeti/soldered/keymaps/via/keymap.c
diff --git a/keyboards/axolstudio/yeti/soldered/keymaps/via/rules.mk b/keyboards/axolstudio/yeti/soldered/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/axolstudio/yeti/soldered/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/axolstudio/yeti/readme.md b/keyboards/axolstudio/yeti/soldered/readme.md
index 6be59ebd26..78ca4d5deb 100644
--- a/keyboards/axolstudio/yeti/readme.md
+++ b/keyboards/axolstudio/yeti/soldered/readme.md
@@ -10,10 +10,18 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make axolstudio/yeti:default
+    make axolstudio/yeti/soldered:default
 
 Flashing example for this keyboard:
 
-    make axolstudio/yeti:default:flash
+    make axolstudio/yeti/soldered: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 3 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
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/axolstudio/yeti/rules.mk b/keyboards/axolstudio/yeti/soldered/rules.mk
index 62fee62591..62fee62591 100644
--- a/keyboards/axolstudio/yeti/rules.mk
+++ b/keyboards/axolstudio/yeti/soldered/rules.mk
diff --git a/keyboards/axolstudio/yeti/yeti.c b/keyboards/axolstudio/yeti/soldered/soldered.c
index 9c11b8c78c..5041fabed0 100644
--- a/keyboards/axolstudio/yeti/yeti.c
+++ b/keyboards/axolstudio/yeti/soldered/soldered.c
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "yeti.h"
+#include "soldered.h"
diff --git a/keyboards/axolstudio/yeti/yeti.h b/keyboards/axolstudio/yeti/soldered/soldered.h
index 7c3b5cba1d..7c3b5cba1d 100644
--- a/keyboards/axolstudio/yeti/yeti.h
+++ b/keyboards/axolstudio/yeti/soldered/soldered.h