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

10 files changed, 396 insertions, 0 deletions

diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h
new file mode 100644
index 0000000000..b79b5211c2
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/config.h
@@ -0,0 +1,65 @@
+/*
+Copyright 2021 Mechlovin' Studio
+
+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    0x4D4C
+#define PRODUCT_ID   0x6C01
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Mechlovin Studio and Hex Keyboard
+#define PRODUCT      Hex6C
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 21
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
+#define MATRIX_COL_PINS { A13, A14, A1, A0, C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN A3
+#define LED_CAPS_LOCK_PIN A4
+#define LED_SCROLL_LOCK_PIN A8
+#define LED_PIN_ON_STATE 0 
+
+#define BACKLIGHT_PIN B0
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_PWM_DRIVER PWMD3
+#define BACKLIGHT_PWM_CHANNEL 3
+
+#define ENCODERS_PAD_A { A15 }
+#define ENCODERS_PAD_B { A2 }
+#define ENCODER_RESOLUTION 4
+
+#define TAP_CODE_DELAY 10
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
\ No newline at end of file
diff --git a/keyboards/mechlovin/hex6c/hex6c.c b/keyboards/mechlovin/hex6c/hex6c.c
new file mode 100644
index 0000000000..255121dc19
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/hex6c.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * 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 "hex6c.h"
diff --git a/keyboards/mechlovin/hex6c/hex6c.h b/keyboards/mechlovin/hex6c/hex6c.h
new file mode 100644
index 0000000000..eb5cd735cb
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/hex6c.h
@@ -0,0 +1,35 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03,  K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H,       K0I, K0J, K0K, \
+    K10, K11, K12, K13,  K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K2H,  K1I, K1J, K1K, \
+    K20, K21, K22, K23,  K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K3G,       K2I, K2J, K2K, \
+    K30, K31, K32, K33,  K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3H,                           \
+    K40, K41, K42, K43,  K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H,            K4J,      \
+    K50, K51, K52, K53,  K54, K55,  K56,               K5A,           K5E, K5F, K5G, K5H,            K5I, K5J, K5K  \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   K0H,   K0I,   K0J,   K0K   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G,   K1H,   K1I,   K1J,   K1K   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G,   K2H,   K2I,   K2J,   K2K   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F,   K3G,   K3H,   KC_NO, KC_NO, KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   K4G,   K4H,   KC_NO, K4J,   KC_NO }, \
+    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   KC_NO, KC_NO, KC_NO, K5A,   KC_NO, KC_NO, KC_NO, K5E,   K5F,   K5G,   K5H,   K5I,   K5J,   K5K   }, \
+}
diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json
new file mode 100644
index 0000000000..f7692bb805
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/info.json
@@ -0,0 +1,128 @@
+{
+    "keyboard_name": "hex-6C",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "width": 22.5,
+    "height": 6.25,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"K00 (B0,B6)", "x":0, "y":0},
+                {"label":"K01 (B0,B7)", "x":1, "y":0},
+                {"label":"K02 (B0,C0)", "x":2, "y":0},
+                {"label":"K03 (B0,C1)", "x":3, "y":0},
+                {"label":"K04 (B0,C2)", "x":4.25, "y":0},
+                {"label":"K05 (B0,C3)", "x":5.5, "y":0},
+                {"label":"K06 (B0,C4)", "x":6.5, "y":0},
+                {"label":"K07 (B0,C5)", "x":7.5, "y":0},
+                {"label":"K08 (B0,C6)", "x":8.5, "y":0},
+                {"label":"K09 (B0,C7)", "x":9.75, "y":0},
+                {"label":"K0A (B0,D0)", "x":10.75, "y":0},
+                {"label":"K0B (B0,D1)", "x":11.75, "y":0},
+                {"label":"K0C (B0,D2)", "x":12.75, "y":0},
+                {"label":"K0D (B0,D3)", "x":14, "y":0},
+                {"label":"K0E (B0,D4)", "x":15, "y":0},
+                {"label":"K0F (B0,D5)", "x":16, "y":0},
+                {"label":"K0G (B0,D6)", "x":17, "y":0},
+                {"label":"K0H (B0,D7)", "x":18.25, "y":0},
+                {"label":"K0I (B0,E0)", "x":19.5, "y":0},
+                {"label":"K0J (B0,E1)", "x":20.5, "y":0},
+                {"label":"K0K (B0,E2)", "x":21.5, "y":0},
+                {"label":"K10 (B1,B6)", "x":0, "y":1.25},
+                {"label":"K11 (B1,B7)", "x":1, "y":1.25},
+                {"label":"K12 (B1,C0)", "x":2, "y":1.25},
+                {"label":"K13 (B1,C1)", "x":3, "y":1.25},
+                {"label":"K14 (B1,C2)", "x":4.25, "y":1.25},
+                {"label":"K15 (B1,C3)", "x":5.25, "y":1.25},
+                {"label":"K16 (B1,C4)", "x":6.25, "y":1.25},
+                {"label":"K17 (B1,C5)", "x":7.25, "y":1.25},
+                {"label":"K18 (B1,C6)", "x":8.25, "y":1.25},
+                {"label":"K19 (B1,C7)", "x":9.25, "y":1.25},
+                {"label":"K1A (B1,D0)", "x":10.25, "y":1.25},
+                {"label":"K1B (B1,D1)", "x":11.25, "y":1.25},
+                {"label":"K1C (B1,D2)", "x":12.25, "y":1.25},
+                {"label":"K1D (B1,D3)", "x":13.25, "y":1.25},
+                {"label":"K1E (B1,D4)", "x":14.25, "y":1.25},
+                {"label":"K1F (B1,D5)", "x":15.25, "y":1.25},
+                {"label":"K1G (B1,D6)", "x":16.25, "y":1.25},
+                {"label":"K1H (B1,D7)", "x":17.25, "y":1.25},
+                {"label":"K2H (B2,D7)", "x":18.25, "y":1.25},
+                {"label":"K1I (B1,E0)", "x":19.5, "y":1.25},
+                {"label":"K1J (B1,E1)", "x":20.5, "y":1.25},
+                {"label":"K1K (B1,E2)", "x":21.5, "y":1.25},
+                {"label":"K20 (B2,B6)", "x":0, "y":2.25},
+                {"label":"K21 (B2,B7)", "x":1, "y":2.25},
+                {"label":"K22 (B2,C0)", "x":2, "y":2.25},
+                {"label":"K23 (B2,C1)", "x":3, "y":2.25},
+                {"label":"K24 (B2,C2)", "x":4.25, "y":2.25, "w":1.5},
+                {"label":"K25 (B2,C3)", "x":5.75, "y":2.25},
+                {"label":"K26 (B2,C4)", "x":6.75, "y":2.25},
+                {"label":"K27 (B2,C5)", "x":7.75, "y":2.25},
+                {"label":"K28 (B2,C6)", "x":8.75, "y":2.25},
+                {"label":"K29 (B2,C7)", "x":9.75, "y":2.25},
+                {"label":"K2A (B2,D0)", "x":10.75, "y":2.25},
+                {"label":"K2B (B2,D1)", "x":11.75, "y":2.25},
+                {"label":"K2C (B2,D2)", "x":12.75, "y":2.25},
+                {"label":"K2D (B2,D3)", "x":13.75, "y":2.25},
+                {"label":"K2E (B2,D4)", "x":14.75, "y":2.25},
+                {"label":"K2F (B2,D5)", "x":15.75, "y":2.25},
+                {"label":"K2G (B2,D6)", "x":16.75, "y":2.25},
+                {"label":"K3G (B3,D6)", "x":17.75, "y":2.25, "w":1.5},
+                {"label":"K2I (B2,E0)", "x":19.5, "y":2.25},
+                {"label":"K2J (B2,E1)", "x":20.5, "y":2.25},
+                {"label":"K2K (B2,E2)", "x":21.5, "y":2.25},
+                {"label":"K30 (B3,B6)", "x":0, "y":3.25},
+                {"label":"K31 (B3,B7)", "x":1, "y":3.25},
+                {"label":"K32 (B3,C0)", "x":2, "y":3.25},
+                {"label":"K33 (B3,C1)", "x":3, "y":3.25},
+                {"label":"K34 (B3,C2)", "x":4.25, "y":3.25, "w":1.75},
+                {"label":"K35 (B3,C3)", "x":6, "y":3.25},
+                {"label":"K36 (B3,C4)", "x":7, "y":3.25},
+                {"label":"K37 (B3,C5)", "x":8, "y":3.25},
+                {"label":"K38 (B3,C6)", "x":9, "y":3.25},
+                {"label":"K39 (B3,C7)", "x":10, "y":3.25},
+                {"label":"K3A (B3,D0)", "x":11, "y":3.25},
+                {"label":"K3B (B3,D1)", "x":12, "y":3.25},
+                {"label":"K3C (B3,D2)", "x":13, "y":3.25},
+                {"label":"K3D (B3,D3)", "x":14, "y":3.25},
+                {"label":"K3E (B3,D4)", "x":15, "y":3.25},
+                {"label":"K3F (B3,D5)", "x":16, "y":3.25},
+                {"label":"K3H (B3,D7)", "x":17, "y":3.25, "w":2.25},
+                {"label":"K40 (B4,B6)", "x":0, "y":4.25},
+                {"label":"K41 (B4,B7)", "x":1, "y":4.25},
+                {"label":"K42 (B4,C0)", "x":2, "y":4.25},
+                {"label":"K43 (B4,C1)", "x":3, "y":4.25},
+                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "w":1.25},
+                {"label":"K45 (B4,C3)", "x":5.5, "y":4.25},
+                {"label":"K46 (B4,C4)", "x":6.5, "y":4.25},
+                {"label":"K47 (B4,C5)", "x":7.5, "y":4.25},
+                {"label":"K48 (B4,C6)", "x":8.5, "y":4.25},
+                {"label":"K49 (B4,C7)", "x":9.5, "y":4.25},
+                {"label":"K4A (B4,D0)", "x":10.5, "y":4.25},
+                {"label":"K4B (B4,D1)", "x":11.5, "y":4.25},
+                {"label":"K4C (B4,D2)", "x":12.5, "y":4.25},
+                {"label":"K4D (B4,D3)", "x":13.5, "y":4.25},
+                {"label":"K4E (B4,D4)", "x":14.5, "y":4.25},
+                {"label":"K4F (B4,D5)", "x":15.5, "y":4.25},
+                {"label":"K4G (B4,D6)", "x":16.5, "y":4.25, "w":1.75},
+                {"label":"K4H (B4,D7)", "x":18.25, "y":4.25},
+                {"label":"K4J (B4,E1)", "x":20.5, "y":4.25},
+                {"label":"K50 (B5,B6)", "x":0, "y":5.25},
+                {"label":"K51 (B5,B7)", "x":1, "y":5.25},
+                {"label":"K52 (B5,C0)", "x":2, "y":5.25},
+                {"label":"K53 (B5,C1)", "x":3, "y":5.25},
+                {"label":"K54 (B5,C2)", "x":4.25, "y":5.25, "w":1.25},
+                {"label":"K55 (B5,C3)", "x":5.5, "y":5.25, "w":1.25},
+                {"label":"K56 (B5,C4)", "x":6.75, "y":5.25, "w":1.25},
+                {"label":"K5A (B5,D0)", "x":8, "y":5.25, "w":6.25},
+                {"label":"K5E (B5,D4)", "x":14.25, "y":5.25, "w":1.25},
+                {"label":"K5F (B5,D5)", "x":15.5, "y":5.25, "w":1.25},
+                {"label":"K5G (B5,D6)", "x":16.75, "y":5.25, "w":1.25},
+                {"label":"K5H (B5,D7)", "x":18, "y":5.25, "w":1.25},
+                {"label":"K5I (B5,E0)", "x":19.5, "y":5.25},
+                {"label":"K5J (B5,E1)", "x":20.5, "y":5.25},
+                {"label":"K5K (B5,E2)", "x":21.5, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/hex6c/keymaps/default/keymap.c b/keyboards/mechlovin/hex6c/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c8ff6dad1b
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * 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_all(
+        KC_CALC, KC_MAIL, KC_MYCM, KC_MUTE,   KC_ESC,  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_F13,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_GRV,  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_INS,  KC_HOME, KC_PGUP,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,   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_DEL,  KC_END,  KC_PGDN,
+        KC_P4,   KC_P5,   KC_P6,   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_P1,   KC_P2,   KC_P3,   KC_PENT,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_SPC,                      KC_UP,
+        KC_0,    KC_PCMM, KC_PDOT, KC_PEQL,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1), KC_RCTL,              KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+};
+
+#ifdef ENCODER_ENABLE
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
+#endif
diff --git a/keyboards/mechlovin/hex6c/keymaps/default/readme.md b/keyboards/mechlovin/hex6c/keymaps/default/readme.md
new file mode 100644
index 0000000000..5d2f472b0a
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for hex6c
diff --git a/keyboards/mechlovin/hex6c/keymaps/via/keymap.c b/keyboards/mechlovin/hex6c/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6fa6045a62
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * 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_all(
+        KC_CALC, KC_MAIL, KC_MYCM, KC_MUTE,   KC_ESC,  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_F13,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,   KC_GRV,  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_INS,  KC_HOME, KC_PGUP,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,   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_DEL,  KC_END,  KC_PGDN,
+        KC_P4,   KC_P5,   KC_P6,   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_P1,   KC_P2,   KC_P3,   KC_PENT,   KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_SPC,                      KC_UP,
+        KC_0,    KC_PCMM, KC_PDOT, KC_PEQL,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1), KC_RCTL,              KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+
+};
+
+#ifdef ENCODER_ENABLE
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
+#endif
diff --git a/keyboards/mechlovin/hex6c/keymaps/via/rules.mk b/keyboards/mechlovin/hex6c/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/hex6c/readme.md b/keyboards/mechlovin/hex6c/readme.md
new file mode 100644
index 0000000000..9b81afd7ff
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/readme.md
@@ -0,0 +1,21 @@
+# hex6c
+
+![hex6c](https://i.imgur.com/uYxCTiTl.jpeg)
+
+A Southpaw Fullsize Keyboard with encoder.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://github.com/mechlovin)
+* Hardware Supported: Hex6C Keyboard, STM32F303
+* Hardware Availability: [Hex Keyboard](https://hexkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/hex6c:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/hex6c: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).
+
+**Reset Key:** To put the Hex6C into bootloader, hold esc key while plugging in (bootmagic) or push reset swith on the bottom of the PCB. 
diff --git a/keyboards/mechlovin/hex6c/rules.mk b/keyboards/mechlovin/hex6c/rules.mk
new file mode 100644
index 0000000000..99aa532c26
--- /dev/null
+++ b/keyboards/mechlovin/hex6c/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = STM32F303
+
+BOARD = QMK_PROTON_C
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes