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

keyboards/handwired/hillside/46/info.json

@@ -44,62 +44,62 @@
         "LAYOUT": {
             "layout": [
 
-                {"label": "`~", "x": 0.8, "y": 1.13},
-                {"label": "Q", "x": 1.8, "y": 0.93},
-                {"label": "W", "x": 2.9, "y": 0.31},
-                {"label": "E", "x": 4, "y": 0},
-                {"label": "R", "x": 5, "y": 0.28},
-                {"label": "T", "x": 6, "y": 0.42},
-
-                {"label": "Y", "x": 10.5, "y": 0.42},
-                {"label": "U", "x": 11.5, "y": 0.28},
-                {"label": "I", "x": 12.5, "y": 0},
-                {"label": "O", "x": 13.6, "y": 0.31},
-                {"label": "P", "x": 14.7, "y": 0.93},
-                {"label": "Backspace", "x": 15.7, "y": 1.13},
-
-
-                {"label": "Tab", "x": 0.9, "y": 2.13},
-                {"label": "A", "x": 1.9, "y": 1.93},
-                {"label": "S", "x": 2.95, "y": 1.31},
-                {"label": "D", "x": 4, "y": 1},
-                {"label": "F", "x": 5, "y": 1.28},
-                {"label": "G", "x": 6, "y": 1.42},
-
-                {"label": "H", "x": 10.5, "y": 1.42},
-                {"label": "J", "x": 11.5, "y": 1.28},
-                {"label": "K", "x": 12.5, "y": 1},
-                {"label": "L", "x": 13.55, "y": 1.31},
-                {"label": ";", "x": 14.6, "y": 1.93},
-                {"label": "Enter", "x": 15.6, "y": 2.13},
-
-
-                {"label": "Ctrl", "x": 1, "y": 3.13},
-                {"label": "Z", "x": 2, "y": 2.93},
-                {"label": "X", "x": 3, "y": 2.31},
-                {"label": "C", "x": 4, "y": 2},
-                {"label": "V", "x": 5, "y": 2.28},
-                {"label": "B", "x": 6, "y": 2.42},
-                {"label": "ESC", "x": 7, "y": 2.88},
-
-                {"label": "CAP", "x": 9.5, "y": 2.88},
-                {"label": "N", "x": 10.5, "y": 2.42},
-                {"label": "M", "x": 11.5, "y": 2.28},
-                {"label": ",", "x": 12.5, "y": 2},
-                {"label": ".", "x": 13.5, "y": 2.31},
-                {"label": "/", "x": 14.5, "y": 2.93},
-                {"label": "'", "x": 15.5, "y": 3.13},
-
-
-                {"label": "Gui", "x": 4.5, "y": 3.28},
-                {"label": "Alt", "x": 5.5, "y": 3.42},
-                {"label": "Shift", "x": 6.5, "y": 3.88},
-                {"label": "Nav", "x": 7.5, "y": 4.44},
-
-                {"label": "Sym", "x": 9, "y": 4.44},
-                {"label": "Space", "x": 10, "y": 3.88},
-                {"label": "Alt", "x": 11, "y": 3.42},
-                {"label": "Gui", "x": 12, "y": 3.28},
+                {"label": "`~", "x": 0, "y": 1.13},
+                {"label": "Q", "x": 1, "y": 0.93},
+                {"label": "W", "x": 2.1, "y": 0.31},
+                {"label": "E", "x": 3.2, "y": 0},
+                {"label": "R", "x": 4.2, "y": 0.28},
+                {"label": "T", "x": 5.2, "y": 0.42},
+
+                {"label": "Y", "x": 9.7, "y": 0.42},
+                {"label": "U", "x": 10.7, "y": 0.28},
+                {"label": "I", "x": 11.7, "y": 0},
+                {"label": "O", "x": 12.8, "y": 0.31},
+                {"label": "P", "x": 13.9, "y": 0.93},
+                {"label": "Backspace", "x": 14.9, "y": 1.13},
+
+
+                {"label": "Tab", "x": 0.1, "y": 2.13},
+                {"label": "A", "x": 1.1, "y": 1.93},
+                {"label": "S", "x": 2.15, "y": 1.31},
+                {"label": "D", "x": 3.2, "y": 1},
+                {"label": "F", "x": 4.2, "y": 1.28},
+                {"label": "G", "x": 5.2, "y": 1.42},
+
+                {"label": "H", "x": 9.7, "y": 1.42},
+                {"label": "J", "x": 10.7, "y": 1.28},
+                {"label": "K", "x": 11.7, "y": 1},
+                {"label": "L", "x": 12.75, "y": 1.31},
+                {"label": ";", "x": 13.8, "y": 1.93},
+                {"label": "Enter", "x": 14.8, "y": 2.13},
+
+
+                {"label": "Ctrl", "x": 0.2, "y": 3.13},
+                {"label": "Z", "x": 1.2, "y": 2.93},
+                {"label": "X", "x": 2.2, "y": 2.31},
+                {"label": "C", "x": 3.2, "y": 2},
+                {"label": "V", "x": 4.2, "y": 2.28},
+                {"label": "B", "x": 5.2, "y": 2.42},
+                {"label": "ESC", "x": 6.2, "y": 2.88},
+
+                {"label": "CAP", "x": 8.7, "y": 2.88},
+                {"label": "N", "x": 9.7, "y": 2.42},
+                {"label": "M", "x": 10.7, "y": 2.28},
+                {"label": ",", "x": 11.7, "y": 2},
+                {"label": ".", "x": 12.7, "y": 2.31},
+                {"label": "/", "x": 13.7, "y": 2.93},
+                {"label": "'", "x": 14.7, "y": 3.13},
+
+
+                {"label": "Gui", "x": 3.7, "y": 3.28},
+                {"label": "Alt", "x": 4.7, "y": 3.42},
+                {"label": "Shift", "x": 5.7, "y": 3.88},
+                {"label": "Nav", "x": 6.7, "y": 4.44},
+
+                {"label": "Sym", "x": 8.2, "y": 4.44},
+                {"label": "Space", "x": 9.2, "y": 3.88},
+                {"label": "Alt", "x": 10.2, "y": 3.42},
+                {"label": "Gui", "x": 11.2, "y": 3.28}
             ]
         }
     }

