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

1 files changed, 98 insertions, 91 deletions

diff --git a/keyboards/pistachio_pro/info.json b/keyboards/pistachio_pro/info.json
index 81035fe798..3973ef7774 100644
--- a/keyboards/pistachio_pro/info.json
+++ b/keyboards/pistachio_pro/info.json
@@ -6,96 +6,103 @@
     "height": 6.5,
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0},
-                       {"label":"F1", "x":2, "y":0},
-                       {"label":"F2", "x":3, "y":0},
-                       {"label":"F3", "x":4, "y":0},
-                       {"label":"F4", "x":5, "y":0},
-                       {"label":"F5", "x":6.5, "y":0},
-                       {"label":"F6", "x":7.5, "y":0},
-                       {"label":"F7", "x":8.5, "y":0},
-                       {"label":"F8", "x":9.5, "y":0},
-                       {"label":"F9", "x":11, "y":0},
-                       {"label":"F10", "x":12, "y":0},
-                       {"label":"F11", "x":13, "y":0},
-                       {"label":"F12", "x":14, "y":0},
-                       {"label":"Pause", "x":17.25, "y":0},
-                       {"label":"E/J", "x":0, "y":1.5},
-                       {"label":"!", "x":1, "y":1.5},
-                       {"label":"\"", "x":2, "y":1.5},
-                       {"label":"#", "x":3, "y":1.5},
-                       {"label":"$", "x":4, "y":1.5},
-                       {"label":"%", "x":5, "y":1.5},
-                       {"label":"&", "x":6, "y":1.5},
-                       {"label":"'", "x":7, "y":1.5},
-                       {"label":"(", "x":8, "y":1.5},
-                       {"label":")", "x":9, "y":1.5},
-                       {"label":"", "x":10, "y":1.5},
-                       {"label":"=", "x":11, "y":1.5},
-                       {"label":"~", "x":12, "y":1.5},
-                       {"label":"|", "x":13, "y":1.5},
-                       {"label":"BS", "x":14, "y":1.5},
-                       {"label":"Insert", "x":15.25, "y":1.5},
-                       {"label":"Home", "x":16.25, "y":1.5},
-                       {"label":"PgUp", "x":17.25, "y":1.5},
-                       {"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},
-                       {"label":"E", "x":3.5, "y":2.5},
-                       {"label":"R", "x":4.5, "y":2.5},
-                       {"label":"T", "x":5.5, "y":2.5},
-                       {"label":"Y", "x":6.5, "y":2.5},
-                       {"label":"U", "x":7.5, "y":2.5},
-                       {"label":"I", "x":8.5, "y":2.5},
-                       {"label":"O", "x":9.5, "y":2.5},
-                       {"label":"P", "x":10.5, "y":2.5},
-                       {"label":"`", "x":11.5, "y":2.5},
-                       {"label":"{", "x":12.5, "y":2.5},
-                       {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                       {"label":"Delete", "x":15.25, "y":2.5},
-                       {"label":"End", "x":16.25, "y":2.5},
-                       {"label":"PgDn", "x":17.25, "y":2.5},
-                       {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                       {"label":"A", "x":1.75, "y":3.5},
-                       {"label":"S", "x":2.75, "y":3.5},
-                       {"label":"D", "x":3.75, "y":3.5},
-                       {"label":"F", "x":4.75, "y":3.5},
-                       {"label":"G", "x":5.75, "y":3.5},
-                       {"label":"H", "x":6.75, "y":3.5},
-                       {"label":"J", "x":7.75, "y":3.5},
-                       {"label":"K", "x":8.75, "y":3.5},
-                       {"label":"L", "x":9.75, "y":3.5},
-                       {"label":"+", "x":10.75, "y":3.5},
-                       {"label":"*", "x":11.75, "y":3.5},
-                       {"label":"}", "x":12.75, "y":3.5},
-                       {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                       {"label":"Z", "x":2.25, "y":4.5},
-                       {"label":"X", "x":3.25, "y":4.5},
-                       {"label":"C", "x":4.25, "y":4.5},
-                       {"label":"V", "x":5.25, "y":4.5},
-                       {"label":"B", "x":6.25, "y":4.5},
-                       {"label":"N", "x":7.25, "y":4.5},
-                       {"label":"M", "x":8.25, "y":4.5},
-                       {"label":"<", "x":9.25, "y":4.5},
-                       {"label":">", "x":10.25, "y":4.5},
-                       {"label":"?", "x":11.25, "y":4.5},
-                       {"label":"_", "x":12.25, "y":4.5},
-                       {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
-                       {"label":"\u2191", "x":16.25, "y":4.5},
-                       {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                       {"label":"Win", "x":1.25, "y":5.5},
-                       {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
-                       {"x":3.5, "y":5.5},
-                       {"x":4.5, "y":5.5, "w":2.25},
-                       {"x":6.75, "y":5.5, "w":2.25},
-                       {"label":"kana", "x":9, "y":5.5, "w":1.25},
-                       {"x":10.25, "y":5.5, "w":1.25},
-                       {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
-                       {"label":"Menu", "x":12.75, "y":5.5},
-                       {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                       {"label":"\u2190", "x":15.25, "y":5.5},
-                       {"label":"\u2193", "x":16.25, "y":5.5},
-                       {"label":"\u2192", "x":17.25, "y":5.5}]
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"E/J", "x":0, "y":1.5},
+                {"label":"!", "x":1, "y":1.5},
+                {"label":"\"", "x":2, "y":1.5},
+                {"label":"#", "x":3, "y":1.5},
+                {"label":"$", "x":4, "y":1.5},
+                {"label":"%", "x":5, "y":1.5},
+                {"label":"&", "x":6, "y":1.5},
+                {"label":"'", "x":7, "y":1.5},
+                {"label":"(", "x":8, "y":1.5},
+                {"label":")", "x":9, "y":1.5},
+                {"label":"", "x":10, "y":1.5},
+                {"label":"=", "x":11, "y":1.5},
+                {"label":"~", "x":12, "y":1.5},
+                {"label":"|", "x":13, "y":1.5},
+                {"label":"BS", "x":14, "y":1.5},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"PgUp", "x":17.25, "y":1.5},
+
+                {"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},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"`", "x":11.5, "y":2.5},
+                {"label":"{", "x":12.5, "y":2.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"PgDn", "x":17.25, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":"+", "x":10.75, "y":3.5},
+                {"label":"*", "x":11.75, "y":3.5},
+                {"label":"}", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":"<", "x":9.25, "y":4.5},
+                {"label":">", "x":10.25, "y":4.5},
+                {"label":"?", "x":11.25, "y":4.5},
+                {"label":"_", "x":12.25, "y":4.5},
+                {"label":"Shift", "x":13.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":16.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.5},
+                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+                {"x":3.5, "y":5.5},
+                {"x":4.5, "y":5.5, "w":2.25},
+                {"x":6.75, "y":5.5, "w":2.25},
+                {"label":"kana", "x":9, "y":5.5, "w":1.25},
+                {"x":10.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":11.5, "y":5.5, "w":1.25},
+                {"label":"Menu", "x":12.75, "y":5.5},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.5},
+                {"label":"\u2193", "x":16.25, "y":5.5},
+                {"label":"\u2192", "x":17.25, "y":5.5}
+            ]
         }
     }
-}
\ No newline at end of file
+}