5 files changed, 125 insertions, 104 deletions
diff --git a/keyboards/geminate60/geminate60.h b/keyboards/geminate60/geminate60.h
index dd8055abe..7361930a2 100644
--- a/keyboards/geminate60/geminate60.h
+++ b/keyboards/geminate60/geminate60.h
@@ -15,16 +15,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
-#define LAYOUT( \
+#define ___ KC_NO
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014,  \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113,        \
+#define LAYOUT_all( \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213,        \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-        K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313,        \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-        K40, K41, K42,                K46,                K410, K411, K412, K413       ) \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \
-    { \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113      }, \
+) { \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213      }, \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313      }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___ }, \
-    {K40, K41, K42,                K46,                K410, K411, K412, K413      } \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
-    }
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___ }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, ___ }  \
+}
diff --git a/keyboards/geminate60/info.json b/keyboards/geminate60/info.json
index bbf63d73d..1c9fc8c38 100644
--- a/keyboards/geminate60/info.json
+++ b/keyboards/geminate60/info.json
@@ -1,27 +1,31 @@
 {
    "keyboard_name": "geminate60",
    "url": "",
-    "maintainer": "qmk",
+    "maintainer": "Weirdo-F",
    "width": 15,
    "height": 5,
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
            "layout": [
                {"label":"K00", "x":0, "y":0},
                {"label":"K01", "x":1, "y":0},
                {"label":"K02", "x":2, "y":0},
-                {"label":"K0", "x":3, "y":0},
+                {"label":"K03", "x":3, "y":0},
                {"label":"K04", "x":4, "y":0},
                {"label":"K05", "x":5, "y":0},
                {"label":"K06", "x":6, "y":0},
                {"label":"K07", "x":7, "y":0},
                {"label":"K08", "x":8, "y":0},
                {"label":"K09", "x":9, "y":0},
-                {"label":"K010", "x":10, "y":0},
+                {"label":"K0A", "x":10, "y":0},
-                {"label":"K011", "x":11, "y":0},
+                {"label":"K0B", "x":11, "y":0},
-                {"label":"K012", "x":12, "y":0},
+                {"label":"K0C", "x":12, "y":0},
-                {"label":"K013", "x":13, "y":0},
+                {"label":"K0D", "x":13, "y":0},
-                {"label":"K014", "x":14, "y":0},
+                {"label":"K0E", "x":14, "y":0},
                {"label":"K10", "x":0, "y":1, "w":1.5},
                {"label":"K11", "x":1.5, "y":1},
                {"label":"K12", "x":2.5, "y":1},
@@ -32,10 +36,11 @@
                {"label":"K17", "x":7.5, "y":1},
                {"label":"K18", "x":8.5, "y":1},
                {"label":"K19", "x":9.5, "y":1},
-                {"label":"K110", "x":10.5, "y":1},
+                {"label":"K1A", "x":10.5, "y":1},
-                {"label":"K111", "x":11.5, "y":1},
+                {"label":"K1B", "x":11.5, "y":1},
-                {"label":"K112", "x":12.5, "y":1},
+                {"label":"K1C", "x":12.5, "y":1},
-                {"label":"K113", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1D", "x":13.5, "y":1, "w":1.5},
                {"label":"K20", "x":0, "y":2, "w":1.75},
                {"label":"K21", "x":1.75, "y":2},
                {"label":"K22", "x":2.75, "y":2},
@@ -46,10 +51,11 @@
                {"label":"K27", "x":7.75, "y":2},
                {"label":"K28", "x":8.75, "y":2},
                {"label":"K29", "x":9.75, "y":2},
-                {"label":"K210", "x":10.75, "y":2},
+                {"label":"K2A", "x":10.75, "y":2},
-                {"label":"K211", "x":11.75, "y":2},
+                {"label":"K2B", "x":11.75, "y":2},
-                {"label":"K212", "x":12.75, "y":2},
+                {"label":"K2C", "x":12.75, "y":2},
-                {"label":"K213", "x":13.75, "y":2, "w":1.25},
+                {"label":"K2D", "x":13.75, "y":2, "w":1.25},
                {"label":"K30", "x":0, "y":3, "w":1.25},
                {"label":"K31", "x":1.25, "y":3},
                {"label":"K32", "x":2.25, "y":3},
@@ -60,20 +66,20 @@
                {"label":"K37", "x":7.25, "y":3},
                {"label":"K38", "x":8.25, "y":3},
                {"label":"K39", "x":9.25, "y":3},
-                {"label":"K310", "x":10.25, "y":3},
+                {"label":"K3A", "x":10.25, "y":3},
-                {"label":"K311", "x":11.25, "y":3},
+                {"label":"K3B", "x":11.25, "y":3},
-                {"label":"K312", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3C", "x":12.25, "y":3, "w":1.75},
-                {"label":"K313", "x":14, "y":3},
+                {"label":"K3D", "x":14, "y":3},
                {"label":"K40", "x":0, "y":4, "w":1.25},
                {"label":"K41", "x":1.25, "y":4, "w":1.25},
                {"label":"K42", "x":2.5, "y":4, "w":1.25},
                {"label":"K46", "x":3.75, "y":4, "w":6.25},
-                {"label":"K410", "x":10, "y":4, "w":1.25},
+                {"label":"K4A", "x":10, "y":4, "w":1.25},
-                {"label":"K411", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4B", "x":11.25, "y":4, "w":1.25},
-                {"label":"K412", "x":12.5, "y":4, "w":1.25},
+                {"label":"K4C", "x":12.5, "y":4, "w":1.25},
-                {"label":"K413", "x":13.75, "y":4, "w":1.25}
+                {"label":"K4D", "x":13.75, "y":4, "w":1.25}
            ]
        }
    }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/geminate60/keymaps/default/keymap.c b/keyboards/geminate60/keymaps/default/keymap.c
index e7edabfd5..91a6f8c3e 100644
--- a/keyboards/geminate60/keymaps/default/keymap.c
+++ b/keyboards/geminate60/keymaps/default/keymap.c
@@ -1,18 +1,18 @@
 /* Copyright 2020 Weirdo
-  * 
+  *
-  * This program is free software: you can redistribute it and/or modify 
+  * 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 
+  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or 
+  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version. 
+  * (at your option) any later version.
-  * 
+  *
-  * This program is distributed in the hope that it will be useful, 
+  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details. 
+  * GNU General Public License for more details.
-  * 
+  *
-  * You should have received a copy of the GNU General Public License 
+  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
+  */
 #include QMK_KEYBOARD_H
@@ -23,18 +23,22 @@ enum layer_names {
 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [_BASE] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
-                         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,
+    [_BASE] = LAYOUT_all(
-                         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_BSLS, KC_ENT, 
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
-                         KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+        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_LCTL, KC_LWIN, KC_LALT,KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL),
+        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_BSLS, KC_ENT,
+        KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RALT, KC_RWIN, KC_RCTL
-        [_FN] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
+    ),
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    [_FN] = 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_UP, KC_TRNS,
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT),  //
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 };
diff --git a/keyboards/geminate60/keymaps/via/keymap.c b/keyboards/geminate60/keymaps/via/keymap.c
index 2093cbe0a..85210835e 100644
--- a/keyboards/geminate60/keymaps/via/keymap.c
+++ b/keyboards/geminate60/keymaps/via/keymap.c
@@ -1,18 +1,18 @@
 /* Copyright 2020 Weirdo
-  * 
+  *
-  * This program is free software: you can redistribute it and/or modify 
+  * 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 
+  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or 
+  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version. 
+  * (at your option) any later version.
-  * 
+  *
-  * This program is distributed in the hope that it will be useful, 
+  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details. 
+  * GNU General Public License for more details.
-  * 
+  *
-  * You should have received a copy of the GNU General Public License 
+  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
+  */
 #include QMK_KEYBOARD_H
