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
+
+
+
+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
diff --git a/keyboards/mechlovin/infinity87/config.h b/keyboards/mechlovin/infinity87/config.h
index ccb9f67566..a344c98b8f 100644
--- a/keyboards/mechlovin/infinity87/config.h
+++ b/keyboards/mechlovin/infinity87/config.h
@@ -1,19 +1,18 @@
-/*
-Copyright 2020 Team Mechlovin'
-
-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/>.
-*/
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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
@@ -21,54 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4D4C // ML
-#define PRODUCT_ID 0x8701
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Team.Mechlovin
-#define PRODUCT Infinity 87
+
+#define MANUFACTURER Mechlovin.Studio
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
-
-/*
- * 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 { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7,B1, B2, B10, B3, B14, B15 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define LED_NUM_LOCK_PIN A3
-#define LED_CAPS_LOCK_PIN A4
-
-#define BACKLIGHT_PIN B0
-#define BACKLIGHT_BREATHING
-#define BACKLIGHT_PWM_DRIVER PWMD3
-#define BACKLIGHT_PWM_CHANNEL 3
-
-#define RGB_DI_PIN A15
-#define RGBLED_NUM 26
-#define RGBLIGHT_LIMIT_VAL 255
-#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-// #define RGBLIGHT_EFFECT_BREATHING
-// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-// #define RGBLIGHT_EFFECT_SNAKE
-// #define RGBLIGHT_EFFECT_KNIGHT
-// #define RGBLIGHT_EFFECT_CHRISTMAS
-// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-// #define RGBLIGHT_EFFECT_RGB_TEST
-// #define RGBLIGHT_EFFECT_ALTERNATING
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
\ No newline at end of file
+
diff --git a/keyboards/mechlovin/infinity87/infinity87.h b/keyboards/mechlovin/infinity87/infinity87.h
index 4810d9d86a..f56d960e92 100644
--- a/keyboards/mechlovin/infinity87/infinity87.h
+++ b/keyboards/mechlovin/infinity87/infinity87.h
@@ -18,12 +18,12 @@
#include "quantum.h"
#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
- K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \
+ K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
@@ -32,6 +32,3 @@
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \
{ K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \
}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/keymaps/via/rules.mk b/keyboards/mechlovin/infinity87/keymaps/via/rules.mk
index 036bd6d1c3..36b7ba9cbc 100644
--- a/keyboards/mechlovin/infinity87/keymaps/via/rules.mk
+++ b/keyboards/mechlovin/infinity87/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h
new file mode 100644
index 0000000000..467d47c6f4
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 MATRIX_ROW_PINS { A10, B13, B12, B11, C14, C15 }
+#define MATRIX_COL_PINS { C13, B9, B4, B7, B8, B5, B6, A9, A5, A6, A7, B1, B2, B10, B3, B14, B15 }
+
+#define BACKLIGHT_PIN B0
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_PWM_DRIVER PWMD3
+#define BACKLIGHT_PWM_CHANNEL 3
+
+
+#define LED_CAPS_LOCK_PIN A4
+#define LED_SCROLL_LOCK_PIN A8
+
+#define DIODE_DIRECTION COL2ROW
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev1/readme.md b/keyboards/mechlovin/infinity87/rev1/readme.md
new file mode 100644
index 0000000000..448d69ca7c
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/readme.md
@@ -0,0 +1,16 @@
+# infinity87
+
+
+
+A replacement PCB for TKL keyboard
+
+* Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin)
+* Hardware Supported: Infinity87 rev.1 (1.6mm & 1.2mm). Rouge87 for OTD, Rogue87 for UTD
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/infinity87:default
+
+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 IF87_rev1, rouge87, rogue87 into bootloader, hold esc key while plugging in (bootmagic) or push reset swith on the bottom of the PCB.
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.c b/keyboards/mechlovin/infinity87/rev1/rev1.c
new file mode 100644
index 0000000000..c65ff19838
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rev1.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 "rev1.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h
new file mode 100644
index 0000000000..16cdf9ed85
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rev1.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Team Mechlovin
+ *
+ * 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"
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/config.h b/keyboards/mechlovin/infinity87/rev1/rogue87/config.h
new file mode 100644
index 0000000000..3415f3add9
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 PRODUCT_ID 0x8704
+#define DEVICE_VER 0x0001
+#define PRODUCT Rogue87 Rev.1
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
new file mode 100644
index 0000000000..3d541cfb79
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
@@ -0,0 +1,99 @@
+{
+ "keyboard_name": "Rogue87",
+ "url": "",
+ "maintainer": "Mechlovin' Studio",
+ "width": 18.25,
+ "height": 6.25,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"K00", "x":0, "y":0},
+ {"label":"K01", "x":2, "y":0},
+ {"label":"K02", "x":3, "y":0},
+ {"label":"K03", "x":4, "y":0},
+ {"label":"K04", "x":5, "y":0},
+ {"label":"K05", "x":6.5, "y":0},
+ {"label":"K06", "x":7.5, "y":0},
+ {"label":"K07", "x":8.5, "y":0},
+ {"label":"K08", "x":9.5, "y":0},
+ {"label":"K09", "x":11, "y":0},
+ {"label":"K0A", "x":12, "y":0},
+ {"label":"K0B", "x":13, "y":0},
+ {"label":"K0C", "x":14, "y":0},
+ {"label":"K0E", "x":15.25, "y":0},
+ {"label":"K0F", "x":16.25, "y":0},
+ {"label":"K0G", "x":17.25, "y":0},
+ {"label":"K10", "x":0, "y":1.25},
+ {"label":"K11", "x":1, "y":1.25},
+ {"label":"K12", "x":2, "y":1.25},
+ {"label":"K13", "x":3, "y":1.25},
+ {"label":"K14", "x":4, "y":1.25},
+ {"label":"K15", "x":5, "y":1.25},
+ {"label":"K16", "x":6, "y":1.25},
+ {"label":"K17", "x":7, "y":1.25},
+ {"label":"K18", "x":8, "y":1.25},
+ {"label":"K19", "x":9, "y":1.25},
+ {"label":"K1A", "x":10, "y":1.25},
+ {"label":"K1B", "x":11, "y":1.25},
+ {"label":"K1C", "x":12, "y":1.25},
+ {"label":"K1D", "x":13, "y":1.25, "w":2},
+ {"label":"K1E", "x":15.25, "y":1.25},
+ {"label":"K1F", "x":16.25, "y":1.25},
+ {"label":"K1G", "x":17.25, "y":1.25},
+ {"label":"K20", "x":0, "y":2.25, "w":1.5},
+ {"label":"K21", "x":1.5, "y":2.25},
+ {"label":"K22", "x":2.5, "y":2.25},
+ {"label":"K23", "x":3.5, "y":2.25},
+ {"label":"K24", "x":4.5, "y":2.25},
+ {"label":"K25", "x":5.5, "y":2.25},
+ {"label":"K26", "x":6.5, "y":2.25},
+ {"label":"K27", "x":7.5, "y":2.25},
+ {"label":"K28", "x":8.5, "y":2.25},
+ {"label":"K29", "x":9.5, "y":2.25},
+ {"label":"K2A", "x":10.5, "y":2.25},
+ {"label":"K2B", "x":11.5, "y":2.25},
+ {"label":"K2C", "x":12.5, "y":2.25},
+ {"label":"K2D", "x":13.5, "y":2.25, "w":1.5},
+ {"label":"K2E", "x":15.25, "y":2.25},
+ {"label":"K2F", "x":16.25, "y":2.25},
+ {"label":"K2G", "x":17.25, "y":2.25},
+ {"label":"K30", "x":0, "y":3.25, "w":1.75},
+ {"label":"K31", "x":1.75, "y":3.25},
+ {"label":"K32", "x":2.75, "y":3.25},
+ {"label":"K33", "x":3.75, "y":3.25},
+ {"label":"K34", "x":4.75, "y":3.25},
+ {"label":"K35", "x":5.75, "y":3.25},
+ {"label":"K36", "x":6.75, "y":3.25},
+ {"label":"K37", "x":7.75, "y":3.25},
+ {"label":"K38", "x":8.75, "y":3.25},
+ {"label":"K39", "x":9.75, "y":3.25},
+ {"label":"K3A", "x":10.75, "y":3.25},
+ {"label":"K3B", "x":11.75, "y":3.25},
+ {"label":"K3C", "x":12.75, "y":3.25},
+ {"label":"K3D", "x":13.75, "y":3.25, "w":1.25},
+ {"label":"K40", "x":0, "y":4.25, "w":1.25},
+ {"label":"K41", "x":1.25, "y":4.25},
+ {"label":"K42", "x":2.25, "y":4.25},
+ {"label":"K43", "x":3.25, "y":4.25},
+ {"label":"K44", "x":4.25, "y":4.25},
+ {"label":"K45", "x":5.25, "y":4.25},
+ {"label":"K46", "x":6.25, "y":4.25},
+ {"label":"K47", "x":7.25, "y":4.25},
+ {"label":"K48", "x":8.25, "y":4.25},
+ {"label":"K49", "x":9.25, "y":4.25},
+ {"label":"K4A", "x":10.25, "y":4.25},
+ {"label":"K4B", "x":11.25, "y":4.25},
+ {"label":"K4D", "x":12.25, "y":4.25, "w":2.75},
+ {"label":"K4F", "x":16.25, "y":4.25},
+ {"label":"K50", "x":0, "y":5.25, "w":1.5},
+ {"label":"K52", "x":2.5, "y":5.25, "w":1.5},
+ {"label":"K56", "x":4, "y":5.25, "w":7},
+ {"label":"K5B", "x":11, "y":5.25, "w":1.5},
+ {"label":"K5D", "x":13.5, "y":5.25, "w":1.5},
+ {"label":"K5E", "x":15.25, "y":5.25},
+ {"label":"K5F", "x":16.25, "y":5.25},
+ {"label":"K5G", "x":17.25, "y":5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7e0bcb49d3
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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_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_PSCR, KC_SLCK, KC_PAUS,
+ 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_INS, KC_HOME, KC_PGUP,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
+ KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+};
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/readme.md
new file mode 100644
index 0000000000..01ef555056
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for infinity87
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0c1aa67f4f
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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_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_PSCR, KC_SLCK, KC_PAUS,
+ 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_INS, KC_HOME, KC_PGUP,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
+ KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, 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
+ ),
+ [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
+ ),
+ [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
+ ),
+
+};
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/readme.md
new file mode 100644
index 0000000000..8867d290cd
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for infinity87
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/rules.mk b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/readme.md b/keyboards/mechlovin/infinity87/rev1/rogue87/readme.md
new file mode 100644
index 0000000000..a3fb9ef554
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/readme.md
@@ -0,0 +1,19 @@
+# Rogue87 PCB
+
+
+
+A replacement PCB for UTD keyboard.
+
+* Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin)
+* Hardware Supported: UTD Keyboard, Rogue87, STM32F303
+* Hardware Availability: [Reddit GB](https://www.reddit.com/r/mechmarket/comments/ll6e5x/gb_mechlovin_rouge_otd_compatible_pcb_plates/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/infinity87/rev1/rogue87:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/infinity87/rev1/rogue87: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).
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h b/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h
new file mode 100644
index 0000000000..70a50b9620
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/rogue87.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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, K0E, K0F, K0G, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
+ K50, K52, K56, K5B, K5D, K5E, K5F, K5G \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F, K0G }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO}, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, KC_NO, K4F, KC_NO}, \
+ { K50, KC_NO, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, KC_NO, K5B, KC_NO, K5D, K5E, K5F, K5G }, \
+}
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk b/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk
@@ -0,0 +1 @@
+
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/config.h b/keyboards/mechlovin/infinity87/rev1/rouge87/config.h
new file mode 100644
index 0000000000..786da387bc
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 PRODUCT_ID 0x8703
+#define DEVICE_VER 0x0001
+#define PRODUCT Rouge87 Rev.1
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
new file mode 100644
index 0000000000..8317e93512
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
@@ -0,0 +1,101 @@
+{
+ "keyboard_name": "Rouge87",
+ "url": "",
+ "maintainer": "Mechlovin' Studio",
+ "width": 18.25,
+ "height": 6.25,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"K00", "x":0, "y":0},
+ {"label":"K01", "x":2, "y":0},
+ {"label":"K02", "x":3, "y":0},
+ {"label":"K03", "x":4, "y":0},
+ {"label":"K04", "x":5, "y":0},
+ {"label":"K05", "x":6.5, "y":0},
+ {"label":"K06", "x":7.5, "y":0},
+ {"label":"K07", "x":8.5, "y":0},
+ {"label":"K08", "x":9.5, "y":0},
+ {"label":"K09", "x":11, "y":0},
+ {"label":"K0A", "x":12, "y":0},
+ {"label":"K0B", "x":13, "y":0},
+ {"label":"K0C", "x":14, "y":0},
+ {"label":"K0E", "x":15.25, "y":0},
+ {"label":"K0F", "x":16.25, "y":0},
+ {"label":"K0G", "x":17.25, "y":0},
+ {"label":"K10", "x":0, "y":1.25},
+ {"label":"K11", "x":1, "y":1.25},
+ {"label":"K12", "x":2, "y":1.25},
+ {"label":"K13", "x":3, "y":1.25},
+ {"label":"K14", "x":4, "y":1.25},
+ {"label":"K15", "x":5, "y":1.25},
+ {"label":"K16", "x":6, "y":1.25},
+ {"label":"K17", "x":7, "y":1.25},
+ {"label":"K18", "x":8, "y":1.25},
+ {"label":"K19", "x":9, "y":1.25},
+ {"label":"K1A", "x":10, "y":1.25},
+ {"label":"K1B", "x":11, "y":1.25},
+ {"label":"K1C", "x":12, "y":1.25},
+ {"label":"K1D", "x":13, "y":1.25, "w":2},
+ {"label":"K1E", "x":15.25, "y":1.25},
+ {"label":"K1F", "x":16.25, "y":1.25},
+ {"label":"K1G", "x":17.25, "y":1.25},
+ {"label":"K20", "x":0, "y":2.25, "w":1.5},
+ {"label":"K21", "x":1.5, "y":2.25},
+ {"label":"K22", "x":2.5, "y":2.25},
+ {"label":"K23", "x":3.5, "y":2.25},
+ {"label":"K24", "x":4.5, "y":2.25},
+ {"label":"K25", "x":5.5, "y":2.25},
+ {"label":"K26", "x":6.5, "y":2.25},
+ {"label":"K27", "x":7.5, "y":2.25},
+ {"label":"K28", "x":8.5, "y":2.25},
+ {"label":"K29", "x":9.5, "y":2.25},
+ {"label":"K2A", "x":10.5, "y":2.25},
+ {"label":"K2B", "x":11.5, "y":2.25},
+ {"label":"K2C", "x":12.5, "y":2.25},
+ {"label":"K2D", "x":13.5, "y":2.25, "w":1.5},
+ {"label":"K2E", "x":15.25, "y":2.25},
+ {"label":"K2F", "x":16.25, "y":2.25},
+ {"label":"K2G", "x":17.25, "y":2.25},
+ {"label":"K30", "x":0, "y":3.25, "w":1.75},
+ {"label":"K31", "x":1.75, "y":3.25},
+ {"label":"K32", "x":2.75, "y":3.25},
+ {"label":"K33", "x":3.75, "y":3.25},
+ {"label":"K34", "x":4.75, "y":3.25},
+ {"label":"K35", "x":5.75, "y":3.25},
+ {"label":"K36", "x":6.75, "y":3.25},
+ {"label":"K37", "x":7.75, "y":3.25},
+ {"label":"K38", "x":8.75, "y":3.25},
+ {"label":"K39", "x":9.75, "y":3.25},
+ {"label":"K3A", "x":10.75, "y":3.25},
+ {"label":"K3B", "x":11.75, "y":3.25},
+ {"label":"K3C", "x":12.75, "y":3.25},
+ {"label":"K3D", "x":13.75, "y":3.25, "w":1.25},
+ {"label":"K40", "x":0, "y":4.25, "w":1.25},
+ {"label":"K41", "x":1.25, "y":4.25},
+ {"label":"K42", "x":2.25, "y":4.25},
+ {"label":"K43", "x":3.25, "y":4.25},
+ {"label":"K44", "x":4.25, "y":4.25},
+ {"label":"K45", "x":5.25, "y":4.25},
+ {"label":"K46", "x":6.25, "y":4.25},
+ {"label":"K47", "x":7.25, "y":4.25},
+ {"label":"K48", "x":8.25, "y":4.25},
+ {"label":"K49", "x":9.25, "y":4.25},
+ {"label":"K4A", "x":10.25, "y":4.25},
+ {"label":"K4B", "x":11.25, "y":4.25},
+ {"label":"K4D", "x":12.25, "y":4.25, "w":2.75},
+ {"label":"K4F", "x":16.25, "y":4.25},
+ {"label":"K50", "x":0, "y":5.25, "w":1.5},
+ {"label":"K51", "x":1.5, "y":5.25},
+ {"label":"K52", "x":2.5, "y":5.25, "w":1.5},
+ {"label":"K56", "x":4, "y":5.25, "w":7},
+ {"label":"K5B", "x":11, "y":5.25, "w":1.5},
+ {"label":"K5C", "x":12.5, "y":5.25},
+ {"label":"K5D", "x":13.5, "y":5.25, "w":1.5},
+ {"label":"K5E", "x":15.25, "y":5.25},
+ {"label":"K5F", "x":16.25, "y":5.25},
+ {"label":"K5G", "x":17.25, "y":5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c
new file mode 100644
index 0000000000..79658b2050
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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_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_PSCR, KC_SLCK, KC_PAUS,
+ 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_INS, KC_HOME, KC_PGUP,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
+ KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+};
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/readme.md b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/readme.md
new file mode 100644
index 0000000000..01ef555056
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for infinity87
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c
new file mode 100644
index 0000000000..201ee4e4ba
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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_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_PSCR, KC_SLCK, KC_PAUS,
+ 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_INS, KC_HOME, KC_PGUP,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
+ KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_LCTL, 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
+ ),
+ [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
+ ),
+ [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
+ ),
+
+};
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/readme.md b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/readme.md
new file mode 100644
index 0000000000..8867d290cd
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for infinity87
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/rules.mk b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/readme.md b/keyboards/mechlovin/infinity87/rev1/rouge87/readme.md
new file mode 100644
index 0000000000..de43b2568e
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/readme.md
@@ -0,0 +1,19 @@
+# rouge87 PCB
+
+
+
+A replacement PCB OTD 356.2, 360c, 456gt, The Cheat
+
+* Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin)
+* Hardware Supported: OTD 360C, The Cheat,...
+* Hardware Availability: [Reddit GB](https://www.reddit.com/r/mechmarket/comments/ll6e5x/gb_mechlovin_rouge_otd_compatible_pcb_plates/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/infinity87/rev1/rouge87:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/infinity87/rev1/rouge87: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).
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h b/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h
new file mode 100644
index 0000000000..67dcefde26
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/rouge87.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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, K0E, K0F, K0G, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \
+ K50, K51, K52, K56, K5B, K5C, K5D, K5E, K5F, K5G \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F, K0G }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO}, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, KC_NO, K4F, KC_NO}, \
+ { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, KC_NO, K5B, K5C, K5D, K5E, K5F, K5G }, \
+}
+
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk b/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk
@@ -0,0 +1 @@
+
diff --git a/keyboards/mechlovin/infinity87/rev1/rules.mk b/keyboards/mechlovin/infinity87/rev1/rules.mk
new file mode 100644
index 0000000000..cb04a558f2
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/rules.mk
@@ -0,0 +1,6 @@
+MCU = STM32F303
+BOARD = QMK_PROTON_C
+
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
+
+DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h
new file mode 100644
index 0000000000..b3ae5a7717
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h
@@ -0,0 +1,40 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 PRODUCT_ID 0x8701
+#define DEVICE_VER 0x0001
+#define PRODUCT Infinity 87 rev1
+
+#define RGB_DI_PIN A15
+#define RGBLED_NUM 26
+#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+// #define RGBLIGHT_EFFECT_BREATHING
+// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+// #define RGBLIGHT_EFFECT_SNAKE
+// #define RGBLIGHT_EFFECT_KNIGHT
+// #define RGBLIGHT_EFFECT_CHRISTMAS
+// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+// #define RGBLIGHT_EFFECT_RGB_TEST
+// #define RGBLIGHT_EFFECT_ALTERNATING
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/mechlovin/infinity87/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
similarity index 100%
rename from keyboards/mechlovin/infinity87/info.json
rename to keyboards/mechlovin/infinity87/rev1/standard/info.json
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/readme.md b/keyboards/mechlovin/infinity87/rev1/standard/readme.md
new file mode 100644
index 0000000000..f8998b4987
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/standard/readme.md
@@ -0,0 +1,15 @@
+# infinity87
+
+
+
+A replacement PCB for TKL keyboard. A87 form factor,south-facing stabilisers.
+
+* Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin)
+* Hardware Supported: Infinity87 rev.1 (1.6mm & 1.2mm).
+* Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=105853.0), [Reddit GB](https://www.reddit.com/r/mechmarket/comments/g4vf2w/gb_team_mechlovin_infinity_87_a87_form_factor/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/infinity87/rev1/standard:default
+
+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/mechlovin/infinity87/rev1/standard/rules.mk b/keyboards/mechlovin/infinity87/rev1/standard/rules.mk
new file mode 100644
index 0000000000..1e3cebb145
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev1/standard/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
new file mode 100644
index 0000000000..1be7f0a1bb
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -0,0 +1,48 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 PRODUCT_ID 0x8702
+#define DEVICE_VER 0x0001
+#define PRODUCT Infinity 87 rev2
+
+/*
+ * 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 { A3, D5, C3, C2, B3, B4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_BREATHING
+
+#define LED_NUM_LOCK_PIN B1
+#define LED_CAPS_LOCK_PIN B0
+#define LED_SCROLL_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
new file mode 100644
index 0000000000..9b3fe1002c
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -0,0 +1,105 @@
+{
+ "keyboard_name": "infinity87",
+ "url": "",
+ "maintainer": "Team Mechlovin'",
+ "width": 18.25,
+ "height": 6.25,
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label":"K00 (B0,B6)", "x":0, "y":0},
+ {"label":"K01 (B0,F4)", "x":2, "y":0},
+ {"label":"K02 (B0,C0)", "x":3, "y":0},
+ {"label":"K03 (B0,C1)", "x":4, "y":0},
+ {"label":"K04 (B0,C2)", "x":5, "y":0},
+ {"label":"K05 (B0,C3)", "x":6.5, "y":0},
+ {"label":"K06 (B0,C4)", "x":7.5, "y":0},
+ {"label":"K07 (B0,C5)", "x":8.5, "y":0},
+ {"label":"K08 (B0,C6)", "x":9.5, "y":0},
+ {"label":"K09 (B0,C7)", "x":11, "y":0},
+ {"label":"K0A (B0,D0)", "x":12, "y":0},
+ {"label":"K0B (B0,D1)", "x":13, "y":0},
+ {"label":"K0C (B0,D2)", "x":14, "y":0},
+ {"label":"K0E (B0,D4)", "x":15.25, "y":0},
+ {"label":"K0F (B0,D5)", "x":16.25, "y":0},
+ {"label":"K0G (B0,D6)", "x":17.25, "y":0},
+ {"label":"K10 (B1,B6)", "x":0, "y":1.25},
+ {"label":"K11 (B1,F4)", "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, "y":1.25},
+ {"label":"K15 (B1,C3)", "x":5, "y":1.25},
+ {"label":"K16 (B1,C4)", "x":6, "y":1.25},
+ {"label":"K17 (B1,C5)", "x":7, "y":1.25},
+ {"label":"K18 (B1,C6)", "x":8, "y":1.25},
+ {"label":"K19 (B1,C7)", "x":9, "y":1.25},
+ {"label":"K1A (B1,D0)", "x":10, "y":1.25},
+ {"label":"K1B (B1,D1)", "x":11, "y":1.25},
+ {"label":"K1C (B1,D2)", "x":12, "y":1.25},
+ {"label":"K1D (B1,D3)", "x":13, "y":1.25},
+ {"label":"K0D (B0,D3)", "x":14, "y":1.25},
+ {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
+ {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
+ {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
+ {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
+ {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
+ {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
+ {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
+ {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
+ {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
+ {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
+ {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
+ {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
+ {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
+ {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
+ {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
+ {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
+ {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
+ {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
+ {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
+ {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
+ {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
+ {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
+ {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
+ {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
+ {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
+ {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
+ {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
+ {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
+ {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
+ {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
+ {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
+ {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
+ {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
+ {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
+ {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
+ {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
+ {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
+ {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
+ {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
+ {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
+ {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
+ {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
+ {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
+ {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
+ {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
+ {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
+ {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
+ {"label":"K4D (B4,D3)", "x":14, "y":4.25},
+ {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
+ {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
+ {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
+ {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
+ {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
+ {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
+ {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
+ {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
+ {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
+ {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
+ {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
+ {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+ ]
+ }
+ }
+ ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/infinity87/rev2/matrix.c b/keyboards/mechlovin/infinity87/rev2/matrix.c
new file mode 100644
index 0000000000..6f417765aa
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev2/matrix.c
@@ -0,0 +1,442 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+Copyright 2019 Evy Dekkers
+
+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 <stdint.h>
+#include <stdbool.h>
+#include "wait.h"
+#include "util.h"
+#include "matrix.h"
+#include "debounce.h"
+#include "quantum.h"
+
+#ifdef DIRECT_PINS
+static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
+#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif
+
+// matrix code
+
+#ifdef DIRECT_PINS
+
+static void init_pins(void) {
+ for (int row = 0; row < MATRIX_ROWS; row++) {
+ for (int col = 0; col < MATRIX_COLS; col++) {
+ pin_t pin = direct_pins[row][col];
+ if (pin != NO_PIN) {
+ setPinInputHigh(pin);
+ }
+ }
+ }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+ matrix_row_t last_row_value = current_matrix[current_row];
+ current_matrix[current_row] = 0;
+
+ for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+ pin_t pin = direct_pins[current_row][col_index];
+ if (pin != NO_PIN) {
+ current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+ }
+ }
+
+ return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == COL2ROW)
+
+static void select_row(uint8_t row) {
+ setPinOutput(row_pins[row]);
+ writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+
+static void unselect_rows(void) {
+ for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+ setPinInputHigh(row_pins[x]);
+ }
+}
+
+static void init_pins(void) {
+ unselect_rows();
+ for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+ setPinInputHigh(col_pins[x]);
+ }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+ // Store last value of row prior to reading
+ matrix_row_t last_row_value = current_matrix[current_row];
+
+ // Clear data in matrix row
+ current_matrix[current_row] = 0;
+
+ // Select row and wait for row selecton to stabilize
+ select_row(current_row);
+ wait_us(30);
+
+ // For each col...
+ for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+ // Select the col pin to read (active low)
+ uint8_t pin_state = readPin(col_pins[col_index]);
+
+ // Populate the matrix row with the state of the col pin
+ current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+ }
+
+ // Unselect row
+ unselect_row(current_row);
+
+ return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == ROW2COL)
+
+/* Cols 0 - 16
+ * These columns use two 74HC138 3 to 8 bit demultiplexer. D6, D7 is the enable pin, must be set high (1) to use it.
+ *
+ * col / pin: PA0 PA1 PA2 PD6 PD7 PC4
+ * 0: 0 ── 0 ── 0 1 ── 0 0
+ * ────────────────────────────────────────────
+ * 1: 0 ── 0 ── 1 1 ── 0 0
+ * ────────────────────────────────────────────
+ * 2: 0 ── 1 ── 0 1 ── 0 0
+ * ────────────────────────────────────────────
+ * 3: 0 ── 1 ── 1 1 ── 0 0
+ * ────────────────────────────────────────────
+ * 4: 1 ── 0 ── 0 1 ── 0 0
+ * ────────────────────────────────────────────
+ * 5: 1 ── 0 ── 1 1 ── 0 0
+ * ────────────────────────────────────────────
+ * 6: 1 ── 1 ── 0 1 ── 0 0
+ * ────────────────────────────────────────────
+ * 7: 1 ── 1 ── 1 1 ── 0 0
+ * ────────────────────────────────────────────
+ * 8: 0 ── 0 ── 0 0 ── 1 0
+ * ────────────────────────────────────────────
+ * 9: 0 ── 0 ── 1 0 ── 1 0
+ * ────────────────────────────────────────────
+ *10: 0 ── 1 ── 0 0 ── 1 0
+ * ────────────────────────────────────────────
+ *11: 0 ── 1 ── 1 0 ── 1 0
+ * ────────────────────────────────────────────
+ *12: 1 ── 0 ── 0 0 ── 1 0
+ * ────────────────────────────────────────────
+ *13: 1 ── 0 ── 1 0 ── 1 0
+ * ────────────────────────────────────────────
+ *14: 1 ── 1 ── 1 0 ── 1 0
+ * ────────────────────────────────────────────
+ *15: 1 ── 1 ── 0 0 ── 1 0
+ * ────────────────────────────────────────────
+ *16: 0 ── 0 ── 0 0 ── 0 1
+ *
+ */
+static void select_col(uint8_t col) {
+ switch (col) {
+ case 0:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinHigh(D6);
+ break;
+ case 1:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinHigh(D6);
+ break;
+ case 2:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinHigh(D6);
+ break;
+ case 3:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinHigh(D6);
+ break;
+ case 4:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinHigh(D6);
+ break;
+ case 5:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinHigh(D6);
+ break;
+ case 6:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinHigh(D6);
+ break;
+ case 7:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinHigh(D6);
+ break;
+ case 8:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinHigh(D7);
+ break;
+ case 9:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinHigh(D7);
+ break;
+ case 10:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinHigh(D7);
+ break;
+ case 11:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinHigh(D7);
+ break;
+ case 12:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinHigh(D7);
+ break;
+ case 13:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinHigh(D7);
+ break;
+ case 14:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinHigh(D7);
+ break;
+ case 15:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinHigh(D7);
+ break;
+ case 16:
+ writePinLow(C4);
+ break;
+ }
+}
+
+static void unselect_col(uint8_t col) {
+ switch (col) {
+ case 0:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinLow(D6);
+ break;
+ case 1:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinLow(D6);
+ break;
+ case 2:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinLow(D6);
+ break;
+ case 3:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinLow(D6);
+ break;
+ case 4:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinLow(D6);
+ break;
+ case 5:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinLow(D6);
+ break;
+ case 6:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinLow(D6);
+ break;
+ case 7:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinLow(D6);
+ break;
+ case 8:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinLow(D7);
+ break;
+ case 9:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinLow(D7);
+ break;
+ case 10:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinLow(D7);
+ break;
+ case 11:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinLow(D7);
+ break;
+ case 12:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinLow(D7);
+ break;
+ case 13:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinLow(D7);
+ break;
+ case 14:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinLow(D7);
+ break;
+ case 15:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinLow(D7);
+ break;
+ case 16:
+ writePinHigh(C4);
+ break;
+ }
+}
+
+static void unselect_cols(void) {
+ //Native
+ writePinHigh(C4);
+
+ //Demultiplexer
+ writePinLow(D6);
+ writePinLow(D7);
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+}
+
+static void init_pins(void) {
+ unselect_cols();
+ for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+ setPinInputHigh(row_pins[x]);
+ }
+ setPinOutput(A0);
+ setPinOutput(A1);
+ setPinOutput(A2);
+ setPinOutput(D6);
+ setPinOutput(D7);
+ setPinOutput(C4);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+ bool matrix_changed = false;
+
+ // Select col and wait for col selecton to stabilize
+ select_col(current_col);
+ wait_us(30);
+
+ // For each row...
+ for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+ // Store last value of row prior to reading
+ matrix_row_t last_row_value = current_matrix[row_index];
+
+ // Check row pin state
+ if (readPin(row_pins[row_index]) == 0) {
+ // Pin LO, set col bit
+ current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+ } else {
+ // Pin HI, clear col bit
+ current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+ }
+
+ // Determine if the matrix changed state
+ if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
+ matrix_changed = true;
+ }
+ }
+
+ // Unselect col
+ unselect_col(current_col);
+
+ return matrix_changed;
+}
+
+#endif
+
+void matrix_init_custom(void) {
+ // initialize key pins
+ init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+ bool changed = false;
+
+#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
+ // Set row, read cols
+ for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
+ changed |= read_cols_on_row(current_matrix, current_row);
+ }
+#elif (DIODE_DIRECTION == ROW2COL)
+ // Set col, read rows
+ for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+ changed |= read_rows_on_col(current_matrix, current_col);
+ }
+#endif
+
+ return changed;
+}
diff --git a/keyboards/mechlovin/infinity87/rev2/readme.md b/keyboards/mechlovin/infinity87/rev2/readme.md
new file mode 100644
index 0000000000..4c7ea29291
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev2/readme.md
@@ -0,0 +1,23 @@
+# infinity87 Rev.2
+
+
+
+A replacement PCB for TKL keyboard. south-facing stabilisers, .STEP file in our github
+
+* Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin)
+* Hardware Supported: Infinity87 rev.2, AVR.
+* Hardware Availability: [Mechlovin.studio](https://mechlovin.studio)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/infinity87/rev2:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/infinity87/rev2: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 IF87_rev2 into bootloader, push reset swith on the bottom of the PCB.
+
+IF87_rev2 used USBasploader from [Erovia tutorial](https://erovia.github.io/posts/thk/#bootloader), thank you [Erovia](https://github.com/Erovia).
diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.c b/keyboards/mechlovin/infinity87/rev2/rev2.c
new file mode 100644
index 0000000000..5a92f8bec6
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev2/rev2.c
@@ -0,0 +1,57 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 "rev2.h"
+
+void matrix_init_kb(void) {
+ matrix_init_user();
+ led_init_ports();
+};
+void led_init_ports(void) {
+ setPinOutput(A5);
+ setPinOutput(A6);
+ setPinOutput(A7);
+ setPinOutput(C7);
+ setPinOutput(C6);
+
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+ state = layer_state_set_user(state);
+ writePinHigh(C6);
+ writePinHigh(C7);
+ writePinHigh(A7);
+ writePinHigh(A6);
+ writePinHigh(A5);
+ switch (get_highest_layer(state)) {
+ case 0:
+ writePinLow(C6);
+ break;
+ case 1:
+ writePinLow(C7);
+ break;
+ case 2:
+ writePinLow(A7);
+ break;
+ case 3:
+ writePinLow(A6);
+ break;
+ case 4:
+ writePinLow(A5);
+ break;
+ }
+ return state;
+}
diff --git a/keyboards/mechlovin/infinity87/rev2/rev2.h b/keyboards/mechlovin/infinity87/rev2/rev2.h
new file mode 100644
index 0000000000..16cdf9ed85
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev2/rev2.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Team Mechlovin
+ *
+ * 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"
diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk
new file mode 100644
index 0000000000..367e0bc82f
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+BOOTLOADER = USBasp
+
+# Build Options
+# change yes to no to disable
+#
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
+NKRO_ENABLE = no
+BACKLIGHT_ENABLE = yes
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
new file mode 100644
index 0000000000..0c16c684cf
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 PRODUCT_ID 0x8710
+#define DEVICE_VER 0x0001
+#define PRODUCT Infinity 87 RGB rev1
+
+#define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 }
+#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 }
+
+
+#define DIODE_DIRECTION COL2ROW
+
+//rgb matrix setting
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 0b0110000 AD <-> GND
+// 0b0110011 AD <-> VCC
+// 0b0110001 AD <-> SCL
+// 0b0110010 AD <-> SDA
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+#define RGB_MATRIX_KEYPRESSES
+#define DISABLE_RGB_MATRIX_SPLASH
+#define DISABLE_RGB_MATRIX_MULTISPLASH
+#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define DRIVER_ADDR_1 0b0110010
+#define DRIVER_ADDR_2 0b0110010 // this is here for compliancy reasons.
+#define DRIVER_COUNT 1
+#define DRIVER_1_LED_TOTAL 91
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
new file mode 100644
index 0000000000..9b3fe1002c
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -0,0 +1,105 @@
+{
+ "keyboard_name": "infinity87",
+ "url": "",
+ "maintainer": "Team Mechlovin'",
+ "width": 18.25,
+ "height": 6.25,
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label":"K00 (B0,B6)", "x":0, "y":0},
+ {"label":"K01 (B0,F4)", "x":2, "y":0},
+ {"label":"K02 (B0,C0)", "x":3, "y":0},
+ {"label":"K03 (B0,C1)", "x":4, "y":0},
+ {"label":"K04 (B0,C2)", "x":5, "y":0},
+ {"label":"K05 (B0,C3)", "x":6.5, "y":0},
+ {"label":"K06 (B0,C4)", "x":7.5, "y":0},
+ {"label":"K07 (B0,C5)", "x":8.5, "y":0},
+ {"label":"K08 (B0,C6)", "x":9.5, "y":0},
+ {"label":"K09 (B0,C7)", "x":11, "y":0},
+ {"label":"K0A (B0,D0)", "x":12, "y":0},
+ {"label":"K0B (B0,D1)", "x":13, "y":0},
+ {"label":"K0C (B0,D2)", "x":14, "y":0},
+ {"label":"K0E (B0,D4)", "x":15.25, "y":0},
+ {"label":"K0F (B0,D5)", "x":16.25, "y":0},
+ {"label":"K0G (B0,D6)", "x":17.25, "y":0},
+ {"label":"K10 (B1,B6)", "x":0, "y":1.25},
+ {"label":"K11 (B1,F4)", "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, "y":1.25},
+ {"label":"K15 (B1,C3)", "x":5, "y":1.25},
+ {"label":"K16 (B1,C4)", "x":6, "y":1.25},
+ {"label":"K17 (B1,C5)", "x":7, "y":1.25},
+ {"label":"K18 (B1,C6)", "x":8, "y":1.25},
+ {"label":"K19 (B1,C7)", "x":9, "y":1.25},
+ {"label":"K1A (B1,D0)", "x":10, "y":1.25},
+ {"label":"K1B (B1,D1)", "x":11, "y":1.25},
+ {"label":"K1C (B1,D2)", "x":12, "y":1.25},
+ {"label":"K1D (B1,D3)", "x":13, "y":1.25},
+ {"label":"K0D (B0,D3)", "x":14, "y":1.25},
+ {"label":"K1E (B1,D4)", "x":15.25, "y":1.25},
+ {"label":"K1F (B1,D5)", "x":16.25, "y":1.25},
+ {"label":"K1G (B1,D6)", "x":17.25, "y":1.25},
+ {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5},
+ {"label":"K21 (B2,F4)", "x":1.5, "y":2.25},
+ {"label":"K22 (B2,C0)", "x":2.5, "y":2.25},
+ {"label":"K23 (B2,C1)", "x":3.5, "y":2.25},
+ {"label":"K24 (B2,C2)", "x":4.5, "y":2.25},
+ {"label":"K25 (B2,C3)", "x":5.5, "y":2.25},
+ {"label":"K26 (B2,C4)", "x":6.5, "y":2.25},
+ {"label":"K27 (B2,C5)", "x":7.5, "y":2.25},
+ {"label":"K28 (B2,C6)", "x":8.5, "y":2.25},
+ {"label":"K29 (B2,C7)", "x":9.5, "y":2.25},
+ {"label":"K2A (B2,D0)", "x":10.5, "y":2.25},
+ {"label":"K2B (B2,D1)", "x":11.5, "y":2.25},
+ {"label":"K2C (B2,D2)", "x":12.5, "y":2.25},
+ {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5},
+ {"label":"K2E (B2,D4)", "x":15.25, "y":2.25},
+ {"label":"K2F (B2,D5)", "x":16.25, "y":2.25},
+ {"label":"K2G (B2,D6)", "x":17.25, "y":2.25},
+ {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75},
+ {"label":"K31 (B3,F4)", "x":1.75, "y":3.25},
+ {"label":"K32 (B3,C0)", "x":2.75, "y":3.25},
+ {"label":"K33 (B3,C1)", "x":3.75, "y":3.25},
+ {"label":"K34 (B3,C2)", "x":4.75, "y":3.25},
+ {"label":"K35 (B3,C3)", "x":5.75, "y":3.25},
+ {"label":"K36 (B3,C4)", "x":6.75, "y":3.25},
+ {"label":"K37 (B3,C5)", "x":7.75, "y":3.25},
+ {"label":"K38 (B3,C6)", "x":8.75, "y":3.25},
+ {"label":"K39 (B3,C7)", "x":9.75, "y":3.25},
+ {"label":"K3A (B3,D0)", "x":10.75, "y":3.25},
+ {"label":"K3B (B3,D1)", "x":11.75, "y":3.25},
+ {"label":"K3C (B3,D2)", "x":12.75, "y":3.25},
+ {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25},
+ {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25},
+ {"label":"K41 (B4,F4)", "x":1.25, "y":4.25},
+ {"label":"K42 (B4,C0)", "x":2.25, "y":4.25},
+ {"label":"K43 (B4,C1)", "x":3.25, "y":4.25},
+ {"label":"K44 (B4,C2)", "x":4.25, "y":4.25},
+ {"label":"K45 (B4,C3)", "x":5.25, "y":4.25},
+ {"label":"K46 (B4,C4)", "x":6.25, "y":4.25},
+ {"label":"K47 (B4,C5)", "x":7.25, "y":4.25},
+ {"label":"K48 (B4,C6)", "x":8.25, "y":4.25},
+ {"label":"K49 (B4,C7)", "x":9.25, "y":4.25},
+ {"label":"K4A (B4,D0)", "x":10.25, "y":4.25},
+ {"label":"K4B (B4,D1)", "x":11.25, "y":4.25},
+ {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75},
+ {"label":"K4D (B4,D3)", "x":14, "y":4.25},
+ {"label":"K4F (B4,D5)", "x":16.25, "y":4.25},
+ {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25},
+ {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25},
+ {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25},
+ {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25},
+ {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25},
+ {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25},
+ {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25},
+ {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25},
+ {"label":"K5E (B5,D4)", "x":15.25, "y":5.25},
+ {"label":"K5F (B5,D5)", "x":16.25, "y":5.25},
+ {"label":"K5G (B5,D6)", "x":17.25, "y":5.25}
+ ]
+ }
+ }
+ ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/readme.md b/keyboards/mechlovin/infinity87/rgb_rev1/readme.md
new file mode 100644
index 0000000000..1e71fc29fc
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/readme.md
@@ -0,0 +1,21 @@
+# infinity87 RGB Rev.1
+
+
+
+A replacement PCB for TKL keyboard, RGB backlight, south-facing stabilisers, .STEP file in our github
+
+* Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin)
+* Hardware Supported: Infinity87 RGB Rev.1, STM32F303.
+* Hardware Availability: [Mechlovin.studio](https://mechlovin.studio)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/infinity87/rgb_rev1:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/infinity87/rgb_rev1: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 IF87_RGB_Rev.1 into bootloader, hold esc key while plugging in (bootmagic) or push reset swith on the bottom of the PCB.
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
new file mode 100644
index 0000000000..f13fee8add
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
@@ -0,0 +1,159 @@
+/* Copyright 2020 Team Mechlovin'
+ *
+ * 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 "rgb_rev1.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+ {0, CS34_SW1, CS35_SW1, CS36_SW1}, //D92-K00-0
+ {0, CS37_SW1, CS38_SW1, CS39_SW1}, //D94-K01-1
+ {0, CS31_SW1, CS32_SW1, CS33_SW1}, //D96-K02-2
+ {0, CS28_SW1, CS29_SW1, CS30_SW1}, //D98-K03-3
+ {0, CS25_SW1, CS26_SW1, CS27_SW1}, //D100-K04-4
+ {0, CS22_SW1, CS23_SW1, CS24_SW1}, //D102-K05-5
+ {0, CS19_SW1, CS20_SW1, CS21_SW1}, //D104-K06-6
+ {0, CS18_SW1, CS17_SW1, CS16_SW1}, //D106-K07-7
+ {0, CS15_SW1, CS14_SW1, CS13_SW1}, //D108-K08-8
+ {0, CS12_SW1, CS11_SW1, CS10_SW1}, //D110-K09-9
+ {0, CS9_SW1, CS8_SW1, CS7_SW1}, //D112-K0A-10
+ {0, CS6_SW1, CS5_SW1, CS4_SW1}, //D114-K0B-11
+ {0, CS3_SW1, CS2_SW1, CS1_SW1}, //D116-K0C-12
+ {0, CS15_SW7, CS14_SW7, CS13_SW7}, //D157-K0D-13
+ {0, CS18_SW7, CS17_SW7, CS16_SW7}, //D118-K0E-14
+ {0, CS19_SW7, CS20_SW7, CS21_SW7}, //D120-K0F-15
+ {0, CS12_SW7, CS11_SW7, CS10_SW7}, //D122-K0G-16
+ {0, CS34_SW2, CS35_SW2, CS36_SW2}, //D93-K10-17
+ {0, CS37_SW2, CS38_SW2, CS39_SW2}, //D95-K11-18
+ {0, CS31_SW2, CS32_SW2, CS33_SW2}, //D97-K12-19
+ {0, CS28_SW2, CS29_SW2, CS30_SW2}, //D99-K13-20
+ {0, CS25_SW2, CS26_SW2, CS27_SW2}, //D101-K14-21
+ {0, CS22_SW2, CS23_SW2, CS24_SW2}, //D103-K15-22
+ {0, CS19_SW2, CS20_SW2, CS21_SW2}, //D105-K16-23
+ {0, CS18_SW2, CS17_SW2, CS16_SW2}, //D107-K17-24
+ {0, CS15_SW2, CS14_SW2, CS13_SW2}, //D109-K18-25
+ {0, CS12_SW2, CS11_SW2, CS10_SW2}, //D111-K19-26
+ {0, CS9_SW2, CS8_SW2, CS7_SW2}, //D113-K1A-27
+ {0, CS6_SW2, CS5_SW2, CS4_SW2}, //D115-K1B-28
+ {0, CS3_SW2, CS2_SW2, CS1_SW2}, //D117-K1C-29
+ {0, CS3_SW8, CS2_SW8, CS1_SW8}, //D158-K1D-30
+ {0, CS3_SW7, CS2_SW7, CS1_SW7}, //D119-K1E-31
+ {0, CS18_SW8, CS17_SW8, CS16_SW8}, //D121-K1F-32
+ {0, CS9_SW9, CS8_SW9, CS7_SW9}, //D123-K1G-33
+ {0, CS34_SW3, CS35_SW3, CS36_SW3}, //D124-K20-34
+ {0, CS37_SW3, CS38_SW3, CS39_SW3}, //D127-K21-35
+ {0, CS31_SW3, CS32_SW3, CS33_SW3}, //D130-K22-36
+ {0, CS28_SW3, CS29_SW3, CS30_SW3}, //D133-K23-37
+ {0, CS25_SW3, CS26_SW3, CS27_SW3}, //D135-K24-38
+ {0, CS22_SW3, CS23_SW3, CS24_SW3}, //D137-K25-39
+ {0, CS19_SW3, CS20_SW3, CS21_SW3}, //D139-K26-40
+ {0, CS18_SW3, CS17_SW3, CS16_SW3}, //D142-K27-41
+ {0, CS15_SW3, CS14_SW3, CS13_SW3}, //D144-K28-42
+ {0, CS12_SW3, CS11_SW3, CS10_SW3}, //D146-K29-43
+ {0, CS9_SW3, CS8_SW3, CS7_SW3}, //D148-K2A-44
+ {0, CS6_SW3, CS5_SW3, CS4_SW3}, //D151-K2B-45
+ {0, CS3_SW3, CS2_SW3, CS1_SW3}, //D154-K2C-46
+ {0, CS6_SW8, CS5_SW8, CS4_SW8}, //D159-K2D-47
+ {0, CS6_SW7, CS5_SW7, CS4_SW7}, //D180-K2E-48
+ {0, CS19_SW8, CS20_SW8, CS21_SW8}, //D181-K2F-49
+ {0, CS9_SW7, CS8_SW7, CS7_SW7}, //D182-K2G-50
+ {0, CS34_SW4, CS35_SW4, CS36_SW4}, //D166-K30-51
+ {0, CS37_SW4, CS38_SW4, CS39_SW4}, //D167-K31-52
+ {0, CS31_SW4, CS32_SW4, CS33_SW4}, //D168-K32-53
+ {0, CS28_SW4, CS29_SW4, CS30_SW4}, //D169-K33-54
+ {0, CS25_SW4, CS26_SW4, CS27_SW4}, //D170-K34-55
+ {0, CS22_SW4, CS23_SW4, CS24_SW4}, //D171-K35-56
+ {0, CS19_SW4, CS20_SW4, CS21_SW4}, //D172-K36-57
+ {0, CS18_SW4, CS17_SW4, CS16_SW4}, //D173-K37-58
+ {0, CS15_SW4, CS14_SW4, CS13_SW4}, //D174-K38-59
+ {0, CS12_SW4, CS11_SW4, CS10_SW4}, //D175-K39-60
+ {0, CS9_SW4, CS8_SW4, CS7_SW4}, //D176-K3A-61
+ {0, CS6_SW4, CS5_SW4, CS4_SW4}, //D177-K3B-62
+ {0, CS3_SW4, CS2_SW4, CS1_SW4}, //D178-K3C-63
+ {0, CS9_SW8, CS8_SW8, CS7_SW8}, //D179-K3D-64
+ {0, CS34_SW5, CS35_SW5, CS36_SW5}, //D125-K40-65
+ {0, CS37_SW5, CS38_SW5, CS39_SW5}, //D128-K41-66
+ {0, CS31_SW5, CS32_SW5, CS33_SW5}, //D131-K42-67
+ {0, CS28_SW5, CS29_SW5, CS30_SW5}, //D134-K43-68
+ {0, CS25_SW5, CS26_SW5, CS27_SW5}, //D136-K44-69
+ {0, CS22_SW5, CS23_SW5, CS24_SW5}, //D138-K45-70
+ {0, CS19_SW5, CS20_SW5, CS21_SW5}, //D140-K46-71
+ {0, CS18_SW5, CS17_SW5, CS16_SW5}, //D143-K47-72
+ {0, CS15_SW5, CS14_SW5, CS13_SW5}, //D145-K48-73
+ {0, CS12_SW5, CS11_SW5, CS10_SW5}, //D147-K49-74
+ {0, CS9_SW5, CS8_SW5, CS7_SW5}, //D149-K4A-75
+ {0, CS6_SW5, CS5_SW5, CS4_SW5}, //D152-K4B-76
+ {0, CS3_SW5, CS2_SW5, CS1_SW5}, //D155-K4C-77
+ {0, CS12_SW8, CS11_SW8, CS10_SW8}, //D160-K4D-78
+ {0, CS12_SW9, CS11_SW9, CS10_SW9}, //D163-K4E-79
+ {0, CS34_SW6, CS35_SW6, CS36_SW6}, //D126-K20-80
+ {0, CS37_SW6, CS38_SW6, CS39_SW6}, //D129-K21-81
+ {0, CS31_SW6, CS32_SW6, CS33_SW6}, //D132-K22-82
+ {0, CS19_SW6, CS20_SW6, CS21_SW6}, //D141-K26-83
+ {0, CS9_SW6, CS8_SW6, CS7_SW6}, //D150-K2A-84
+ {0, CS6_SW6, CS5_SW6, CS4_SW6}, //D153-K2B-85
+ {0, CS3_SW6, CS2_SW6, CS1_SW6}, //D156-K2C-86
+ {0, CS15_SW8, CS14_SW8, CS13_SW8}, //D161-K2D-87
+ {0, CS15_SW9, CS14_SW9, CS13_SW9}, //D162-K2E-88
+ {0, CS18_SW9, CS17_SW9, CS16_SW9}, //D164-K2F-89
+ {0, CS19_SW9, CS20_SW9, CS21_SW9}, //D165-K2G-90
+};
+
+led_config_t g_led_config = { {
+ // Key Matrix to LED Index
+ {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, 43, 44, 45, 46, 47, 48, 49, 50},
+ {51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, NO_LED, NO_LED, NO_LED},
+ {65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, NO_LED, 79, NO_LED},
+ {80, 81, 82, NO_LED, NO_LED, NO_LED, 83, NO_LED, NO_LED, NO_LED, 84, 85, 86, 87, 88, 89, 90}
+ }, {
+ {0, 0}, {14, 0}, {28, 0}, {42, 0}, {56, 0}, {70, 0}, {84, 0}, {98, 0}, {112, 0}, {126, 0}, {140, 0}, {154, 0}, {168, 0}, {182, 0}, {196, 0}, {210, 0}, {224, 0},
+ {0,16}, {14,16}, {28,16}, {42, 16}, {56, 16}, {70, 16}, {84, 16}, {98, 16}, {112, 16}, {126, 16}, {140, 16}, {154, 16}, {168, 16}, {182, 16}, {196, 16}, {210, 16}, {224, 16},
+ {0,32}, {14,32}, {28,32}, {42, 32}, {56, 32}, {70, 32}, {84, 32}, {98, 32}, {112, 32}, {126, 32}, {140, 32}, {154, 32}, {168, 32}, {182, 32}, {196, 32}, {210, 32}, {224, 32},
+ {0,48}, {14,48}, {28,48}, {42, 48}, {56, 48}, {70, 48}, {84, 48}, {98, 48}, {112, 48}, {126, 48}, {140, 48}, {154, 48}, {168, 48}, {182, 48},
+ {0,64}, {14,64}, {28,64}, {42, 64}, {56, 64}, {70, 64}, {84, 64}, {98, 64}, {112, 64}, {126, 64}, {140, 64}, {154, 64}, {168, 64}, {182, 64}, {210, 64},
+ {0,80}, {14,80}, {28,80}, {84, 80}, {140, 80}, {154, 80}, {168, 80}, {182, 80}, {196, 80}, {210, 80}, {224, 80}
+ }, {
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+ } };
+
+
+__attribute__((weak))
+void rgb_matrix_indicators_user(void) {
+ if (host_keyboard_led_state().caps_lock) {
+ rgb_matrix_set_color(51, 255, 255, 255);
+ }
+ if (host_keyboard_led_state().scroll_lock) {
+ rgb_matrix_set_color(15, 255, 255, 255);
+ }
+}
+
+
+void suspend_power_down_kb(void) {
+ rgb_matrix_set_suspend_state(true);
+ suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+ rgb_matrix_set_suspend_state(false);
+ suspend_wakeup_init_user();
+}
+#endif
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h
new file mode 100644
index 0000000000..16cdf9ed85
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Team Mechlovin
+ *
+ * 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"
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
new file mode 100644
index 0000000000..aa7adc8954
--- /dev/null
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
@@ -0,0 +1,5 @@
+MCU = STM32F303
+BOARD = QMK_PROTON_C
+
+RGB_MATRIX_ENABLE = yes # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/mechlovin/infinity87/rules.mk b/keyboards/mechlovin/infinity87/rules.mk
index ed8f3223ad..1222987996 100644
--- a/keyboards/mechlovin/infinity87/rules.mk
+++ b/keyboards/mechlovin/infinity87/rules.mk
@@ -1,6 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
# Build Options
# change yes to no to disable
@@ -14,8 +11,9 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
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
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-MIDI_ENABLE = no # MIDI support
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no # Audio output on port C6
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+
+DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard
diff --git a/keyboards/mechlovin/th1800/config.h b/keyboards/mechlovin/th1800/config.h
new file mode 100644
index 0000000000..f8c4567825
--- /dev/null
+++ b/keyboards/mechlovin/th1800/config.h
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Team Mechlovin
+
+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 // ML-Mechlovin
+#define PRODUCT_ID 0x1800
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Team Mechlovin
+#define PRODUCT th1800
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 18
+
+/*
+ * 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 { B6, B7, D0, D1, D5, D6 }
+#define MATRIX_COL_PINS { A3, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, B3, B2, B0, B1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN A2
+#define LED_CAPS_LOCK_PIN A0
+#define LED_SCROLL_LOCK_PIN A1
+#define LED_PIN_ON_STATE 0
diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json
new file mode 100644
index 0000000000..2ed6673a55
--- /dev/null
+++ b/keyboards/mechlovin/th1800/info.json
@@ -0,0 +1,119 @@
+{
+ "keyboard_name": "th-1800",
+ "url": "",
+ "maintainer": "qmk",
+ "width": 19.5,
+ "height": 7.25,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"K00 (B0,B7)", "x":0, "y":0},
+ {"label":"K01 (B0,C0)", "x":1.25, "y":0},
+ {"label":"K02 (B0,C1)", "x":2.25, "y":0},
+ {"label":"K03 (B0,C2)", "x":3.25, "y":0},
+ {"label":"K04 (B0,C3)", "x":4.25, "y":0},
+ {"label":"K05 (B0,C4)", "x":5.5, "y":0},
+ {"label":"K06 (B0,C5)", "x":6.5, "y":0},
+ {"label":"K07 (B0,C6)", "x":7.5, "y":0},
+ {"label":"K08 (B0,C7)", "x":8.5, "y":0},
+ {"label":"K09 (B0,D0)", "x":9.75, "y":0},
+ {"label":"K0A (B0,D1)", "x":10.75, "y":0},
+ {"label":"K0B (B0,D2)", "x":11.75, "y":0},
+ {"label":"K0C (B0,D3)", "x":12.75, "y":0},
+ {"label":"K0E (B0,D5)", "x":15.5, "y":0},
+ {"label":"K0F (B0,D6)", "x":16.5, "y":0},
+ {"label":"K0G (B0,D7)", "x":17.5, "y":0},
+ {"label":"K0H (B0,E0)", "x":18.5, "y":0},
+ {"label":"K5E (B5,D5)", "x":15.5, "y":1},
+ {"label":"K5F (B5,D6)", "x":16.5, "y":1},
+ {"label":"K5G (B5,D7)", "x":17.5, "y":1},
+ {"label":"K5H (B5,E0)", "x":18.5, "y":1},
+ {"label":"K10 (B1,B7)", "x":0, "y":2},
+ {"label":"K11 (B1,C0)", "x":1, "y":2},
+ {"label":"K12 (B1,C1)", "x":2, "y":2},
+ {"label":"K13 (B1,C2)", "x":3, "y":2},
+ {"label":"K14 (B1,C3)", "x":4, "y":2},
+ {"label":"K15 (B1,C4)", "x":5, "y":2},
+ {"label":"K16 (B1,C5)", "x":6, "y":2},
+ {"label":"K17 (B1,C6)", "x":7, "y":2},
+ {"label":"K18 (B1,C7)", "x":8, "y":2},
+ {"label":"K19 (B1,D0)", "x":9, "y":2},
+ {"label":"K1A (B1,D1)", "x":10, "y":2},
+ {"label":"K1B (B1,D2)", "x":11, "y":2},
+ {"label":"K1C (B1,D3)", "x":12, "y":2},
+ {"label":"K1D (B1,D4)", "x":13, "y":2},
+ {"label":"K0D (B0,D4)", "x":14, "y":2},
+ {"label":"K1E (B1,D5)", "x":15.5, "y":2},
+ {"label":"K1F (B1,D6)", "x":16.5, "y":2},
+ {"label":"K1G (B1,D7)", "x":17.5, "y":2},
+ {"label":"K1H (B1,E0)", "x":18.5, "y":2},
+ {"label":"K20 (B2,B7)", "x":0, "y":3, "w":1.5},
+ {"label":"K21 (B2,C0)", "x":1.5, "y":3},
+ {"label":"K22 (B2,C1)", "x":2.5, "y":3},
+ {"label":"K23 (B2,C2)", "x":3.5, "y":3},
+ {"label":"K24 (B2,C3)", "x":4.5, "y":3},
+ {"label":"K25 (B2,C4)", "x":5.5, "y":3},
+ {"label":"K26 (B2,C5)", "x":6.5, "y":3},
+ {"label":"K27 (B2,C6)", "x":7.5, "y":3},
+ {"label":"K28 (B2,C7)", "x":8.5, "y":3},
+ {"label":"K29 (B2,D0)", "x":9.5, "y":3},
+ {"label":"K2A (B2,D1)", "x":10.5, "y":3},
+ {"label":"K2B (B2,D2)", "x":11.5, "y":3},
+ {"label":"K2C (B2,D3)", "x":12.5, "y":3},
+ {"label":"K2D (B2,D4)", "x":13.5, "y":3, "w":1.5},
+ {"label":"K2E (B2,D5)", "x":15.5, "y":3},
+ {"label":"K2F (B2,D6)", "x":16.5, "y":3},
+ {"label":"K2G (B2,D7)", "x":17.5, "y":3},
+ {"label":"K2H (B2,E0)", "x":18.5, "y":3},
+ {"label":"K30 (B3,B7)", "x":0, "y":4, "w":1.75},
+ {"label":"K31 (B3,C0)", "x":1.75, "y":4},
+ {"label":"K32 (B3,C1)", "x":2.75, "y":4},
+ {"label":"K33 (B3,C2)", "x":3.75, "y":4},
+ {"label":"K34 (B3,C3)", "x":4.75, "y":4},
+ {"label":"K35 (B3,C4)", "x":5.75, "y":4},
+ {"label":"K36 (B3,C5)", "x":6.75, "y":4},
+ {"label":"K37 (B3,C6)", "x":7.75, "y":4},
+ {"label":"K38 (B3,C7)", "x":8.75, "y":4},
+ {"label":"K39 (B3,D0)", "x":9.75, "y":4},
+ {"label":"K3A (B3,D1)", "x":10.75, "y":4},
+ {"label":"K3B (B3,D2)", "x":11.75, "y":4},
+ {"label":"K3C (B3,D3)", "x":12.75, "y":4},
+ {"label":"K3D (B3,D4)", "x":13.75, "y":4, "w":1.25},
+ {"label":"K3E (B3,D5)", "x":15.5, "y":4},
+ {"label":"K3F (B3,D6)", "x":16.5, "y":4},
+ {"label":"K3G (B3,D7)", "x":17.5, "y":4},
+ {"label":"K3H (B3,E0)", "x":18.5, "y":4},
+ {"label":"K40 (B4,B7)", "x":0, "y":5, "w":1.25},
+ {"label":"K41 (B4,C0)", "x":1.25, "y":5},
+ {"label":"K42 (B4,C1)", "x":2.25, "y":5},
+ {"label":"K43 (B4,C2)", "x":3.25, "y":5},
+ {"label":"K44 (B4,C3)", "x":4.25, "y":5},
+ {"label":"K45 (B4,C4)", "x":5.25, "y":5},
+ {"label":"K46 (B4,C5)", "x":6.25, "y":5},
+ {"label":"K47 (B4,C6)", "x":7.25, "y":5},
+ {"label":"K48 (B4,C7)", "x":8.25, "y":5},
+ {"label":"K49 (B4,D0)", "x":9.25, "y":5},
+ {"label":"K4A (B4,D1)", "x":10.25, "y":5},
+ {"label":"K4B (B4,D2)", "x":11.25, "y":5},
+ {"label":"K4C (B4,D3)", "x":12.25, "y":5, "w":1.75},
+ {"label":"K4D (B4,D4)", "x":14.25, "y":5.25},
+ {"label":"K4E (B4,D5)", "x":15.5, "y":5},
+ {"label":"K4F (B4,D6)", "x":16.5, "y":5},
+ {"label":"K4G (B4,D7)", "x":17.5, "y":5},
+ {"label":"K4H (B4,E0)", "x":18.5, "y":5, "h":2},
+ {"label":"K50 (B5,B7)", "x":0, "y":6, "w":1.5},
+ {"label":"K51 (B5,C0)", "x":1.5, "y":6},
+ {"label":"K52 (B5,C1)", "x":2.5, "y":6, "w":1.5},
+ {"label":"K55 (B5,C4)", "x":4, "y":6, "w":6.25},
+ {"label":"K57 (B5,C6)", "x":10.25, "y":6, "w":1.25},
+ {"label":"K58 (B5,C7)", "x":11.5, "y":6, "w":1.5},
+ {"label":"K59 (B5,D0)", "x":13.25, "y":6.25},
+ {"label":"K5A (B5,D1)", "x":14.25, "y":6.25},
+ {"label":"K5B (B5,D2)", "x":15.25, "y":6.25},
+ {"label":"K5C (B5,D3)", "x":16.5, "y":6},
+ {"label":"K5D (B5,D4)", "x":17.5, "y":6}
+ ]
+ }
+ }
+ ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/th1800/keymaps/default/keymap.c b/keyboards/mechlovin/th1800/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a04a6f246d
--- /dev/null
+++ b/keyboards/mechlovin/th1800/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2020 Team Mechlovin
+ *
+ * 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
+ KC_DEL, KC_END, KC_PGDN, KC_SLCK,
+ 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_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+ 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_P7, KC_P8, KC_P9, KC_PMNS,
+ 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_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+ ),
+
+};
diff --git a/keyboards/mechlovin/th1800/keymaps/default/readme.md b/keyboards/mechlovin/th1800/keymaps/default/readme.md
new file mode 100644
index 0000000000..4471e2802b
--- /dev/null
+++ b/keyboards/mechlovin/th1800/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for th1800
diff --git a/keyboards/mechlovin/th1800/keymaps/via/keymap.c b/keyboards/mechlovin/th1800/keymaps/via/keymap.c
new file mode 100644
index 0000000000..86bc278593
--- /dev/null
+++ b/keyboards/mechlovin/th1800/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2020 Team Mechlovin
+ *
+ * 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
+ KC_DEL, KC_END, KC_PGDN, KC_SLCK,
+ 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_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+ 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_P7, KC_P8, KC_P9, KC_PMNS,
+ 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_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+ ),
+ [1] = 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/mechlovin/th1800/keymaps/via/readme.md b/keyboards/mechlovin/th1800/keymaps/via/readme.md
new file mode 100644
index 0000000000..d81d42fbc6
--- /dev/null
+++ b/keyboards/mechlovin/th1800/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The VIA keymap for TH1800
+
diff --git a/keyboards/mechlovin/th1800/keymaps/via/rules.mk b/keyboards/mechlovin/th1800/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/mechlovin/th1800/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/th1800/readme.md b/keyboards/mechlovin/th1800/readme.md
new file mode 100644
index 0000000000..e71ca25747
--- /dev/null
+++ b/keyboards/mechlovin/th1800/readme.md
@@ -0,0 +1,23 @@
+# th1800
+
+
+
+The project use atmega32a, through hole component, 1800 compact layout, open source.
+
+* Keyboard Maintainer: [Team Mechlovin](https://github.com/mechlovin)
+* Hardware Supported: th1800 PCB, ATmega32A
+* Hardware Availability: [PCB](https://github.com/mechlovin/PCB/tree/master/1800-Compact)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/th1800:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/th1800: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 Th1800 into bootloader, push reset swith on the top of the PCB.
+
+IF87_rev2 used USBasploader from [Erovia tutorial](https://erovia.github.io/posts/thk/#bootloader), thank you [Erovia](https://github.com/Erovia).
diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk
new file mode 100644
index 0000000000..3076166479
--- /dev/null
+++ b/keyboards/mechlovin/th1800/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+BOOTLOADER = USBasp
+
+# 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 = no # Console for debug
+COMMAND_ENABLE = no # 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 = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mechlovin/th1800/th1800.c b/keyboards/mechlovin/th1800/th1800.c
new file mode 100644
index 0000000000..f27b244c41
--- /dev/null
+++ b/keyboards/mechlovin/th1800/th1800.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Team Mechlovin
+ *
+ * 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 "th1800.h"
diff --git a/keyboards/mechlovin/th1800/th1800.h b/keyboards/mechlovin/th1800/th1800.h
new file mode 100644
index 0000000000..edd950b76d
--- /dev/null
+++ b/keyboards/mechlovin/th1800/th1800.h
@@ -0,0 +1,36 @@
+/* Copyright 2020 Team Mechlovin
+ *
+ * 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( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, K0H, \
+ K5E, K5F, K5G, K5H, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, K1H, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, \
+ K50, K51, K52, K55, K57, K58, K59, K5A, K5B, K5C, K5D \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \
+ { K50, K51, K52, KC_NO, KC_NO, K55, KC_NO, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H }, \
+}