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

keyboards/handwired/sono1/info.json

@@ -22,8 +22,7 @@
                 {"label":"PgUp", "x":16, "y":0},
                 {"label":"PgDn", "x":17, "y":0},
                 {"label":"LOCK", "x":18.5, "y":0.5},
-                {"label":"Home", "x":16, "y":1},
-                {"label":"End", "x":17, "y":1},
+
                 {"label":"Esc", "x":0, "y":1.5, "w":1.25},
                 {"label":"!", "x":1.25, "y":1.5},
                 {"label":"@", "x":2.25, "y":1.5},
@@ -39,12 +38,13 @@
                 {"label":"+", "x":12.25, "y":1.5},
                 {"label":"~", "x":13.25, "y":1.5},
                 {"label":"BksSpc", "x":14.25, "y":1.5, "w":1.25},
+                {"label":"Home", "x":16, "y":1},
+                {"label":"End", "x":17, "y":1},
                 {"label":"/", "x":18.5, "y":1.5},
                 {"label":"*", "x":19.5, "y":1.5},
                 {"label":"-", "x":20.5, "y":1.5},
                 {"label":"+", "x":21.5, "y":1.5},
-                {"label":"Ins", "x":16, "y":2},
-                {"label":"Del", "x":17, "y":2},
+
                 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.5},
                 {"label":"W", "x":2.5, "y":2.5},
@@ -59,10 +59,13 @@
                 {"label":"{", "x":11.5, "y":2.5},
                 {"label":"}", "x":12.5, "y":2.5},
                 {"label":"Enter", "x":13.75, "y":2.5, "w":1.75, "h":2},
+                {"label":"Ins", "x":16, "y":2},
+                {"label":"Del", "x":17, "y":2},
                 {"label":"7", "x":18.5, "y":2.5},
                 {"label":"8", "x":19.5, "y":2.5},
                 {"label":"9", "x":20.5, "y":2.5},
                 {"label":"+=", "x":21.5, "y":2.5},
+
                 {"label":"Ctrl", "x":0, "y":3.5, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.5},
                 {"label":"S", "x":2.75, "y":3.5},
@@ -81,6 +84,7 @@
                 {"label":"5", "x":19.5, "y":3.5},
                 {"label":"6", "x":20.5, "y":3.5},
                 {"label":".", "x":21.5, "y":3.5},
+
                 {"label":"Shift", "x":0, "y":4.5, "w":2.5},
                 {"label":"Z", "x":2.5, "y":4.5},
                 {"label":"X", "x":3.5, "y":4.5},
@@ -100,6 +104,7 @@
                 {"label":"2", "x":19.5, "y":4.5},
                 {"label":"3", "x":20.5, "y":4.5},
                 {"label":"<", "x":21.5, "y":4.5},
+
                 {"label":"Caps", "x":0, "y":5.5},
                 {"label":"Alt", "x":1, "y":5.5},
                 {"label":"App", "x":2, "y":5.5, "w":1.25},
@@ -114,7 +119,8 @@
                 {"label":"000", "x":19.5, "y":5.5},
                 {"label":"Enter", "x":20.5, "y":5.5, "w":2},
                 {"label":"Fn", "x":5.75, "y":6.5, "w":1.25},
-                {"label":"BkSpc", "x":7, "y":6.5, "w":1.25}]
+                {"label":"BkSpc", "x":7, "y":6.5, "w":1.25}
+            ]
         }
     }
 }