@@ -20,30 +20,39 @@
 enum layer_names { _BASE, _FN ,_FN1 ,_FN2 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [_BASE] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
-                         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,
+    [_BASE] = LAYOUT_all(
-                         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_BSLS, KC_ENT,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
-                         KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+        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_LCTL, KC_LWIN, KC_LALT, KC_SPACE,  KC_RALT, KC_RALT, KC_RWIN, KC_RCTL),
+        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_BSLS, KC_ENT,
+        KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RALT, KC_RWIN, KC_RCTL
-        [_FN] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
+    ),
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    [_FN] = 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_UP, KC_TRNS,
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT),  //
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        [_FN1] = 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_UP,   KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    ),
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [_FN1] = 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,
-        [_FN2] = 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, KC_TRNS, KC_TRNS
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    ),
+    [_FN2] = 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
+    ),
 };
 bool led_update_user(led_t led_state) {
diff --git a/keyboards/geminate60/readme.md b/keyboards/geminate60/readme.md
index f08e87739..457c06ce5 100644
--- a/keyboards/geminate60/readme.md
+++ b/keyboards/geminate60/readme.md
@@ -2,9 +2,9 @@
 ![Geminate60](https://www.hualigs.cn/image/600d9391f16d7.jpg)
-A 60% keyboard based on STM32f303
+A 60% keyboard based on STM32F303.
-* Keyboard Maintainer:  [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361)
+* Keyboard Maintainer:  [Weirdo](https://github.com/weirdo-f) ([weirdo-f.github.io](https://))
 * Hardware Supported: Geminate60
 * Hardware Availability: Not yet

diff --git a/keyboards/geminate60/geminate60.h b/keyboards/geminate60/geminate60.h index dd8055abe..7361930a2 100644 --- a/keyboards/geminate60/geminate60.h +++ b/keyboards/geminate60/geminate60.h
@@ -15,16 +15,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
15		15
16	#include "quantum.h"	16	#include "quantum.h"
17		17
18	#define LAYOUT( \	18	#define ___ KC_NO
19	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014, \	19
20	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, \	20	#define LAYOUT_all( \
21	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, \	21	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
22	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, \	22	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
23	K40, K41, K42, K46, K410, K411, K412, K413 ) \	23	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
24	{ \	24	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
25	{K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \	25	K40, K41, K42, K46, K4A, K4B, K4C, K4D \
26	{K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \	26	) { \
27	{K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \	27	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
28	{K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \	28	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___ }, \
29	{K40, K41, K42, K46, K410, K411, K412, K413 } \	29	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
30	}	30	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___ }, \
		31	{ K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, ___ } \
		32	}


diff --git a/keyboards/geminate60/info.json b/keyboards/geminate60/info.json index bbf63d73d..1c9fc8c38 100644 --- a/keyboards/geminate60/info.json +++ b/keyboards/geminate60/info.json
@@ -1,27 +1,31 @@
1	{	1	{
2	"keyboard_name": "geminate60",	2	"keyboard_name": "geminate60",
3	"url": "",	3	"url": "",
4	"maintainer": "qmk",	4	"maintainer": "Weirdo-F",
5	"width": 15,	5	"width": 15,
6	"height": 5,	6	"height": 5,
		7	"layout_aliases": {
		8	"LAYOUT": "LAYOUT_all"
		9	},
7	"layouts": {	10	"layouts": {
8	"LAYOUT": {	11	"LAYOUT_all": {
9	"layout": [	12	"layout": [
10	{"label":"K00", "x":0, "y":0},	13	{"label":"K00", "x":0, "y":0},
11	{"label":"K01", "x":1, "y":0},	14	{"label":"K01", "x":1, "y":0},
12	{"label":"K02", "x":2, "y":0},	15	{"label":"K02", "x":2, "y":0},
13	{"label":"K0", "x":3, "y":0},	16	{"label":"K03", "x":3, "y":0},
14	{"label":"K04", "x":4, "y":0},	17	{"label":"K04", "x":4, "y":0},
15	{"label":"K05", "x":5, "y":0},	18	{"label":"K05", "x":5, "y":0},
16	{"label":"K06", "x":6, "y":0},	19	{"label":"K06", "x":6, "y":0},
17	{"label":"K07", "x":7, "y":0},	20	{"label":"K07", "x":7, "y":0},
18	{"label":"K08", "x":8, "y":0},	21	{"label":"K08", "x":8, "y":0},
19	{"label":"K09", "x":9, "y":0},	22	{"label":"K09", "x":9, "y":0},
20	{"label":"K010", "x":10, "y":0},	23	{"label":"K0A", "x":10, "y":0},
21	{"label":"K011", "x":11, "y":0},	24	{"label":"K0B", "x":11, "y":0},
22	{"label":"K012", "x":12, "y":0},	25	{"label":"K0C", "x":12, "y":0},
23	{"label":"K013", "x":13, "y":0},	26	{"label":"K0D", "x":13, "y":0},
24	{"label":"K014", "x":14, "y":0},	27	{"label":"K0E", "x":14, "y":0},
		28
25	{"label":"K10", "x":0, "y":1, "w":1.5},	29	{"label":"K10", "x":0, "y":1, "w":1.5},
26	{"label":"K11", "x":1.5, "y":1},	30	{"label":"K11", "x":1.5, "y":1},
27	{"label":"K12", "x":2.5, "y":1},	31	{"label":"K12", "x":2.5, "y":1},
@@ -32,10 +36,11 @@
32	{"label":"K17", "x":7.5, "y":1},	36	{"label":"K17", "x":7.5, "y":1},
33	{"label":"K18", "x":8.5, "y":1},	37	{"label":"K18", "x":8.5, "y":1},
34	{"label":"K19", "x":9.5, "y":1},	38	{"label":"K19", "x":9.5, "y":1},
35	{"label":"K110", "x":10.5, "y":1},	39	{"label":"K1A", "x":10.5, "y":1},
36	{"label":"K111", "x":11.5, "y":1},	40	{"label":"K1B", "x":11.5, "y":1},
37	{"label":"K112", "x":12.5, "y":1},	41	{"label":"K1C", "x":12.5, "y":1},
38	{"label":"K113", "x":13.5, "y":1, "w":1.5},	42	{"label":"K1D", "x":13.5, "y":1, "w":1.5},
		43
39	{"label":"K20", "x":0, "y":2, "w":1.75},	44	{"label":"K20", "x":0, "y":2, "w":1.75},
40	{"label":"K21", "x":1.75, "y":2},	45	{"label":"K21", "x":1.75, "y":2},
41	{"label":"K22", "x":2.75, "y":2},	46	{"label":"K22", "x":2.75, "y":2},
@@ -46,10 +51,11 @@
46	{"label":"K27", "x":7.75, "y":2},	51	{"label":"K27", "x":7.75, "y":2},
47	{"label":"K28", "x":8.75, "y":2},	52	{"label":"K28", "x":8.75, "y":2},
48	{"label":"K29", "x":9.75, "y":2},	53	{"label":"K29", "x":9.75, "y":2},
49	{"label":"K210", "x":10.75, "y":2},	54	{"label":"K2A", "x":10.75, "y":2},
50	{"label":"K211", "x":11.75, "y":2},	55	{"label":"K2B", "x":11.75, "y":2},
51	{"label":"K212", "x":12.75, "y":2},	56	{"label":"K2C", "x":12.75, "y":2},
52	{"label":"K213", "x":13.75, "y":2, "w":1.25},	57	{"label":"K2D", "x":13.75, "y":2, "w":1.25},
		58
53	{"label":"K30", "x":0, "y":3, "w":1.25},	59	{"label":"K30", "x":0, "y":3, "w":1.25},
54	{"label":"K31", "x":1.25, "y":3},	60	{"label":"K31", "x":1.25, "y":3},
55	{"label":"K32", "x":2.25, "y":3},	61	{"label":"K32", "x":2.25, "y":3},
@@ -60,20 +66,20 @@
60	{"label":"K37", "x":7.25, "y":3},	66	{"label":"K37", "x":7.25, "y":3},
61	{"label":"K38", "x":8.25, "y":3},	67	{"label":"K38", "x":8.25, "y":3},
62	{"label":"K39", "x":9.25, "y":3},	68	{"label":"K39", "x":9.25, "y":3},
63	{"label":"K310", "x":10.25, "y":3},	69	{"label":"K3A", "x":10.25, "y":3},
64	{"label":"K311", "x":11.25, "y":3},	70	{"label":"K3B", "x":11.25, "y":3},
65	{"label":"K312", "x":12.25, "y":3, "w":1.75},	71	{"label":"K3C", "x":12.25, "y":3, "w":1.75},
66	{"label":"K313", "x":14, "y":3},	72	{"label":"K3D", "x":14, "y":3},
		73
67	{"label":"K40", "x":0, "y":4, "w":1.25},	74	{"label":"K40", "x":0, "y":4, "w":1.25},
68	{"label":"K41", "x":1.25, "y":4, "w":1.25},	75	{"label":"K41", "x":1.25, "y":4, "w":1.25},
69	{"label":"K42", "x":2.5, "y":4, "w":1.25},	76	{"label":"K42", "x":2.5, "y":4, "w":1.25},
70	{"label":"K46", "x":3.75, "y":4, "w":6.25},	77	{"label":"K46", "x":3.75, "y":4, "w":6.25},
71	{"label":"K410", "x":10, "y":4, "w":1.25},	78	{"label":"K4A", "x":10, "y":4, "w":1.25},
72	{"label":"K411", "x":11.25, "y":4, "w":1.25},	79	{"label":"K4B", "x":11.25, "y":4, "w":1.25},
73	{"label":"K412", "x":12.5, "y":4, "w":1.25},	80	{"label":"K4C", "x":12.5, "y":4, "w":1.25},
74	{"label":"K413", "x":13.75, "y":4, "w":1.25}	81	{"label":"K4D", "x":13.75, "y":4, "w":1.25}
75	]	82	]
76	}	83	}
77	}	84	}
78	,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
79	}	85	}


diff --git a/keyboards/geminate60/keymaps/default/keymap.c b/keyboards/geminate60/keymaps/default/keymap.c index e7edabfd5..91a6f8c3e 100644 --- a/keyboards/geminate60/keymaps/default/keymap.c +++ b/keyboards/geminate60/keymaps/default/keymap.c
@@ -1,18 +1,18 @@
1	/* Copyright 2020 Weirdo	1	/* Copyright 2020 Weirdo
2	*	2	*
3	* This program is free software: you can redistribute it and/or modify	3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by	4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or	5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.	6	* (at your option) any later version.
7	*	7	*
8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.	11	* GNU General Public License for more details.
12	*	12	*
13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16	#include QMK_KEYBOARD_H	16	#include QMK_KEYBOARD_H
17		17
18		18
@@ -23,18 +23,22 @@ enum layer_names {
23	};	23	};
24		24
25	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	25	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26	[_BASE] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,	26
27	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,	27	[_BASE] = LAYOUT_all(
28	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_BSLS, KC_ENT,	28	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
29	KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),	29	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,
30	KC_LCTL, KC_LWIN, KC_LALT,KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL),	30	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_BSLS, KC_ENT,
31		31	KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
32		32	KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL
33	[_FN] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,	33	),
34	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	34
35	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	35	[_FN] = LAYOUT_all(
36	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,	36	KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), //	37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		38	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		39	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
		40	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
		41	),
38		42
39	};	43	};
40		44


diff --git a/keyboards/geminate60/keymaps/via/keymap.c b/keyboards/geminate60/keymaps/via/keymap.c index 2093cbe0a..85210835e 100644 --- a/keyboards/geminate60/keymaps/via/keymap.c +++ b/keyboards/geminate60/keymaps/via/keymap.c
@@ -1,18 +1,18 @@
1	/* Copyright 2020 Weirdo	1	/* Copyright 2020 Weirdo
2	*	2	*
3	* This program is free software: you can redistribute it and/or modify	3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by	4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or	5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.	6	* (at your option) any later version.
7	*	7	*
8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.	11	* GNU General Public License for more details.
12	*	12	*
13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16	#include QMK_KEYBOARD_H	16	#include QMK_KEYBOARD_H
17		17
18		18
@@ -20,30 +20,39 @@
20	enum layer_names { _BASE, _FN ,_FN1 ,_FN2 };	20	enum layer_names { _BASE, _FN ,_FN1 ,_FN2 };
21		21
22	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	22	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
23	[_BASE] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,	23
24	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,	24	[_BASE] = LAYOUT_all(
25	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_BSLS, KC_ENT,	25	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
26	KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),	26	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,
27	KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL),	27	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_BSLS, KC_ENT,
28		28	KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
29		29	KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL
30	[_FN] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,	30	),
31	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	31
32	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	32	[_FN] = LAYOUT_all(
33	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,	33	KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
34	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), //	34	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35		35	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
36	[_FN1] = 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,	36	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
38	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	38	),
39	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	39
40	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),	40	[_FN1] = LAYOUT_all(
41		41	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
42	[_FN2] = 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,	42	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
43	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	43	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
44	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	44	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	45	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
46	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),	46	),
		47
		48	[_FN2] = LAYOUT_all(
		49	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		50	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		51	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		52	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		53	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
		54	),
		55
47	};	56	};
48		57
49	bool led_update_user(led_t led_state) {	58	bool led_update_user(led_t led_state) {


diff --git a/keyboards/geminate60/readme.md b/keyboards/geminate60/readme.md index f08e87739..457c06ce5 100644 --- a/keyboards/geminate60/readme.md +++ b/keyboards/geminate60/readme.md
@@ -2,9 +2,9 @@
2		2
3	![Geminate60](https://www.hualigs.cn/image/600d9391f16d7.jpg)	3	![Geminate60](https://www.hualigs.cn/image/600d9391f16d7.jpg)
4		4
5	A 60% keyboard based on STM32f303	5	A 60% keyboard based on STM32F303.
6		6
7	* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361)	7	* Keyboard Maintainer: [Weirdo](https://github.com/weirdo-f) ([weirdo-f.github.io](https://))
8	* Hardware Supported: Geminate60	8	* Hardware Supported: Geminate60
9	* Hardware Availability: Not yet	9	* Hardware Availability: Not yet
10		10