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

13 files changed, 764 insertions, 0 deletions

diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h
new file mode 100755
index 0000000000..99fced6758
--- /dev/null
+++ b/keyboards/melgeek/mach80/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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       0xEDED
+#define PRODUCT_ID      0x0080
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    MelGeek
+#define PRODUCT         Mach80
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_LED_PROCESS_LIMIT 4
+#define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#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 DRIVER_ADDR_1 0b0110000
+#define DRIVER_COUNT 1
+
diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json
new file mode 100755
index 0000000000..e786df7c17
--- /dev/null
+++ b/keyboards/melgeek/mach80/info.json
@@ -0,0 +1,196 @@
+{
+    "keyboard_name": "Mach80",
+    "url": "",
+    "maintainer": "melgeek001365",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+			"layout": [
+				{"x":0, "y":0},
+				{"x":2, "y":0},
+				{"x":3, "y":0},
+				{"x":4, "y":0},
+				{"x":5, "y":0},
+				{"x":6.5, "y":0},
+				{"x":7.5, "y":0},
+				{"x":8.5, "y":0},
+				{"x":9.5, "y":0},
+				{"x":11, "y":0},
+				{"x":12, "y":0},
+				{"x":13, "y":0},
+				{"x":14, "y":0},
+				{"x":15.25, "y":0},
+				{"x":16.25, "y":0},
+				{"x":17.25, "y":0},
+
+				{"x":0, "y":1},
+				{"x":1, "y":1},
+				{"x":2, "y":1},
+				{"x":3, "y":1},
+				{"x":4, "y":1},
+				{"x":5, "y":1},
+				{"x":6, "y":1},
+				{"x":7, "y":1},
+				{"x":8, "y":1},
+				{"x":9, "y":1},
+				{"x":10, "y":1},
+				{"x":11, "y":1},
+				{"x":12, "y":1},
+				{"x":13, "y":1, "w":2.0},
+				{"x":15.25, "y":1},
+				{"x":16.25, "y":1},
+				{"x":17.25, "y":1},
+
+				{"x":0, "y":2, "w":1.5},
+				{"x":1.5, "y":2},
+				{"x":2.5, "y":2},
+				{"x":3.5, "y":2},
+				{"x":4.5, "y":2},
+				{"x":5.5, "y":2},
+				{"x":6.5, "y":2},
+				{"x":7.5, "y":2},
+				{"x":8.5, "y":2},
+				{"x":9.5, "y":2},
+				{"x":10.5, "y":2},
+				{"x":11.5, "y":2},
+				{"x":12.5, "y":2},
+				{"x":13.5, "y":2, "w":1.5},
+				{"x":15.25, "y":2},
+				{"x":16.25, "y":2},
+				{"x":17.25, "y":2},
+
+				{"x":0, "y":3, "w":1.75},
+				{"x":1.75, "y":3},
+				{"x":2.75, "y":3},
+				{"x":3.75, "y":3},
+				{"x":4.75, "y":3},
+				{"x":5.75, "y":3},
+				{"x":6.75, "y":3},
+				{"x":7.75, "y":3},
+				{"x":8.75, "y":3},
+				{"x":9.75, "y":3},
+				{"x":10.75, "y":3},
+				{"x":11.75, "y":3},
+				{"x":12.75, "y":3, "w":2.25},
+				
+				{"x":0, "y":4, "w":2.25},
+				{"x":2.25, "y":4},
+				{"x":3.25, "y":4},
+				{"x":4.25, "y":4},
+				{"x":5.25, "y":4},
+				{"x":6.25, "y":4},
+				{"x":7.25, "y":4},
+				{"x":8.25, "y":4},
+				{"x":9.25, "y":4},
+				{"x":10.25, "y":4},
+				{"x":11.25, "y":4},
+				{"x":12.25, "y":4, "w":2.75},
+				{"x":16.25, "y":4},
+
+				{"x":0, "y":5, "w":1.25},
+				{"x":1.25, "y":5, "w":1.25},
+				{"x":2.5, "y":5, "w":1.25},
+				{"x":3.75, "y":5, "w":6.25},
+				{"x":10, "y":5, "w":1.25},
+				{"x":11.25, "y":5, "w":1.25},
+				{"x":12.5, "y":5, "w":1.25},
+				{"x":13.75, "y":5, "w":1.25},
+				{"x":15.25, "y":5},
+				{"x":16.25, "y":5},
+				{"x":17.25, "y":5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+			"layout": [
+				{"x":0, "y":0},
+				{"x":2, "y":0},
+				{"x":3, "y":0},
+				{"x":4, "y":0},
+				{"x":5, "y":0},
+				{"x":6.5, "y":0},
+				{"x":7.5, "y":0},
+				{"x":8.5, "y":0},
+				{"x":9.5, "y":0},
+				{"x":11, "y":0},
+				{"x":12, "y":0},
+				{"x":13, "y":0},
+				{"x":14, "y":0},
+				{"x":15.25, "y":0},
+				{"x":16.25, "y":0},
+				{"x":17.25, "y":0},
+
+				{"x":0, "y":1},
+				{"x":1, "y":1},
+				{"x":2, "y":1},
+				{"x":3, "y":1},
+				{"x":4, "y":1},
+				{"x":5, "y":1},
+				{"x":6, "y":1},
+				{"x":7, "y":1},
+				{"x":8, "y":1},
+				{"x":9, "y":1},
+				{"x":10, "y":1},
+				{"x":11, "y":1},
+				{"x":12, "y":1},
+				{"x":13, "y":1, "w":2.0},
+				{"x":15.25, "y":1},
+				{"x":16.25, "y":1},
+				{"x":17.25, "y":1},
+
+				{"x":0, "y":2, "w":1.5},
+				{"x":1.5, "y":2},
+				{"x":2.5, "y":2},
+				{"x":3.5, "y":2},
+				{"x":4.5, "y":2},
+				{"x":5.5, "y":2},
+				{"x":6.5, "y":2},
+				{"x":7.5, "y":2},
+				{"x":8.5, "y":2},
+				{"x":9.5, "y":2},
+				{"x":10.5, "y":2},
+				{"x":11.5, "y":2},
+				{"x":12.5, "y":2},
+				{"x":13.5, "y":2, "w":1.5},
+				{"x":15.25, "y":2},
+				{"x":16.25, "y":2},
+				{"x":17.25, "y":2},
+
+				{"x":0, "y":3, "w":1.75},
+				{"x":1.75, "y":3},
+				{"x":2.75, "y":3},
+				{"x":3.75, "y":3},
+				{"x":4.75, "y":3},
+				{"x":5.75, "y":3},
+				{"x":6.75, "y":3},
+				{"x":7.75, "y":3},
+				{"x":8.75, "y":3},
+				{"x":9.75, "y":3},
+				{"x":10.75, "y":3},
+				{"x":11.75, "y":3},
+				{"x":12.75, "y":3, "w":2.25},
+				
+				{"x":0, "y":4, "w":2.25},
+				{"x":2.25, "y":4},
+				{"x":3.25, "y":4},
+				{"x":4.25, "y":4},
+				{"x":5.25, "y":4},
+				{"x":6.25, "y":4},
+				{"x":7.25, "y":4},
+				{"x":8.25, "y":4},
+				{"x":9.25, "y":4},
+				{"x":10.25, "y":4},
+				{"x":11.25, "y":4},
+				{"x":12.25, "y":4, "w":2.75},
+				{"x":16.25, "y":4},
+
+				{"x":0, "y":5, "w":1.5},
+				{"x":2.5, "y":5, "w":1.5},
+				{"x":4, "y":5, "w":7},
+				{"x":11, "y":5, "w":1.5},
+				{"x":13.5, "y":5, "w":1.5},
+				{"x":15.25, "y":5},
+				{"x":16.25, "y":5},
+				{"x":17.25, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/melgeek/mach80/keymaps/default/keymap.c b/keyboards/melgeek/mach80/keymaps/default/keymap.c
new file mode 100755
index 0000000000..235f0c40db
--- /dev/null
+++ b/keyboards/melgeek/mach80/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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_tkl_ansi( /* Base */
+        KC_GESC,            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_ENT,  
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                MO(1),    KC_RALT,	 KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+	),
+	[1] = LAYOUT_tkl_ansi( /* FN */
+	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  RESET,    _______,  KC_INS,   _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,  
+	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  
+	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
+	)
+};
diff --git a/keyboards/melgeek/mach80/keymaps/tkl/keymap.c b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
new file mode 100755
index 0000000000..17aa4e6d36
--- /dev/null
+++ b/keyboards/melgeek/mach80/keymaps/tkl/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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_tkl_ansi( /* Base */
+        KC_GESC,            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_ENT,  
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                MO(1),    KC_RALT,	 KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+	),
+	[1] = LAYOUT_tkl_ansi( /* FN */
+	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  RESET,    _______,  KC_INS,   _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,   
+	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  
+	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
+	)
+};
diff --git a/keyboards/melgeek/mach80/keymaps/via/keymap.c b/keyboards/melgeek/mach80/keymaps/via/keymap.c
new file mode 100755
index 0000000000..058786d1d2
--- /dev/null
+++ b/keyboards/melgeek/mach80/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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_tkl_ansi( /* Base */
+        KC_GESC,            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_ENT,   
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                MO(1),    KC_RALT,	 KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+	),
+	[1] = LAYOUT_tkl_ansi( /* FN */
+	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______,
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  RESET,    _______,  KC_INS,   _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,      
+	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  
+	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
+	),
+	[2] = LAYOUT_tkl_ansi(
+	    _______,		    _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,      
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,                      _______,  
+	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,  _______,  _______,  _______,  _______
+	),
+	[3] = LAYOUT_tkl_ansi(
+	    _______,		    _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,      
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,                      _______,  
+	    _______,  _______,  _______,                      _______,                               _______,  _______,  _______,  _______,  _______,  _______,  _______
+	)
+};
diff --git a/keyboards/melgeek/mach80/keymaps/via/rules.mk b/keyboards/melgeek/mach80/keymaps/via/rules.mk
new file mode 100755
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/melgeek/mach80/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/melgeek/mach80/keymaps/wkl/keymap.c b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
new file mode 100755
index 0000000000..7fcf43bd01
--- /dev/null
+++ b/keyboards/melgeek/mach80/keymaps/wkl/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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_tkl_ansi_wkl( /* Base */
+        KC_GESC,            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_ENT,       
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,
+        KC_LCTL,            KC_LALT,                      KC_SPC,                                MO(1),                        KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+	),
+	[1] = LAYOUT_tkl_ansi_wkl( /* FN */
+	    _______,			_______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  EEP_RST,
+	    _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,  KC_DEL,   _______,  KC_END,   _______, 
+	    _______,  RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD, RGB_VAI,  RGB_VAD,  RGB_MOD,  _______,  _______,  _______,  RESET,    _______,  KC_INS,   _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  RGB_SPI,  RGB_SPD,  _______,  _______,  _______,     
+	    _______,  _______,  _______,  _______,  _______,  _______,  NK_TOGG, _______,  _______,  _______,  _______,  _______,                      KC_VOLU,  
+	    _______,            _______,                      _______,                               _______,                      _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
+	)
+};
diff --git a/keyboards/melgeek/mach80/mach80.c b/keyboards/melgeek/mach80/mach80.c
new file mode 100755
index 0000000000..28d21b22b1
--- /dev/null
+++ b/keyboards/melgeek/mach80/mach80.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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 "mach80.h"
diff --git a/keyboards/melgeek/mach80/mach80.h b/keyboards/melgeek/mach80/mach80.h
new file mode 100755
index 0000000000..6e954a9185
--- /dev/null
+++ b/keyboards/melgeek/mach80/mach80.h
@@ -0,0 +1,53 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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 XXX KC_NO
+
+#define LAYOUT_tkl_ansi( \
+    K00,	  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K3D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K3E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K3F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,           K4E,	         \
+    K50, K51, K52,           K55,                K59, K5A, K5B, K5C, K5D, K5E, K5F       \
+) { \
+	{K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
+	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
+	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
+	{K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
+	{K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, XXX, K4E, XXX}, \
+	{K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, K5E, K5F}  \
+}
+
+#define LAYOUT_tkl_ansi_wkl( \
+    K00,	  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K3D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K3E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K3F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                     \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,           K4E,	         \
+    K50,      K52,           K55,                K59,           K5C, K5D, K5E, K5F       \
+) { \
+	{K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
+	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
+	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
+	{K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
+	{K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, XXX, K4E, XXX}, \
+	{K50, XXX, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, XXX, XXX, K5C, K5D, K5E, K5F}  \
+}
diff --git a/keyboards/melgeek/mach80/readme.md b/keyboards/melgeek/mach80/readme.md
new file mode 100755
index 0000000000..f4c8572c4d
--- /dev/null
+++ b/keyboards/melgeek/mach80/readme.md
@@ -0,0 +1,21 @@
+# MelGeek Mach80
+
+![Mach80](https://www.melgeek.com/collections/pcb-plate/products/melgeek-mach80-tkl87-hotswappable-rgb-pcba)
+
+A hotswap 80% RGB Custom Mechanical keyboard.
+
+* Keyboard Maintainer: [melgeek001365](https://github.com/melgeek001365)
+* Hardware Supported: Mach80 rev1 20210819 
+* Hardware Availability: [MelGeek](https://www.melgeek.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make melgeek/mach80/rev1:default
+    
+Enter the bootloader in 3 ways:  
+
+**Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * 
+**Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead * 
+**Keycode in layout**: Press the key mapped to `RESET` if it is available *
+
+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/melgeek/mach80/rev1/config.h b/keyboards/melgeek/mach80/rev1/config.h
new file mode 100755
index 0000000000..e3ae4de76d
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev1/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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
+
+/*
+ * 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 { F0, F1, F4, F5, F6, E6 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define DRIVER_1_LED_TOTAL 97
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define DRIVER_INDICATOR_LED_TOTAL 3
+
+
+#define RGB_MATRIX_CENTER { 108, 30 }
+
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
new file mode 100755
index 0000000000..5a79708570
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -0,0 +1,193 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * 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 "mach80.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+
+const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
+    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
+    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
+    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
+    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
+    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
+    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
+    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
+    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
+    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
+    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
+    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
+    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
+    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
+    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */
+    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */
+    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
+	{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
+    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
+	{0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
+	{0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
+    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
+    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
+    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
+    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
+    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */
+    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */
+    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
+    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
+    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */
+    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */
+    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
+    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
+    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */
+    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
+    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
+    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
+    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
+    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
+    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
+    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
+    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
+    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
+    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */
+	{0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */
+    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */
+    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */
+    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */
+    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */
+    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */
+    {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */
+    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
+    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
+	{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
+    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
+    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
+    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
+    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
+    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
+    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
+    {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */
+    {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */
+    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */
+    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */
+    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */
+    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */
+    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
+    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
+    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
+    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
+    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
+    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
+    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
+    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
+    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */
+    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
+    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */
+    {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */
+    {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */
+    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */
+    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */
+    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */
+    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
+    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
+    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
+    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
+    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
+    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
+    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
+    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
+    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
+    {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */
+    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB110 */
+    {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB111 */
+    {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB112 */
+};
+led_config_t g_led_config = {
+	{
+		/* C0       C1       C2       C3       C4       C5       C6       C7       C8       C9       C10       C11       C12       C13       C14       C15 */
+		{  0,  NO_LED,       1,       2,       3,       4,       5,       6,       7,       8,        9,       10,       11,       12,       13,       14 }, /* R0 */
+		{ 16,      17,      18,      19,      20,      21,      22,      23,      24,      25,       26,       27,       28,       30,       32,       33 }, /* R1 */
+		{ 35,      36,      37,      38,      39,      40,      41,      42,      43,      44,       45,       46,       47,       48,       49,       50 }, /* R2 */
+		{ 52,      53,      54,      55,      56,      57,      58,      59,      60,      61,       62,       63,       65,       15,       34,       51 }, /* R3 */
+		{ 68,      70,      71,      72,      73,      74,      75,      76,      77,      78,       79,       81,   NO_LED,   NO_LED,       83,   NO_LED }, /* R4 */
+		{ 84,      85,      86,  NO_LED,  NO_LED,      88,  NO_LED,  NO_LED,  NO_LED,      90,       91,       92,       93,       94,       95,       96 }  /* R5 */
+    }, {
+        {0, 0},   {12, 0},   {24, 0},  {36, 0},  {48, 0},  {60, 0},  {72, 0},  {84, 0},  {96, 0},  {108, 0},  {120, 0},  {132, 0},  {144, 0},  {156, 0},  {168, 0},  {180, 0},                                   //16
+		{0, 12},  {12, 12},  {24, 12}, {36, 12}, {48, 12}, {60, 12}, {72, 12}, {84, 12}, {96, 12}, {108, 12}, {120, 12}, {132, 12}, {144, 12}, {156, 12}, {168, 12}, {180, 12}, {192, 12}, {204, 12}, {216, 12}, //19
+		{0, 24},  {12, 24},  {24, 24}, {36, 24}, {48, 24}, {60, 24}, {72, 24}, {84, 24}, {96, 24}, {108, 24}, {120, 24}, {132, 24}, {144, 24},