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

1 files changed, 84 insertions, 80 deletions

diff --git a/keyboards/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/info.json
index d2f66f1f69..25674510e7 100644
--- a/keyboards/sendyyeah/bevi/info.json
+++ b/keyboards/sendyyeah/bevi/info.json
@@ -7,86 +7,90 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "Num", "x": 0, "y": 0},
-                {"label": "/", "x": 1, "y": 0},
-                {"label": "*", "x": 2, "y": 0},
-                {"label": "-", "x": 3, "y": 0},
-                {"label": "`", "x": 4, "y": 0},
-                {"label": "1", "x": 5, "y": 0},
-                {"label": "2", "x": 6, "y": 0},
-                {"label": "3", "x": 7, "y": 0},
-                {"label": "4", "x": 8, "y": 0},
-                {"label": "5", "x": 9, "y": 0},
-                {"label": "6", "x": 10, "y": 0},
-                {"label": "7", "x": 11, "y": 0},
-                {"label": "8", "x": 12, "y": 0},
-                {"label": "9", "x": 13, "y": 0},
-                {"label": "0", "x": 14, "y": 0},
-                {"label": "-", "x": 15, "y": 0},
-                {"label": "=", "x": 16, "y": 0},
-                {"label": "Bksp", "x": 17, "y": 0},
-                {"x": 17, "y": 0},
-                {"label": "+", "x": 0, "y": 1, "h": 2},
-                {"label": "7", "x": 1, "y": 1},
-                {"label": "8", "x": 2, "y": 1},
-                {"label": "9", "x": 3, "y": 1},
-                {"label": "Tab", "x": 4, "y": 1, "w": 1.5},
-                {"label": "Q", "x": 5, "y": 1},
-                {"label": "W", "x": 6, "y": 1},
-                {"label": "E", "x": 7, "y": 1},
-                {"label": "R", "x": 8, "y": 1},
-                {"label": "T", "x": 9, "y": 1},
-                {"label": "Y", "x": 10, "y": 1},
-                {"label": "U", "x": 11, "y": 1},
-                {"label": "I", "x": 12, "y": 1},
-                {"label": "O", "x": 13, "y": 1},
-                {"label": "P", "x": 14, "y": 1},
-                {"label": "[", "x": 15, "y": 1},
-                {"label": "]", "x": 16, "y": 1},
-                {"label": "\\", "x": 17, "y": 1, "w": 1.5},
-                {"label": "4", "x": 0, "y": 2},
-                {"label": "5", "x": 1, "y": 2},
-                {"label": "6", "x": 2, "y": 2},
-                {"label": "Caps", "x": 3, "y": 2, "w": 1.75},
-                {"label": "A", "x": 4, "y": 2},
-                {"label": "S", "x": 5, "y": 2},
-                {"label": "D", "x": 6, "y": 2},
-                {"label": "F", "x": 7, "y": 2},
-                {"label": "G", "x": 8, "y": 2},
-                {"label": "H", "x": 9, "y": 2},
-                {"label": "J", "x": 10, "y": 2},
-                {"label": "K", "x": 11, "y": 2},
-                {"label": "L", "x": 12, "y": 2},
-                {"label": ";", "x": 13, "y": 2},
-                {"label": "'", "x": 14, "y": 2},
-                {"label": "Enter", "x": 15, "y": 2, "w": 2.25},
-                {"label": "Enter", "x": 0, "y": 3, "h": 2},
-                {"label": "1", "x": 1, "y": 3},
-                {"label": "2", "x": 2, "y": 3},
-                {"label": "3", "x": 3, "y": 3},
-                {"label": "Shift", "x": 4, "y": 3, "w": 2.25},
-                {"label": "Z", "x": 5, "y": 3},
-                {"label": "X", "x": 6, "y": 3},
-                {"label": "C", "x": 7, "y": 3},
-                {"label": "V", "x": 8, "y": 3},
-                {"label": "B", "x": 9, "y": 3},
-                {"label": "N", "x": 10, "y": 3},
-                {"label": "M", "x": 11, "y": 3},
-                {"label": ",", "x": 12, "y": 3},
-                {"label": ".", "x": 13, "y": 3},
-                {"label": "/", "x": 14, "y": 3},
-                {"label": "Shift", "x": 15, "y": 3, "w": 2.75},
-                {"label": ".", "x": 0, "y": 4},
-                {"label": "00", "x": 1, "y": 4},
-                {"label": "0", "x": 2, "y": 4},
-                {"label": "Ctrl", "x": 3, "y": 4, "w": 1.25},
-                {"label": "Win", "x": 4, "y": 4, "w": 1.25},
-                {"label": "Alt", "x": 5, "y": 4, "w": 1.25},
-                {"label": "Space", "x": 6, "y": 4, "w": 6.25},
-                {"label": "Alt", "x": 7, "y": 4, "w": 1.25},
-                {"label": "Win", "x": 8, "y": 4, "w": 1.25},
-                {"label": "Fn", "x": 9, "y": 4, "w": 1.25},
-                {"label": "Ctrl", "x": 10, "y": 4, "w": 1.25}
+                {"label":"Num", "x":0, "y":0},
+                {"label":"/", "x":1, "y":0},
+                {"label":"*", "x":2, "y":0},
+                {"label":"-", "x":3, "y":0},
+                {"label":"`", "x":4, "y":0},
+                {"label":"1", "x":5, "y":0},
+                {"label":"2", "x":6, "y":0},
+                {"label":"3", "x":7, "y":0},
+                {"label":"4", "x":8, "y":0},
+                {"label":"5", "x":9, "y":0},
+                {"label":"6", "x":10, "y":0},
+                {"label":"7", "x":11, "y":0},
+                {"label":"8", "x":12, "y":0},
+                {"label":"9", "x":13, "y":0},
+                {"label":"0", "x":14, "y":0},
+                {"label":"-", "x":15, "y":0},
+                {"label":"=", "x":16, "y":0},
+                {"label":"Bksp", "x":17, "y":0},
+                {"x":18, "y":0},
+
+                {"label":"+", "x":0, "y":1, "h":2},
+                {"label":"7", "x":1, "y":1},
+                {"label":"8", "x":2, "y":1},
+                {"label":"9", "x":3, "y":1},
+                {"label":"Tab", "x":4, "y":1, "w":1.5},
+                {"label":"Q", "x":5.5, "y":1},
+                {"label":"W", "x":6.5, "y":1},
+                {"label":"E", "x":7.5, "y":1},
+                {"label":"R", "x":8.5, "y":1},
+                {"label":"T", "x":9.5, "y":1},
+                {"label":"Y", "x":10.5, "y":1},
+                {"label":"U", "x":11.5, "y":1},
+                {"label":"I", "x":12.5, "y":1},
+                {"label":"O", "x":13.5, "y":1},
+                {"label":"P", "x":14.5, "y":1},
+                {"label":"[", "x":15.5, "y":1},
+                {"label":"]", "x":16.5, "y":1},
+                {"label":"\\", "x":17.5, "y":1, "w":1.5},
+
+                {"label":"4", "x":1, "y":2},
+                {"label":"5", "x":2, "y":2},
+                {"label":"6", "x":3, "y":2},
+                {"label":"Caps", "x":4, "y":2, "w":1.75},
+                {"label":"A", "x": 5.75, "y":2},
+                {"label":"S", "x": 6.75, "y":2},
+                {"label":"D", "x": 7.75, "y":2},
+                {"label":"F", "x": 8.75, "y":2},
+                {"label":"G", "x": 9.75, "y":2},
+                {"label":"H", "x": 10.75, "y":2},
+                {"label":"J", "x": 11.75, "y":2},
+                {"label":"K", "x": 12.75, "y":2},
+                {"label":"L", "x": 13.75, "y":2},
+                {"label":";", "x": 14.75, "y":2},
+                {"label":"'", "x": 15.75, "y":2},
+                {"label":"Enter", "x": 16.75, "y":2, "w":2.25},
+
+                {"label":"Enter", "x":0, "y":3, "h":2},
+                {"label":"1", "x":1, "y":3},
+                {"label":"2", "x":2, "y":3},
+                {"label":"3", "x":3, "y":3},
+                {"label":"Shift", "x":4, "y":3, "w":2.25},
+                {"label":"Z", "x": 6.25, "y":3},
+                {"label":"X", "x": 7.25, "y":3},
+                {"label":"C", "x": 8.25, "y":3},
+                {"label":"V", "x": 9.25, "y":3},
+                {"label":"B", "x": 10.25, "y":3},
+                {"label":"N", "x": 11.25, "y":3},
+                {"label":"M", "x": 12.25, "y":3},
+                {"label":",", "x": 13.25, "y":3},
+                {"label":".", "x": 14.25, "y":3},
+                {"label":"/", "x": 15.25, "y":3},
+                {"label":"Shift", "x": 16.25, "y":3, "w":2.75},
+
+                {"label":".", "x":1, "y":4},
+                {"label":"00", "x":2, "y":4},
+                {"label":"0", "x":3, "y":4},
+                {"label":"Ctrl", "x":4, "y":4, "w":1.25},
+                {"label":"Win", "x":5.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":6.5, "y":4, "w":1.25},
+                {"label":"Space", "x":7.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":14, "y":4, "w":1.25},
+                {"label":"Win", "x":15.25, "y":4, "w":1.25},
+                {"label":"Fn", "x":16.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":17.75, "y":4, "w":1.25}
             ]
         }
     }