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

Resolved Conflicts:
	keyboards/checkerboards/nop60/info.json

1 files changed, 91 insertions, 79 deletions

diff --git a/keyboards/ergoarrows/info.json b/keyboards/ergoarrows/info.json
index fca43fcd2d..c95dd56d2b 100644
--- a/keyboards/ergoarrows/info.json
+++ b/keyboards/ergoarrows/info.json
@@ -2,87 +2,99 @@
     "keyboard_name": "ergoarrows", 
     "url": "https://salicylic-acid3.hatenablog.com/", 
     "maintainer": "Salicylic_acid3", 
-    "width": 16.25, 
-    "height": 6.51, 
+    "width": 15.8,
+    "height": 6.5,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0.38},
-                {"label":"1", "x":1.5, "y":0.375},
-                {"label":"2", "x":2.5, "y":0.125},
-                {"label":"3", "x":3.5, "y":0},
-                {"label":"4", "x":4.5, "y":0.125},
-                {"label":"5", "x":5.5, "y":0.25},
-                {"label":"6", "x":6.5, "y":0.5},
-                {"label":"5", "x":9.25, "y":0.5},
-                {"label":"6", "x":10.25, "y":0.25},
-                {"label":"7", "x":11.25, "y":0.13},
-                {"label":"8", "x":12.25, "y":0},
-                {"label":"9", "x":13.25, "y":0.13},
-                {"label":"0", "x":14.25, "y":0.38},
-                {"label":"PrtScr", "x":15.25, "y":0.38},
-                {"label":"Tab", "x":0.5, "y":1.38},
-                {"label":"Q", "x":1.5, "y":1.375},
-                {"label":"W", "x":2.5, "y":1.125},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1.125},
-                {"label":"T", "x":5.5, "y":1.25},
-                {"label":"Y", "x":6.5, "y":1.5},
-                {"label":"T", "x":9.25, "y":1.5},
-                {"label":"Y", "x":10.25, "y":1.25},
-                {"label":"U", "x":11.25, "y":1.13},
-                {"label":"I", "x":12.25, "y":1},
-                {"label":"O", "x":13.25, "y":1.13},
-                {"label":"P", "x":14.25, "y":1.38},
-                {"label":"[", "x":15.25, "y":1.38},
-                {"label":"Caps", "x":0.5, "y":2.38},
-                {"label":"A", "x":1.5, "y":2.375},
-                {"label":"S", "x":2.5, "y":2.125},
-                {"label":"D", "x":3.5, "y":2},
-                {"label":"F", "x":4.5, "y":2.125},
-                {"label":"G", "x":5.5, "y":2.25},
-                {"label":"H", "x":6.5, "y":2.5},
-                {"label":"G", "x":9.25, "y":2.5},
-                {"label":"H", "x":10.25, "y":2.25},
-                {"label":"J", "x":11.25, "y":2.13},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2.13},
-                {"label":":", "x":14.25, "y":2.38},
-                {"label":"Ent", "x":15.25, "y":2.38},
-                {"label":"Shift", "x":0.5, "y":3.38},
-                {"label":"Z", "x":1.5, "y":3.375},
-                {"label":"X", "x":2.5, "y":3.125},
-                {"label":"C", "x":3.5, "y":3},
-                {"label":"V", "x":4.5, "y":3.125},
-                {"label":"B", "x":5.5, "y":3.25},
-                {"label":"N", "x":6.5, "y":3.5},
-                {"label":"B", "x":9.25, "y":3.5},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.13},
-                {"label":"<", "x":12.25, "y":3},
-                {"label":">", "x":13.25, "y":3.13},
-                {"label":"?", "x":14.25, "y":3.38},
-                {"label":"_", "x":15.25, "y":3.38},
-                {"label":"Ctrl", "x":0.5, "y":4.38},
-                {"label":"Win", "x":1.5, "y":4.38},
-                {"label":"&uarr;", "x":2.63, "y":4.51},
-                {"label":"Alt", "x":3.75, "y":4.38},
-                {"label":"Ent", "x":4.75, "y":4.38},
-                {"label":"BS", "x":5.85, "y":4.6},
-                {"label":"Del", "x":6.9, "y":5.15},
-                {"label":"BS", "x":8.85, "y":5.15},
-                {"label":"Del", "x":9.9, "y":4.6},
-                {"label":"Spc", "x":11, "y":4.38},
-                {"label":"Alt", "x":12, "y":4.38},
-                {"label":"&uarr;", "x":13.13, "y":4.51},
-                {"label":"Alt", "x":14.25, "y":4.38},
-                {"label":"App", "x":15.25, "y":4.38},
-                {"label":"&larr;", "x":1.63, "y":5.51},
-                {"label":"&dArr;", "x":2.63, "y":5.51},
-                {"label":"&rarr;", "x":3.625, "y":5.51},
-                {"label":"&larr;", "x":12.13, "y":5.51},
-                {"label":"&dArr;", "x":13.13, "y":5.51},
-                {"label":"&rarr;", "x":14.13, "y":5.51}]
+                {"label":"Esc", "x":0, "y":0.375},
+                {"label":"1", "x":1, "y":0.375},
+                {"label":"2", "x":2, "y":0.125},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0.125},
+                {"label":"5", "x":5, "y":0.25},
+                {"label":"6", "x":6, "y":0.5},
+
+                {"label":"5", "x":8.8, "y":0.5},
+                {"label":"6", "x":9.8, "y":0.25},
+                {"label":"7", "x":10.8, "y":0.125},
+                {"label":"8", "x":11.8, "y":0},
+                {"label":"9", "x":12.8, "y":0.125},
+                {"label":"0", "x":13.8, "y":0.375},
+                {"label":"PrtScr", "x":14.8, "y":0.375},
+
+                {"label":"Tab", "x":0, "y":1.375},
+                {"label":"Q", "x":1, "y":1.375},
+                {"label":"W", "x":2, "y":1.125},
+                {"label":"E", "x":3, "y":1},
+                {"label":"R", "x":4, "y":1.125},
+                {"label":"T", "x":5, "y":1.25},
+                {"label":"Y", "x":6, "y":1.5},
+
+                {"label":"T", "x":8.8, "y":1.5},
+                {"label":"Y", "x":9.8, "y":1.25},
+                {"label":"U", "x":10.8, "y":1.125},
+                {"label":"I", "x":11.8, "y":1},
+                {"label":"O", "x":12.8, "y":1.125},
+                {"label":"P", "x":13.8, "y":1.375},
+                {"label":"[", "x":14.8, "y":1.375},
+
+                {"label":"Caps", "x":0, "y":2.375},
+                {"label":"A", "x":1, "y":2.375},
+                {"label":"S", "x":2, "y":2.125},
+                {"label":"D", "x":3, "y":2},
+                {"label":"F", "x":4, "y":2.125},
+                {"label":"G", "x":5, "y":2.25},
+                {"label":"H", "x":6, "y":2.5},
+
+                {"label":"G", "x":8.8, "y":2.5},
+                {"label":"H", "x":9.8, "y":2.25},
+                {"label":"J", "x":10.8, "y":2.125},
+                {"label":"K", "x":11.8, "y":2},
+                {"label":"L", "x":12.8, "y":2.125},
+                {"label":":", "x":13.8, "y":2.375},
+                {"label":"Ent", "x":14.8, "y":2.375},
+
+                {"label":"Shift", "x":0, "y":3.375},
+                {"label":"Z", "x":1, "y":3.375},
+                {"label":"X", "x":2, "y":3.125},
+                {"label":"C", "x":3, "y":3},
+                {"label":"V", "x":4, "y":3.125},
+                {"label":"B", "x":5, "y":3.25},
+                {"label":"N", "x":6, "y":3.5},
+
+                {"label":"B", "x":8.8, "y":3.5},
+                {"label":"N", "x":9.8, "y":3.25},
+                {"label":"M", "x":10.8, "y":3.125},
+                {"label":"<", "x":11.8, "y":3},
+                {"label":">", "x":12.8, "y":3.125},
+                {"label":"?", "x":13.8, "y":3.375},
+                {"label":"_", "x":14.8, "y":3.375},
+
+                {"label":"Ctrl", "x":0, "y":4.375},
+                {"label":"Win", "x":1, "y":4.375},
+                {"label":"&uarr;", "x":2.125, "y":4.5},
+                {"label":"Alt", "x":3.25, "y":4.375},
+                {"label":"Ent", "x":4.25, "y":4.375},
+                {"label":"BS", "x":5.35, "y":4.625},
+                {"label":"Del", "x":6.4, "y":5.125},
+
+                {"label":"BS", "x":8.4, "y":5.125},
+                {"label":"Del", "x":9.45, "y":4.625},
+                {"label":"Spc", "x":10.55, "y":4.375},
+                {"label":"Alt", "x":11.55, "y":4.375},
+                {"label":"&uarr;", "x":12.675, "y":4.5},
+                {"label":"Alt", "x":13.8, "y":4.375},
+                {"label":"App", "x":14.8, "y":4.375},
+
+                {"label":"&larr;", "x":1.125, "y":5.5},
+                {"label":"&dArr;", "x":2.125, "y":5.5},
+                {"label":"&rarr;", "x":3.125, "y":5.5},
+
+                {"label":"&larr;", "x":11.675, "y":5.5},
+                {"label":"&dArr;", "x":12.675, "y":5.5},
+                {"label":"&rarr;", "x":13.675, "y":5.5}
+            ]
         }
     }
-}
\ No newline at end of file
+}