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

2 files changed, 80 insertions, 5 deletions

diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
index e0acaaa466..0d781f0c7c 100644
--- a/keyboards/aleblazer/zodiark/info.json
+++ b/keyboards/aleblazer/zodiark/info.json
@@ -2,11 +2,86 @@
     "keyboard_name": "zodiark", 
     "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark", 
     "maintainer": "Aleblazer", 
-    "width": 19, 
-    "height": 8.48, 
+    "width": 18,
+    "height": 6.25,
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"L03", "x":3, "y":0}, {"label":"R03", "x":15, "y":0}, {"label":"L02", "x":2, "y":0.125}, {"label":"L04", "x":4, "y":0.125}, {"label":"R02", "x":14, "y":0.125}, {"label":"R04", "x":16, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"R01", "x":13, "y":0.25}, {"label":"L00", "x":0, "y":0.53}, {"label":"L01", "x":1, "y":0.53}, {"label":"R05", "x":17, "y":0.53}, {"label":"R06", "x":18, "y":0.53}, {"label":"L13", "x":3, "y":1}, {"label":"R13", "x":15, "y":1}, {"label":"L12", "x":2, "y":1.125}, {"label":"L14", "x":4, "y":1.125}, {"label":"R12", "x":14, "y":1.125}, {"label":"R14", "x":16, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"R11", "x":13, "y":1.25}, {"label":"L10", "x":0, "y":1.53}, {"label":"L11", "x":1, "y":1.53}, {"label":"R15", "x":17, "y":1.53}, {"label":"R16", "x":18, "y":1.53}, {"label":"L06", "x":6, "y":1.7000000000000002}, {"label":"R00", "x":12, "y":1.7000000000000002}, {"label":"L23", "x":3, "y":2.0}, {"label":"R23", "x":15, "y":2.0}, {"label":"L22", "x":2, "y":2.125}, {"label":"L24", "x":4, "y":2.125}, {"label":"R22", "x":14, "y":2.125}, {"label":"R24", "x":16, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"R21", "x":13, "y":2.25}, {"label":"L20", "x":0, "y":2.5300000000000002}, {"label":"L21", "x":1, "y":2.5300000000000002}, {"label":"R25", "x":17, "y":2.5300000000000002}, {"label":"R26", "x":18, "y":2.5300000000000002}, {"label":"L16", "x":6, "y":2.7}, {"label":"R10", "x":12, "y":2.7}, {"label":"L33", "x":3, "y":3.0000000000000004}, {"label":"R33", "x":15, "y":3.0000000000000004}, {"label":"L32", "x":2, "y":3.1250000000000004}, {"label":"L34", "x":4, "y":3.1250000000000004}, {"label":"R32", "x":14, "y":3.1250000000000004}, {"label":"R34", "x":16, "y":3.1250000000000004}, {"label":"L35", "x":5, "y":3.2500000000000004}, {"label":"R31", "x":13, "y":3.2500000000000004}, {"label":"L30", "x":0, "y":3.5300000000000002}, {"label":"L31", "x":1, "y":3.5300000000000002}, {"label":"R35", "x":17, "y":3.5300000000000002}, {"label":"R36", "x":18, "y":3.5300000000000002}, {"label":"L43", "x":3, "y":4.0}, {"label":"R43", "x":15, "y":4.0}, {"label":"L42", "x":2, "y":4.125}, {"label":"R44", "x":16, "y":4.125}, {"label":"L44", "x":4, "y":4.13}, {"label":"R42", "x":14, "y":4.13}, {"label":"L40", "x":0, "y":4.53}, {"label":"L41", "x":1, "y":4.53}, {"label":"R45", "x":17, "y":4.53}, {"label":"R46", "x":18, "y":4.53}, {"label":"L26", "x":-0.33, "y":5.13}, {"label":"L36", "x":0.6699999999999999, "y":5.13}, {"label":"L45", "x":-0.83, "y":6.13, "w":1.5}, {"label":"L46", "x":0.67, "y":6.13}, {"label":"R30", "x":-2.1, "y":6.48}, {"label":"R20", "x":-1.1, "y":6.48}, {"label":"R40", "x":-2.1, "y":7.48}, {"label":"R41", "x":-1.1, "y":7.48, "w":1.5}]
+            "layout": [
+                {"x":0, "y":0.53},
+                {"x":1, "y":0.53},
+                {"x":2, "y":0.125},
+                {"x":3, "y":0},
+                {"x":4, "y":0.125},
+                {"x":5, "y":0.25},
+                {"x":12, "y":0.25},
+                {"x":13, "y":0.125},
+                {"x":14, "y":0},
+                {"x":15, "y":0.125},
+                {"x":16, "y":0.53},
+                {"x":17, "y":0.53},
+
+                {"x":0, "y":1.53},
+                {"x":1, "y":1.53},
+                {"x":2, "y":1.125},
+                {"x":3, "y":1},
+                {"x":4, "y":1.125},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.7},
+                {"x":11, "y":1.7},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.125},
+                {"x":14, "y":1},
+                {"x":15, "y":1.125},
+                {"x":16, "y":1.53},
+                {"x":17, "y":1.53},
+
+                {"x":0, "y":2.53},
+                {"x":1, "y":2.53},
+                {"x":2, "y":2.125},
+                {"x":3, "y":2},
+                {"x":4, "y":2.125},
+                {"x":5, "y":2.25},
+                {"x":6, "y":2.7},
+                {"x":11, "y":2.7},
+                {"x":12, "y":2.25},
+                {"x":13, "y":2.125},
+                {"x":14, "y":2},
+                {"x":15, "y":2.125},
+                {"x":16, "y":2.53},
+                {"x":17, "y":2.53},
+
+                {"x":0, "y":3.53},
+                {"x":1, "y":3.53},
+                {"x":2, "y":3.125},
+                {"x":3, "y":3},
+                {"x":4, "y":3.125},
+                {"x":5, "y":3.25},
+                {"x":6.5, "y":4.25},
+                {"x":7.5, "y":4.25},
+                {"x":9.5, "y":4.25},
+                {"x":10.5, "y":4.25},
+                {"x":12, "y":3.25},
+                {"x":13, "y":3.125},
+                {"x":14, "y":3},
+                {"x":15, "y":3.125},
+                {"x":16, "y":3.53},
+                {"x":17, "y":3.53},
+
+                {"x":0, "y":4.53},
+                {"x":1, "y":4.53},
+                {"x":2, "y":4.125},
+                {"x":3, "y":4},
+                {"x":4, "y":4.125},
+                {"x":6, "y":5.25, "w":1.5},
+                {"x":7.5, "y":5.25},
+                {"x":9.5, "y":5.25},
+                {"x":10.5, "y":5.25, "w":1.5},
+                {"x":13, "y":4.125},
+                {"x":14, "y":4},
+                {"x":15, "y":4.125},
+                {"x":16, "y":4.53},
+                {"x":17, "y":4.53}
+            ]
         }
     }
 }
diff --git a/keyboards/aleblazer/zodiark/readme.md b/keyboards/aleblazer/zodiark/readme.md
index fe28bedd48..392744dede 100644
--- a/keyboards/aleblazer/zodiark/readme.md
+++ b/keyboards/aleblazer/zodiark/readme.md
@@ -10,11 +10,11 @@ A split keyboard with 5x7 including a thumbcluster, encoders on each side, per k
 
 Make example for this keyboard (after setting up your build environment):
 
-    make zodiark:default
+    make aleblazer/zodiark:default
 
 Flashing example for this keyboard:
 
-    make zodiark:default:flash
+    make aleblazer/zodiark:default:flash
 
 Remove TRRS cable from halves, plug into one side, press reset button when asked. Repeat process on the other side.