keyboards/handwired/hillside/52/info.json

@@ -44,68 +44,68 @@
         "LAYOUT": {
             "layout": [
 
-                {"label": "`~", "x": 0.8, "y": 1.13},
-                {"label": "Q", "x": 1.8, "y": 0.93},
-                {"label": "W", "x": 2.9, "y": 0.31},
-                {"label": "E", "x": 4, "y": 0},
-                {"label": "R", "x": 5, "y": 0.28},
-                {"label": "T", "x": 6, "y": 0.42},
-
-                {"label": "Y", "x": 10.5, "y": 0.42},
-                {"label": "U", "x": 11.5, "y": 0.28},
-                {"label": "I", "x": 12.5, "y": 0},
-                {"label": "O", "x": 13.6, "y": 0.31},
-                {"label": "P", "x": 14.7, "y": 0.93},
-                {"label": "Backspace", "x": 15.7, "y": 1.13},
-
-
-                {"label": "Tab", "x": 0.9, "y": 2.13},
-                {"label": "A", "x": 1.9, "y": 1.93},
-                {"label": "S", "x": 2.95, "y": 1.31},
-                {"label": "D", "x": 4, "y": 1},
-                {"label": "F", "x": 5, "y": 1.28},
-                {"label": "G", "x": 6, "y": 1.42},
-
-                {"label": "H", "x": 10.5, "y": 1.42},
-                {"label": "J", "x": 11.5, "y": 1.28},
-                {"label": "K", "x": 12.5, "y": 1},
-                {"label": "L", "x": 13.55, "y": 1.31},
-                {"label": ";", "x": 14.6, "y": 1.93},
-                {"label": "Enter", "x": 15.6, "y": 2.13},
-
-
-                {"label": "Shift", "x": 1, "y": 3.13},
-                {"label": "Z", "x": 2, "y": 2.93},
-                {"label": "X", "x": 3, "y": 2.31},
-                {"label": "C", "x": 4, "y": 2},
-                {"label": "V", "x": 5, "y": 2.28},
-                {"label": "B", "x": 6, "y": 2.42},
-                {"label": "'", "x": 7, "y": 2.88},
-
-                {"label": "/", "x": 9.5, "y": 2.88},
-                {"label": "N", "x": 10.5, "y": 2.42},
-                {"label": "M", "x": 11.5, "y": 2.28},
-                {"label": ",", "x": 12.5, "y": 2},
-                {"label": ".", "x": 13.5, "y": 2.31},
-                {"label": "Up", "x": 14.5, "y": 2.93},
-                {"label": "Shift", "x": 15.5, "y": 3.13},
-
-
-                {"label": "Mute", "x": 1.1, "y": 4.13},
-                {"label": "Esc", "x": 2.1, "y": 3.93},
-                {"label": "Ctrl", "x": 3.1, "y": 3.73},
-                {"label": "Gui", "x": 4.5, "y": 3.28},
-                {"label": "Alt", "x": 5.5, "y": 3.42},
-                {"label": "Shift", "x": 6.5, "y": 3.88},
-                {"label": "Nav", "x": 7.5, "y": 4.44},
-
-                {"label": "Sym", "x": 9, "y": 4.44},
-                {"label": "Space", "x": 10, "y": 3.88},
-                {"label": "Alt", "x": 11, "y": 3.42},
-                {"label": "Gui", "x": 12, "y": 3.28},
-                {"label": "Left", "x": 13.4, "y": 3.73},
-                {"label": "Down", "x": 14.4, "y": 3.93},
-                {"label": "Right", "x": 15.4, "y": 4.13}
+                {"label": "`~", "x": 0, "y": 1.13},
+                {"label": "Q", "x": 1, "y": 0.93},
+                {"label": "W", "x": 2.1, "y": 0.31},
+                {"label": "E", "x": 3.2, "y": 0},
+                {"label": "R", "x": 4.2, "y": 0.28},
+                {"label": "T", "x": 5.2, "y": 0.42},
+
+                {"label": "Y", "x": 9.7, "y": 0.42},
+                {"label": "U", "x": 10.7, "y": 0.28},
+                {"label": "I", "x": 11.7, "y": 0},
+                {"label": "O", "x": 12.8, "y": 0.31},
+                {"label": "P", "x": 13.9, "y": 0.93},
+                {"label": "Backspace", "x": 14.9, "y": 1.13},
+
+
+                {"label": "Tab", "x": 0.1, "y": 2.13},
+                {"label": "A", "x": 1.1, "y": 1.93},
+                {"label": "S", "x": 2.15, "y": 1.31},
+                {"label": "D", "x": 3.2, "y": 1},
+                {"label": "F", "x": 4.2, "y": 1.28},
+                {"label": "G", "x": 5.2, "y": 1.42},
+
+                {"label": "H", "x": 9.7, "y": 1.42},
+                {"label": "J", "x": 10.7, "y": 1.28},
+                {"label": "K", "x": 11.7, "y": 1},
+                {"label": "L", "x": 12.75, "y": 1.31},
+                {"label": ";", "x": 13.8, "y": 1.93},
+                {"label": "Enter", "x": 14.8, "y": 2.13},
+
+
+                {"label": "Shift", "x": 0.2, "y": 3.13},
+                {"label": "Z", "x": 1.2, "y": 2.93},
+                {"label": "X", "x": 2.2, "y": 2.31},
+                {"label": "C", "x": 3.2, "y": 2},
+                {"label": "V", "x": 4.2, "y": 2.28},
+                {"label": "B", "x": 5.2, "y": 2.42},
+                {"label": "'", "x": 6.2, "y": 2.88},
+
+                {"label": "/", "x": 8.7, "y": 2.88},
+                {"label": "N", "x": 9.7, "y": 2.42},
+                {"label": "M", "x": 10.7, "y": 2.28},
+                {"label": ", ", "x": 11.7, "y": 2},
+                {"label": ".", "x": 12.7, "y": 2.31},
+                {"label": "Up", "x": 13.7, "y": 2.93},
+                {"label": "Shift", "x": 14.7, "y": 3.13},
+
+
+                {"label": "Mute", "x": 0.3, "y": 4.13},
+                {"label": "Esc", "x": 1.3, "y": 3.93},
+                {"label": "Ctrl", "x": 2.3, "y": 3.73},
+                {"label": "Gui", "x": 3.7, "y": 3.28},
+                {"label": "Alt", "x": 4.7, "y": 3.42},
+                {"label": "Shift", "x": 5.7, "y": 3.88},
+                {"label": "Nav", "x": 6.7, "y": 4.44},
+
+                {"label": "Sym", "x": 8.2, "y": 4.44},
+                {"label": "Space", "x": 9.2, "y": 3.88},
+                {"label": "Alt", "x": 10.2, "y": 3.42},
+                {"label": "Gui", "x": 11.2, "y": 3.28},
+                {"label": "Left", "x": 12.6, "y": 3.73},
+                {"label": "Down", "x": 13.6, "y": 3.93},
+                {"label": "Right", "x": 14.6, "y": 4.13}
             ]
         }
     }