[Keyboard] add m6 Keyboard. (#21183)

10 files changed, 701 insertions, 0 deletions

diff --git a/keyboards/monsgeek/m6/config.h b/keyboards/monsgeek/m6/config.h
new file mode 100644
index 0000000000..5fcd897429
--- /dev/null
+++ b/keyboards/monsgeek/m6/config.h
@@ -0,0 +1,51 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+/* Use 6 dynamic keymap layers */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 400000 /* 400000 */
+
+#define RGB_MATRIX_LED_COUNT 92
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_TRIGGER_ON_KEYDOWN
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/monsgeek/m6/halconf.h b/keyboards/monsgeek/m6/halconf.h
new file mode 100644
index 0000000000..2f64e65393
--- /dev/null
+++ b/keyboards/monsgeek/m6/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * 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 HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/monsgeek/m6/info.json b/keyboards/monsgeek/m6/info.json
new file mode 100644
index 0000000000..78d6c1bf94
--- /dev/null
+++ b/keyboards/monsgeek/m6/info.json
@@ -0,0 +1,232 @@
+{
+    "keyboard_name": "M6",
+    "manufacturer": "MonsGeek",
+    "maintainer": "jonylee@hfd",
+    "usb": {
+        "force_nkro": true,
+        "vid": "0xFFFE",
+        "pid": "0x0011",
+        "device_version": "1.0.0",
+        "suspend_wakeup_delay": 400
+    },
+    "processor": "WB32FQ95",
+    "bootloader": "wb32-dfu",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
+        "rows": ["C6", "C7", "C8", "C9", "A8"]
+    },
+    "diode_direction": "ROW2COL",
+    "rgb_matrix": {
+        "driver": "IS31FL3733",
+        "max_brightness": 200,
+        "val_steps": 20,
+        "animations": {
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "raindrops": true,
+            "typing_heatmap": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "multisplash": true
+        },
+        "layout":[
+            { "flags": 4, "matrix": [0, 0],   "x":  0, "y": 0},
+            { "flags": 4, "matrix": [0, 1],   "x": 13, "y": 0},
+            { "flags": 4, "matrix": [0, 2],   "x": 26, "y": 0},
+            { "flags": 4, "matrix": [0, 3],   "x": 39, "y": 0},
+            { "flags": 4, "matrix": [0, 4],   "x": 52, "y": 0},
+            { "flags": 4, "matrix": [0, 5],   "x": 65, "y": 0},
+            { "flags": 4, "matrix": [0, 6],   "x": 78, "y": 0},
+            { "flags": 4, "matrix": [0, 7],   "x":115, "y": 0},
+            { "flags": 4, "matrix": [0, 8],   "x":128, "y": 0},
+            { "flags": 4, "matrix": [0, 9],   "x":141, "y": 0},
+            { "flags": 4, "matrix": [0, 10],  "x":154, "y": 0},
+            { "flags": 4, "matrix": [0, 11],  "x":167, "y": 0},
+            { "flags": 4, "matrix": [0, 12],  "x":180, "y": 0},
+            { "flags": 4, "matrix": [0, 13],  "x":193, "y": 0},
+            { "flags": 4, "matrix": [0, 15],  "x":224, "y": 0},
+
+            { "flags": 4, "matrix": [1, 0],   "x":  0, "y": 16},
+            { "flags": 4, "matrix": [1, 1],   "x": 19, "y": 16},
+            { "flags": 4, "matrix": [1, 2],   "x": 33, "y": 16},
+            { "flags": 4, "matrix": [1, 3],   "x": 46, "y": 16},
+            { "flags": 4, "matrix": [1, 4],   "x": 59, "y": 16},
+            { "flags": 4, "matrix": [1, 5],   "x": 72, "y": 16},
+            { "flags": 4, "matrix": [1, 6],   "x":108, "y": 16},
+            { "flags": 4, "matrix": [1, 7],   "x":122, "y": 16},
+            { "flags": 4, "matrix": [1, 8],   "x":135, "y": 16},
+            { "flags": 4, "matrix": [1, 9],   "x":148, "y": 16},
+            { "flags": 4, "matrix": [1, 10],  "x":161, "y": 16},
+            { "flags": 4, "matrix": [1, 11],  "x":174, "y": 16},
+            { "flags": 4, "matrix": [1, 12],  "x":187, "y": 16},
+            { "flags": 4, "matrix": [1, 13],  "x":200, "y": 16},
+            { "flags": 4, "matrix": [1, 15],  "x":224, "y": 16},
+
+            { "flags": 4, "matrix": [2, 0],   "x":  0, "y": 32},
+            { "flags": 4, "matrix": [2, 1],   "x": 23, "y": 32},
+            { "flags": 4, "matrix": [2, 2],   "x": 36, "y": 32},
+            { "flags": 4, "matrix": [2, 3],   "x": 49, "y": 32},
+            { "flags": 4, "matrix": [2, 4],   "x": 62, "y": 32},
+            { "flags": 4, "matrix": [2, 5],   "x": 75, "y": 32},
+            { "flags": 4, "matrix": [2, 6],   "x":112, "y": 32},
+            { "flags": 4, "matrix": [2, 7],   "x":125, "y": 32},
+            { "flags": 4, "matrix": [2, 8],   "x":138, "y": 32},
+            { "flags": 4, "matrix": [2, 9],   "x":151, "y": 32},
+            { "flags": 4, "matrix": [2, 10],   "x":164, "y": 32},
+            { "flags": 4, "matrix": [2, 11],   "x":177, "y": 32},
+            { "flags": 4, "matrix": [2, 12],   "x":190, "y": 32},
+            { "flags": 4, "matrix": [2, 13],   "x":203, "y": 32},
+            { "flags": 4, "matrix": [2, 15],   "x":224, "y": 32},
+
+            { "flags": 4, "matrix": [3, 0],   "x":  0, "y": 48},
+            { "flags": 4, "matrix": [3, 11],  "x": 16, "y": 48},
+            { "flags": 4, "matrix": [3, 1],   "x": 29, "y": 48},
+            { "flags": 4, "matrix": [3, 2],   "x": 42, "y": 48},
+            { "flags": 4, "matrix": [3, 3],   "x": 65, "y": 48},
+            { "flags": 4, "matrix": [3, 4],   "x": 78, "y": 48},
+            { "flags": 4, "matrix": [3, 5],   "x": 91, "y": 48},
+            { "flags": 4, "matrix": [3, 6],   "x":105, "y": 48},
+            { "flags": 4, "matrix": [3, 7],   "x":118, "y": 48},
+            { "flags": 4, "matrix": [3, 8],   "x":131, "y": 48},
+            { "flags": 4, "matrix": [3, 9],   "x":144, "y": 48},
+            { "flags": 4, "matrix": [3, 10],  "x":158, "y": 48},
+            { "flags": 4, "matrix": [3, 13],  "x":171, "y": 48},
+            { "flags": 4, "matrix": [3, 14],  "x":184, "y": 48},
+            { "flags": 4, "matrix": [3, 15],  "x":210, "y": 48},
+
+            { "flags": 4, "matrix": [4, 0],   "x":  0, "y": 64},
+            { "flags": 4, "matrix": [4, 1],   "x": 37, "y": 64},
+            { "flags": 4, "matrix": [4, 2],   "x": 59, "y": 64},
+            { "flags": 4, "matrix": [4, 5],   "x": 85, "y": 64},
+            { "flags": 4, "matrix": [4, 9],   "x":105, "y": 64},
+            { "flags": 4, "matrix": [4, 10],  "x":138, "y": 64},
+            { "flags": 4, "matrix": [4, 11],  "x":158, "y": 64},
+            { "flags": 4, "matrix": [4, 13],  "x":196, "y": 64},
+            { "flags": 4, "matrix": [4, 14],  "x":210, "y": 64},
+            { "flags": 4, "matrix": [4, 15],  "x":224, "y": 64},
+
+            { "flags": 2, "x":0, "y":0},
+            { "flags": 2, "x":0, "y":6},
+            { "flags": 2, "x":0, "y":13},
+            { "flags": 2, "x":0, "y":19},
+            { "flags": 2, "x":0, "y":25},
+            { "flags": 2, "x":0, "y":32},
+            { "flags": 2, "x":0, "y":38},
+            { "flags": 2, "x":0, "y":45},
+            { "flags": 2, "x":0, "y":51},
+            { "flags": 2, "x":0, "y":57},
+            { "flags": 2, "x":0, "y":64},
+
+            { "flags": 2, "x":224, "y":0},
+            { "flags": 2, "x":224, "y":6},
+            { "flags": 2, "x":224, "y":13},
+            { "flags": 2, "x":224, "y":19},
+            { "flags": 2, "x":224, "y":25},
+            { "flags": 2, "x":224, "y":32},
+            { "flags": 2, "x":224, "y":38},
+            { "flags": 2, "x":224, "y":45},
+            { "flags": 2, "x":224, "y":51},
+            { "flags": 2, "x":224, "y":57},
+            { "flags": 2, "x":224, "y":64}
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y":0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 8.75, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 9.75, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 10.75, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 11.75, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 12.75, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 13.75, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 13], "w": 2, "x": 14.75, "y": 0 },
+                { "label": "Del", "matrix": [0, 15], "x": 17, "y": 0 },
+
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1.25 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.25 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.25 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.25 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.25 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.25 },
+                { "label": "Y", "matrix": [1, 6], "x": 8.25, "y": 1.25 },
+                { "label": "U", "matrix": [1, 7], "x": 9.25, "y": 1.25 },
+                { "label": "I", "matrix": [1, 8], "x": 10.25, "y": 1.25 },
+                { "label": "O", "matrix": [1, 9], "x": 11.25, "y": 1.25 },
+                { "label": "P", "matrix": [1, 10], "x": 12.25, "y": 1.25 },
+                { "label": "{", "matrix": [1, 11], "x": 13.25, "y": 1.25 },
+                { "label": "}", "matrix": [1, 12], "x": 14.25, "y": 1.25 },
+                { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 15.25, "y": 1.25 },
+                { "label": "PageUp", "matrix": [1, 15], "x": 17, "y": 1.25 },
+
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2.25 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.25 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.25 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.25 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.25 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.25 },
+                { "label": "H", "matrix": [2, 6], "x": 8.5, "y": 2.25 },
+                { "label": "J", "matrix": [2, 7], "x": 9.5, "y": 2.25 },
+                { "label": "K", "matrix": [2, 8], "x": 10.5, "y": 2.25 },
+                { "label": "L", "matrix": [2, 9], "x": 11.5, "y": 2.25 },
+                { "label": ":", "matrix": [2, 10], "x": 12.5, "y": 2.25 },
+                { "label": "'", "matrix": [2, 11], "x": 13.5, "y": 2.25 },
+                { "label": ":", "matrix": [2, 12], "x": 14.5, "y": 2.25 },
+                { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 14.5, "y": 2.25 },
+                { "label": "PageDn", "matrix": [2, 15], "x": 17, "y": 2.25 },
+
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3.25 },
+                { "label": ":", "matrix": [3, 11], "x": 1.25, "y": 3.25 },
+                { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3.25 },
+                { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3.25 },
+                { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3.25 },
+                { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3.25 },
+                { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3.25 },
+                { "label": "B", "matrix": [3, 6], "x": 8, "y": 3.25 },
+                { "label": "N", "matrix": [3, 7], "x": 9, "y": 3.25 },
+                { "label": "M", "matrix": [3, 8], "x": 10, "y": 3.25 },
+                { "label": "<", "matrix": [3, 9], "x": 11, "y": 3.25 },
+                { "label": ">", "matrix": [3, 10], "x": 12, "y": 3.25 },
+                { "label": "?", "matrix": [3, 13], "x": 13, "y": 3.25 },
+                { "label": "Shift", "matrix": [3, 14], "w": 1.75, "x": 14, "y": 3.25 },
+                { "label": "Up", "matrix": [3, 15], "x": 16, "y": 3.25 },
+
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4.25 },
+                { "label": "Alt", "matrix": [4, 1], "w": 1.5, "x": 3, "y": 4.25 },
+                { "label": "Space", "matrix": [4, 2], "w": 2, "x": 4.5, "y": 4.25 },
+                { "label": "Win", "matrix": [4, 5], "w": 1.25, "x": 6.5, "y": 4.25 },
+                { "label": "Space", "matrix": [4, 9], "w": 2.5, "x": 8, "y": 4.25 },
+                { "label": "Alt", "matrix": [4, 10], "w":1.5, "x": 10.5, "y": 4.25 },
+                { "label": "Fn", "matrix": [4, 11], "w":1.5, "x": 12, "y": 4.25 },
+                { "label": "Left", "matrix": [4, 13], "x": 15, "y": 4.25 },
+                { "label": "Down", "matrix": [4, 14], "x": 16, "y": 4.25 },
+                { "label": "Right", "matrix": [4, 15], "x": 17, "y": 4.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/monsgeek/m6/keymaps/default/keymap.c b/keyboards/monsgeek/m6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8a03db1790
--- /dev/null
+++ b/keyboards/monsgeek/m6/keymaps/default/keymap.c
@@ -0,0 +1,76 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+enum __layers {
+    WIN_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT( /* Base */
+        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_DEL,
+        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_NUHS,  KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, 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_UP,
+        KC_LCTL,                   KC_LALT, KC_SPC,           KC_LGUI, KC_SPC,                   KC_RALT, MO(WIN_FN),        KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_W] = LAYOUT( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W,
+        _______,                   _______, _______,          _______, _______,                  _______, _______,           KC_A,    KC_S,    KC_D),
+
+    [WIN_FN] = LAYOUT(
+        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,   _______,           RGB_MOD,
+        _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS,  DF(MAC_B),KC_PSCR,_______, _______, _______,           KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_SPD, RGB_SPI, _______, RGB_HUI,           KC_END,
+        _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,  RGB_VAI,
+        _______,                   _______, _______,          GU_TOGG, _______,                  _______, _______,           RGB_SAD,  RGB_VAD, RGB_SAI),
+
+    [MAC_B] = LAYOUT( /* Base */
+        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_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_NUHS,  KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, 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_UP,
+        KC_LCTL,                   KC_LGUI, KC_SPC,           KC_LALT, KC_SPC,                    KC_RGUI, MO(WIN_FN),       KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_W] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, _______,          KC_A,    KC_S,    KC_D),
+
+    [MAC_FN] = LAYOUT( /* FN */
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU,  _______,           RGB_MOD,
+        _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS,  DF(WIN_B),KC_PSCR,_______, _______, _______,           KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_SPD, RGB_SPI, _______, RGB_HUI,           KC_END,
+        _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,  RGB_VAI,
+        _______,                   _______, _______,          _______, _______,                  _______, _______,           RGB_SAD,  RGB_VAD, RGB_SAI),
+};
+
diff --git a/keyboards/monsgeek/m6/keymaps/via/keymap.c b/keyboards/monsgeek/m6/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b7e8cecd71
--- /dev/null
+++ b/keyboards/monsgeek/m6/keymaps/via/keymap.c
@@ -0,0 +1,76 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+enum __layers {
+    WIN_B,
+    WIN_W,
+    WIN_FN,
+    MAC_B,
+    MAC_W,
+    MAC_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+#define KC_SIRI LCMD(KC_SPC)
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_B] = LAYOUT( /* Base */
+        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_DEL,
+        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_NUHS,  KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, 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_UP,
+        KC_LCTL,                   KC_LALT, KC_SPC,           KC_LGUI, KC_SPC,                   KC_RALT, MO(WIN_FN),        KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_W] = LAYOUT( /* Base */
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W,
+        _______,                   _______, _______,          _______, _______,                  _______, _______,           KC_A,    KC_S,    KC_D),
+
+    [WIN_FN] = LAYOUT( 
+        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,   _______,           RGB_MOD,
+        _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS,  DF(MAC_B),KC_PSCR,_______, _______, _______,           KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_SPD, RGB_SPI, _______, RGB_HUI,           KC_END,
+        _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,  RGB_VAI,
+        _______,                   _______, _______,          GU_TOGG, _______,                  _______, _______,           RGB_SAD,  RGB_VAD, RGB_SAI),
+
+    [MAC_B] = LAYOUT( /* Base */
+        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_DEL,
+        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_NUHS,  KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, 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_UP,
+        KC_LCTL,                   KC_LGUI, KC_SPC,           KC_LALT, KC_SPC,                    KC_RGUI, MO(MAC_FN),       KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [MAC_W] = LAYOUT( 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W,
+        _______, _______, _______,                   _______,                            _______, _______, _______,          KC_A,    KC_S,    KC_D),
+
+    [MAC_FN] = LAYOUT( /* FN */
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU,  _______,           RGB_MOD,
+        _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS,  DF(WIN_B),KC_PSCR,_______, _______, _______,           KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_SPD, RGB_SPI, _______, RGB_HUI,           KC_END,
+        _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,  RGB_VAI,
+        _______,                   _______, _______,          _______, _______,                  _______, _______,           RGB_SAD,  RGB_VAD, RGB_SAI),
+};
+
diff --git a/keyboards/monsgeek/m6/keymaps/via/rules.mk b/keyboards/monsgeek/m6/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/monsgeek/m6/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/monsgeek/m6/m6.c b/keyboards/monsgeek/m6/m6.c
new file mode 100644
index 0000000000..1823d865cc
--- /dev/null
+++ b/keyboards/monsgeek/m6/m6.c
@@ -0,0 +1,197 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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 "quantum.h"
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, A_1,   B_1,   C_1},
+    {0, A_2,   B_2,   C_2},
+    {0, A_3,   B_3,   C_3},
+    {0, A_4,   B_4,   C_4},
+    {0, A_5,   B_5,   C_5},
+    {0, A_6,   B_6,   C_6},
+    {0, A_7,   B_7,   C_7},
+    {0, A_8,   B_8,   C_8},
+    {0, A_9,   B_9,   C_9},
+    {0, A_10,  B_10,  C_10},
+    {0, A_11,  B_11,  C_11},
+    {0, A_12,  B_12,  C_12},
+    {0, A_13,  B_13,  C_13},
+    {0, A_14,  B_14,  C_14},
+    {1, D_1,   E_1,   F_1},
+
+    {0, D_1,   E_1,   F_1},
+    {0, D_2,   E_2,   F_2},
+    {0, D_3,   E_3,   F_3},
+    {0, D_4,   E_4,   F_4},
+    {0, D_5,   E_5,   F_5},
+    {0, D_6,   E_6,   F_6},
+    {0, D_7,   E_7,   F_7},
+    {0, D_8,   E_8,   F_8},
+    {0, D_9,   E_9,   F_9},
+    {0, D_10,  E_10,  F_10},
+    {0, D_11,  E_11,  F_11},
+    {0, D_12,  E_12,  F_12},
+    {0, D_13,  E_13,  F_13},
+    {0, D_14,  E_14,  F_14},
+    {1, D_2,   E_2,   F_2},
+
+    {0, G_1,   H_1,   I_1},
+    {0, G_2,   H_2,   I_2},
+    {0, G_3,   H_3,   I_3},
+    {0, G_4,   H_4,   I_4},
+    {0, G_5,   H_5,   I_5},
+    {0, G_6,   H_6,   I_6},
+    {0, G_7,   H_7,   I_7},
+    {0, G_8,   H_8,   I_8},
+    {0, G_9,   H_9,   I_9},
+    {0, G_10,  H_10,  I_10},
+    {0, G_11,  H_11,  I_11},
+    {0, G_12,  H_12,  I_12},
+    {0, A_15,  B_15,  C_15},
+    {0, G_13,  H_13,  I_13},
+    {1, D_3,   E_3,   F_3},
+
+    {0, J_1,   K_1,   L_1},
+    {0, A_16,  B_16,  C_16},
+    {0, J_2,   K_2,   L_2},
+    {0, J_3,   K_3,   L_3},
+    {0, J_4,   K_4,   L_4},
+    {0, J_5,   K_5,   L_5},
+    {0, J_6,   K_6,   L_6},
+    {0, J_7,   K_7,   L_7},
+    {0, J_8,   K_8,   L_8},
+    {0, J_9,   K_9,   L_9},
+    {0, J_10,  K_10,  L_10},
+    {0, J_11,  K_11,  L_11},
+    {0, J_12,  K_12,  L_12},
+    {1, D_7,   E_7,   F_7},
+    {1, D_4,   E_4,   F_4},
+
+    {0, J_13,  K_13,  L_13},
+    {0, J_14,  K_14,  L_14},
+    {0, J_15,  K_15,  L_15},
+    {0, J_16,  K_16,  L_16},
+    {0, G_14,  H_14,  I_14},
+    {0, G_15,  H_15,  I_15},
+    {0, G_16,  H_16,  I_16},
+    {0, D_15,  E_15,  F_15},
+    {1, D_6,   E_6,   F_6},
+    {1, D_5,   E_5,   F_5},
+
+
+    {1, G_1,   H_1,   I_1},
+    {1, G_2,   H_2,   I_2},
+    {1, G_3,   H_3,   I_3},
+    {1, G_4,   H_4,   I_4},
+    {1, G_5,   H_5,   I_5},
+    {1, G_6,   H_6,   I_6},
+    {1, G_7,   H_7,   I_7},
+    {1, G_8,   H_8,   I_8},
+    {1, G_9,   H_9,   I_9},
+    {1, G_10,  H_10,  I_10},
+    {1, G_11,  H_11,  I_11},
+
+    {1, J_1,   K_1,   L_1},
+    {1, J_2,   K_2,   L_2},
+    {1, J_3,   K_3,   L_3},
+    {1, J_4,   K_4,   L_4},
+    {1, J_5,   K_5,   L_5},
+    {1, J_6,   K_6,   L_6},
+    {1, J_7,   K_7,   L_7},
+    {1, J_8,   K_8,   L_8},
+    {1, J_9,   K_9,   L_9},
+    {1, J_10,  K_10,  L_10},
+    {1, J_11,  K_11,  L_11},
+};
+
+// clang-format on
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max)
+{
+    if (!rgb_matrix_indicators_advanced_user(led_min, led_max))
+    {
+        return false;
+    }
+
+    if (host_keyboard_led_state().caps_lock)
+    {
+        RGB_MATRIX_INDICATOR_SET_COLOR(30, 255, 255, 255);
+    }
+    else
+    {
+        if (!rgb_matrix_get_flags())
+        {
+            RGB_MATRIX_INDICATOR_SET_COLOR(30, 0, 0, 0);
+        }
+    }
+    if (keymap_config.no_gui)
+    {
+        RGB_MATRIX_INDICATOR_SET_COLOR(63, 255, 255, 255);
+    }
+    else
+    {
+        if (!rgb_matrix_get_flags())
+        {
+            RGB_MATRIX_INDICATOR_SET_COLOR(63, 0, 0, 0);
+        }
+    }
+    return true;
+}
+
+#endif
+bool process_record_kb(uint16_t keycode, keyrecord_t *record)
+{
+    if (!process_record_user(keycode, record))
+    {
+        return false;
+    }
+    switch (keycode)
+    {
+    case RGB_TOG:
+        if (record->event.pressed)
+        {
+            switch (rgb_matrix_get_flags())
+            {
+            case LED_FLAG_ALL:
+            {
+                rgb_matrix_set_flags(LED_FLAG_NONE);
+                rgb_matrix_set_color_all(0, 0, 0);
+            }
+            break;
+            default:
+            {
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+            }
+            break;
+            }
+        }
+        if (!rgb_matrix_is_enabled())
+        {
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable();
+        }
+        return false;
+    default:
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/keyboards/monsgeek/m6/mcuconf.h b/keyboards/monsgeek/m6/mcuconf.h
new file mode 100644
index 0000000000..e2884f3828
--- /dev/null
+++ b/keyboards/monsgeek/m6/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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_next <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/monsgeek/m6/readme.md b/keyboards/monsgeek/m6/readme.md
new file mode 100644
index 0000000000..ca30e5da20
--- /dev/null
+++ b/keyboards/monsgeek/m6/readme.md
@@ -0,0 +1,19 @@
+# monsgeek m6 keyboard
+
+A customizable 60% keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: m6
+* Hardware Availability: [monsgeek](https://www.monsgeek.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make monsgeek/m6:default
+
+Flashing example for this keyboard:
+
+    make monsgeek/m6:default:flash
+    
+**Reset Key**: Hold down the key located at *K00*, which programmed as *Esc* while plugging in the keyboard.
+
+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/monsgeek/m6/rules.mk b/keyboards/monsgeek/m6/rules.mk
new file mode 100644
index 0000000000..24d5f6f52e
--- /dev/null
+++ b/keyboards/monsgeek/m6/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash