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

8 files changed, 303 insertions, 0 deletions

diff --git a/keyboards/kbdfans/odinmini/config.h b/keyboards/kbdfans/odinmini/config.h
new file mode 100644
index 0000000000..a61fbed229
--- /dev/null
+++ b/keyboards/kbdfans/odinmini/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 Dztech
+ *
+ * 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 "config_common.h"
+
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 8)
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json
new file mode 100644
index 0000000000..94a3aa5122
--- /dev/null
+++ b/keyboards/kbdfans/odinmini/info.json
@@ -0,0 +1,144 @@
+{
+    "manufacturer": "KBDFans",
+    "keyboard_name": "Odinmini",
+    "maintainer": "moyi4681",
+    "bootloader": "rp2040",
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "features": {
+        "audio": false,
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "GP27",
+        "num_lock": "GP4"
+    },
+    "matrix_pins": {
+        "cols": ["GP28", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP0", "GP7", "GP6", "GP5", "GP3", "GP15"],
+        "rows": ["GP1", "GP2", "GP29", "GP13", "GP14"]
+    },
+    "processor": "RP2040",
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+
+    },
+        "brightness_steps": 8,
+        "hue_steps": 8,
+        "led_count": 4,
+        "max_brightness": 180,
+        "pin": "GP12",
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6073",
+        "suspend_wakeup_delay": 5000,
+        "vid": "0x4B42"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "Backspace", "matrix": [2, 13], "w": 2, "x": 13, "y": 0 },
+                { "label": "Insert", "matrix": [0, 13], "w": 1, "x": 15.25, "y": 0 },
+                { "label": "Num Lock", "matrix": [0, 14], "w": 1, "x": 16.5, "y": 0 },
+                { "label": "/", "matrix": [0, 15], "w": 1, "x": 17.5, "y": 0 },
+                { "label": "*", "matrix": [0, 16], "w": 1, "x": 18.5, "y": 0 },
+                { "label": "-", "matrix": [0, 17], "w": 1, "x": 19.5, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [3, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Delete", "matrix": [1, 13], "w": 1, "x": 15.25, "y": 1 },
+                { "label": "7", "matrix": [1, 14], "w": 1, "x": 16.5, "y": 1 },
+                { "label": "8", "matrix": [1, 15], "w": 1, "x": 17.5, "y": 1 },
+                { "label": "9", "matrix": [1, 16], "w": 1, "x": 18.5, "y": 1 },
+                { "h": 2, "label": "+", "matrix": [1, 17], "w": 1, "x": 19.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "4", "matrix": [2, 14], "w": 1, "x": 16.5, "y": 2 },
+                { "label": "5", "matrix": [2, 15], "w": 1, "x": 17.5, "y": 2 },
+                { "label": "6", "matrix": [2, 16], "w": 1, "x": 18.5, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 11], "w": 2.75, "x": 12.25, "y": 3 },
+                { "label": "1", "matrix": [3, 12], "w": 1, "x": 16.5, "y": 3 },
+                { "label": "2", "matrix": [3, 14], "w": 1, "x": 17.5, "y": 3 },
+                { "label": "3", "matrix": [3, 15], "w": 1, "x": 18.5, "y": 3 },
+                { "h": 2, "label": "Enter", "matrix": [3, 16], "w": 1, "x": 19.5, "y": 3 },
+                { "label": "\u2191", "matrix": [3, 17], "w": 1, "x": 15.25, "y": 3.25 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "k45", "matrix": [4, 5], "w": 7, "x": 3.75, "y": 4 },
+                { "label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 10.75, "y": 4 },
+                { "label": "Menu", "matrix": [4, 9], "w": 1.5, "x": 12.25, "y": 4 },
+                { "label": "0", "matrix": [4, 10], "w": 1, "x": 17.5, "y": 4 },
+                { "label": ".", "matrix": [4, 11], "w": 1, "x": 18.5, "y": 4 },
+                { "label": "\u2190", "matrix": [4, 12], "w": 1, "x": 14.25, "y": 4.25 },
+                { "label": "\u2193", "matrix": [4, 13], "w": 1, "x": 15.25, "y": 4.25 },
+                { "label": "\u2192", "matrix": [4, 14], "w": 1, "x": 16.25, "y": 4.25 }
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/kbdfans/odinmini/keymaps/default/keymap.c b/keyboards/kbdfans/odinmini/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f9bd7bbc6e
--- /dev/null
+++ b/keyboards/kbdfans/odinmini/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+ *
+ * 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_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_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+		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_END,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,
+		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                       KC_P1,   KC_P2,    KC_P3,  KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT,           KC_P0,    KC_PDOT
+                        ),
+	[1]   =LAYOUT(
+		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_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+		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_END,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,
+		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                       KC_P1,   KC_P2,    KC_P3,  KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT,           KC_P0,    KC_PDOT
+		        ),
+	[2]   =LAYOUT(
+		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_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+		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_END,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,
+		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                       KC_P1,   KC_P2,    KC_P3,  KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT,           KC_P0,    KC_PDOT
+		        ),
+	[3]   =LAYOUT(
+		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_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+		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_END,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,
+		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                       KC_P1,   KC_P2,    KC_P3,  KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT,           KC_P0,    KC_PDOT
+		        ),
+};
diff --git a/keyboards/kbdfans/odinmini/keymaps/via/config.h b/keyboards/kbdfans/odinmini/keymaps/via/config.h
new file mode 100644
index 0000000000..a9e995c697
--- /dev/null
+++ b/keyboards/kbdfans/odinmini/keymaps/via/config.h
@@ -0,0 +1,17 @@
+/* Copyright 2022 Dztech
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/odinmini/keymaps/via/keymap.c b/keyboards/kbdfans/odinmini/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f9bd7bbc6e
--- /dev/null
+++ b/keyboards/kbdfans/odinmini/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+ *
+ * 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_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_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+		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_END,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,
+		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                       KC_P1,   KC_P2,    KC_P3,  KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT,           KC_P0,    KC_PDOT
+                        ),
+	[1]   =LAYOUT(
+		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_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+		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_END,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,
+		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                       KC_P1,   KC_P2,    KC_P3,  KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT,           KC_P0,    KC_PDOT
+		        ),
+	[2]   =LAYOUT(
+		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_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+		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_END,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,
+		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                       KC_P1,   KC_P2,    KC_P3,  KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT,           KC_P0,    KC_PDOT
+		        ),
+	[3]   =LAYOUT(
+		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_HOME,  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+		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_END,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+		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_P4,   KC_P5,   KC_P6,
+		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,                       KC_P1,   KC_P2,    KC_P3,  KC_PENT,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT,           KC_P0,    KC_PDOT
+		        ),
+};
diff --git a/keyboards/kbdfans/odinmini/keymaps/via/rules.mk b/keyboards/kbdfans/odinmini/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kbdfans/odinmini/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kbdfans/odinmini/readme.md b/keyboards/kbdfans/odinmini/readme.md
new file mode 100644
index 0000000000..6a0c87c9e6
--- /dev/null
+++ b/keyboards/kbdfans/odinmini/readme.md
@@ -0,0 +1,21 @@
+# ODIN MINI
+
+A customizable Hotswap keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: KBDFANS
+* Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/odinmini:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix
+* **Physical reset button**: Double tap the reset button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+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).
diff --git a/keyboards/kbdfans/odinmini/rules.mk b/keyboards/kbdfans/odinmini/rules.mk
new file mode 100644
index 0000000000..997fce7e65
--- /dev/null
+++ b/keyboards/kbdfans/odinmini/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER = vendor