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

1 files changed, 54 insertions, 6 deletions

diff --git a/keyboards/ristretto/info.json b/keyboards/ristretto/info.json
index 86a0172c1b..3ede995a51 100644
--- a/keyboards/ristretto/info.json
+++ b/keyboards/ristretto/info.json
@@ -2,16 +2,64 @@
     "keyboard_name": "ristretto",
     "url": "https://www.fruitykeeb.xyz/product/ristretto",
     "maintainer": "Fruit",
-    "width": 13,
+    "width": 15,
     "height": 4,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}                                  , {"label":"Y", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0}, {"label":"BKSP", "x":12, "y":0},
-                {"label":"TAB", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}                                  , {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":";", "x":11, "y":1}, {"label":"'",    "x":12, "y":2},
-                {"label":"LSFT", "x":0, "y":2},{"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}                                  , {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":"<", "x":9, "y":2}, {"label":">", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"ENTR", "x":12, "y":2},
-                {"label":"LCTL", "x":0, "y":3},{"label":"LGUI","x":1,"y":3},{"label":"LALT","x":2,"y":3},{"label":"" , "x":3, "y":3}, {"label":"" , "x":4, "y":3}, {"label":"" , "x":5, "y":3}, {"label":"Rotary", "x":6, "y":3}, {"label":"" , "x":7, "y":3}, {"label":"" , "x":8, "y":3}, {"label":"" , "x":9, "y":3}, {"label":"RALT","x":10,"y":3},{"label":"RGUI","x":11,"y":3}, {"label":"RCTL","x":12, "y":3}
+                {"label":"ESC", "x":0, "y":0.25},
+                {"label":"Q", "x":1, "y":0.25},
+                {"label":"W", "x":2, "y":0.25},
+                {"label":"E", "x":3, "y":0},
+                {"label":"R", "x":4, "y":0.25},
+                {"label":"T", "x":5, "y":0.25},
+                {"label":"Y", "x":9, "y":0.25},
+                {"label":"U", "x":10, "y":0.25},
+                {"label":"I", "x":11, "y":0},
+                {"label":"O", "x":12, "y":0.25},
+                {"label":"P", "x":13, "y":0.25},
+                {"label":"BKSP", "x":14, "y":0.25},
+
+                {"label":"TAB", "x":0, "y":1.25},
+                {"label":"A", "x":1, "y":1.25},
+                {"label":"S", "x":2, "y":1.25},
+                {"label":"D", "x":3, "y":1},
+                {"label":"F", "x":4, "y":1.25},
+                {"label":"G", "x":5, "y":1.25},
+                {"label":"H", "x":9, "y":1.25},
+                {"label":"J", "x":10, "y":1.25},
+                {"label":"K", "x":11, "y":1},
+                {"label":"L", "x":12, "y":1.25},
+                {"label":";", "x":13, "y":1.25},
+                {"label":"'", "x":14, "y":1.25},
+
+                {"label":"LSFT", "x":0, "y":2.25},
+                {"label":"Z", "x":1, "y":2.25},
+                {"label":"X", "x":2, "y":2.25},
+                {"label":"C", "x":3, "y":2},
+                {"label":"V", "x":4, "y":2.25},
+                {"label":"B", "x":5, "y":2.25},
+                {"label":"N", "x":9, "y":2.25},
+                {"label":"M", "x":10, "y":2.25},
+                {"label":"<", "x":11, "y":2},
+                {"label":">", "x":12, "y":2.25},
+                {"label":"?", "x":13, "y":2.25},
+                {"label":"ENTR", "x":14, "y":2.25},
+
+                {"label":"LCTL", "x":0, "y":3.25},
+                {"label":"LGUI", "x":1, "y":3.25},
+                {"label":"LALT", "x":2, "y":3.25},
+                {"label":"LOWER", "x":3, "y":3, "h":1.25},
+                {"label":"Enter", "x":4, "y":3.25},
+                {"label":"SPACE", "x":5, "y":3.25, "w":1.5},
+                {"label":"Rotary", "x":7, "y":3.25},
+                {"label":"SPACE", "x":8.5, "y":3.25, "w":1.5},
+                {"label":"SHIFT", "x":10, "y":3.25},
+                {"label":"RAISE", "x":11, "y":3, "h":1.25},
+                {"label":"RALT", "x":12, "y":3.25},
+                {"label":"RGUI", "x":13, "y":3.25},
+                {"label":"RCTL", "x":14, "y":3.25}
             ]
         }
     }
-}
\ No newline at end of file
+}