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

1 files changed, 77 insertions, 76 deletions

diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
index ad274c1957..a47bfdb7b8 100644
--- a/keyboards/kegen/gboy/info.json
+++ b/keyboards/kegen/gboy/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "G-Boy", 
+    "keyboard_name": "G-Boy",
     "manufacturer": "Kegen",
-    "url": "", 
-    "maintainer": "@mattchan", 
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/kegen/gboy",
+    "maintainer": "mattchan",
     "usb": {
         "vid": "0x4B65",
         "pid": "0x6762",
@@ -11,81 +11,82 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-                
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
+                {"label": "GESC",  "x":0,      "y":0},
+                {"label": "1",     "x":1,      "y":0},
+                {"label": "2",     "x":2,      "y":0},
+                {"label": "3",     "x":3,      "y":0},
+                {"label": "4",     "x":4,      "y":0},
+                {"label": "5",     "x":5,      "y":0},
+                {"label": "6",     "x":6,      "y":0},
+                {"label": "7",     "x":7,      "y":0},
+                {"label": "8",     "x":8,      "y":0},
+                {"label": "9",     "x":9,      "y":0},
+                {"label": "0",     "x":10,     "y":0},
+                {"label": "MINS",  "x":11,     "y":0},
+                {"label": "EQL",   "x":12,     "y":0},
+                {"label": "BSPC",  "x":13,     "y":0},
+                {"label": "BSPC",  "x":14,     "y":0},
+                {"label": "HOME",  "x":15,     "y":0},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":2, "w":1.25},
-                {"x":15, "y":2},
+                {"label": "TAB",   "x":0,      "y":1, "w":1.5},
+                {"label": "Q",     "x":1.5,    "y":1},
+                {"label": "W",     "x":2.5,    "y":1},
+                {"label": "E",     "x":3.5,    "y":1},
+                {"label": "R",     "x":4.5,    "y":1},
+                {"label": "T",     "x":5.5,    "y":1},
+                {"label": "Y",     "x":6.5,    "y":1},
+                {"label": "U",     "x":7.5,    "y":1},
+                {"label": "I",     "x":8.5,    "y":1},
+                {"label": "O",     "x":9.5,    "y":1},
+                {"label": "P",     "x":10.5,   "y":1},
+                {"label": "LBRC",  "x":11.5,   "y":1},
+                {"label": "RBRC",  "x":12.5,   "y":1},
+                {"label": "BSLS",  "x":13.5,   "y":1, "w":1.5},
+                {"label": "PGUP",  "x":15,     "y":1},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
+                {"label": "CAPS",  "x":0,      "y":2, "w":1.75},
+                {"label": "A",     "x":1.75,   "y":2},
+                {"label": "S",     "x":2.75,   "y":2},
+                {"label": "D",     "x":3.75,   "y":2},
+                {"label": "F",     "x":4.75,   "y":2},
+                {"label": "G",     "x":5.75,   "y":2},
+                {"label": "H",     "x":6.75,   "y":2},
+                {"label": "J",     "x":7.75,   "y":2},
+                {"label": "K",     "x":8.75,   "y":2},
+                {"label": "L",     "x":9.75,   "y":2},
+                {"label": "SCLN",  "x":10.75,  "y":2},
+                {"label": "QUOT",  "x":11.75,  "y":2},
+                {"label": "BSLS",  "x":12.75,  "y":2},
+                {"label": "ENT",   "x":13.75,  "y":2, "w":1.25},
+                {"label": "PGDN",  "x":15,     "y":2},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}]
+                {"label": "LSFT",  "x":0,      "y":3, "w":1.25},
+                {"label": "SLSH",  "x":1.25,   "y":3},
+                {"label": "Z",     "x":2.25,   "y":3},
+                {"label": "X",     "x":3.25,   "y":3},
+                {"label": "C",     "x":4.25,   "y":3},
+                {"label": "V",     "x":5.25,   "y":3},
+                {"label": "B",     "x":6.25,   "y":3},
+                {"label": "N",     "x":7.25,   "y":3},
+                {"label": "M",     "x":8.25,   "y":3},
+                {"label": "COMM",  "x":9.25,   "y":3},
+                {"label": "DOT",   "x":10.25,  "y":3},
+                {"label": "SLSH",  "x":11.25,  "y":3},
+                {"label": "RSFT",  "x":12.25,  "y":3, "w":1.75},
+                {"label": "UP",    "x":14,     "y":3},
+                {"label": "END",   "x":15,     "y":3},
+
+                {"label": "LCTL",   "x":0,     "y":4, "w":1.25},
+                {"label": "LGUI",   "x":1.25,  "y":4, "w":1.25},
+                {"label": "LALT",   "x":2.5,   "y":4, "w":1.25},
+                {"label": "SPC",    "x":3.75,  "y":4, "w":6.25},
+                {"label": "RALT",   "x":10,    "y":4},
+                {"label": "MO(1)",  "x":11,    "y":4},
+                {"label": "RCTL",   "x":12,    "y":4},
+                {"label": "LEFT",   "x":13,    "y":4},
+                {"label": "DOWN",   "x":14,    "y":4},
+                {"label": "RGHT",   "x":15,    "y":4}
+            ]
         }
     }
-}
\ No newline at end of file
+}