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

1 files changed, 42 insertions, 229 deletions

diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json
index 75e0c6258e..4c4969d1fc 100644
--- a/keyboards/takashicompany/minizone/info.json
+++ b/keyboards/takashicompany/minizone/info.json
@@ -5,235 +5,48 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 1.68,
-                    "y": 0,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 7.56,
-                    "y": 0,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 0.84,
-                    "y": 0.21,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 2.52,
-                    "y": 0.21,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 6.72,
-                    "y": 0.21,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 8.4,
-                    "y": 0.21,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 0,
-                    "y": 0.42,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 3.36,
-                    "y": 0.42,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 5.88,
-                    "y": 0.42,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 9.24,
-                    "y": 0.42,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 1.68,
-                    "y": 0.84,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 7.56,
-                    "y": 0.84,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 0.84,
-                    "y": 1.05,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 2.52,
-                    "y": 1.05,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 6.72,
-                    "y": 1.05,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 8.4,
-                    "y": 1.05,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 0,
-                    "y": 1.26,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 3.36,
-                    "y": 1.26,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 5.88,
-                    "y": 1.26,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 9.24,
-                    "y": 1.26,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 1.68,
-                    "y": 1.68,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 7.56,
-                    "y": 1.68,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 0.84,
-                    "y": 1.89,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 2.52,
-                    "y": 1.89,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 6.72,
-                    "y": 1.89,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 8.4,
-                    "y": 1.89,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 0,
-                    "y": 2.1,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 3.36,
-                    "y": 2.1,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 5.88,
-                    "y": 2.1,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 9.24,
-                    "y": 2.1,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 1.68,
-                    "y": 2.52,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 7.56,
-                    "y": 2.52,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 2.52,
-                    "y": 2.73,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 6.72,
-                    "y": 2.73,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 3.36,
-                    "y": 2.94,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 4.2,
-                    "y": 2.94,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 5.04,
-                    "y": 2.94,
-                    "w": 0.84,
-                    "h": 0.84
-                },
-                {
-                    "x": 5.88,
-                    "y": 2.94,
-                    "w": 0.84,
-                    "h": 0.84
-                }
+                { "x": 0, "y": 0.42, "w": 0.84, "h": 0.84 },
+                { "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84 },
+                { "x": 1.68, "y": 0, "w": 0.84, "h": 0.84 },
+                { "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84 },
+                { "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84 },
+                { "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84 },
+                { "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84 },
+                { "x": 7.56, "y": 0, "w": 0.84, "h": 0.84 },
+                { "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84 },
+                { "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84 },
+
+                { "x": 0, "y": 1.26, "w": 0.84, "h": 0.84 },
+                { "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84 },
+                { "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84 },
+                { "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84 },
+                { "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84 },
+                { "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84 },
+                { "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84 },
+                { "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84 },
+                { "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84 },
+                { "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84 },
+
+                { "x": 0, "y": 2.1, "w": 0.84, "h": 0.84 },
+                { "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84 },
+                { "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84 },
+                { "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84 },
+                { "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84 },
+                { "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84 },
+                { "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84 },
+                { "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84 },
+                { "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84 },
+                { "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84 },
+
+                { "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84 },
+                { "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84 },
+                { "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84 },
+                { "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84 },
+                { "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84 },
+                { "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84 },
+                { "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84 },
+                { "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84 }
             ]
         }
     }
-}
\ No newline at end of file
+}