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

1 files changed, 89 insertions, 1 deletions

diff --git a/keyboards/mnk1800s/info.json b/keyboards/mnk1800s/info.json
index 8d67aea76b..44ff75c031 100755
--- a/keyboards/mnk1800s/info.json
+++ b/keyboards/mnk1800s/info.json
@@ -6,7 +6,95 @@
     "height": 5.25,
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4.5, "y":1, "w":1.5}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1, "w":1.5}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4.5, "y":2, "w":1.75}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2}, {"x":16.25, "y":2}, {"x":17.25, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":5.5, "y":3, "w":1.25}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3}, {"x":15.75, "y":3}, {"x":16.75, "y":3, "w":1.75}, {"x":18.5, "y":3}, {"x":4.25, "y":3.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":6.5, "y":4, "w":1.5}, {"x":8, "y":4, "w":1.5}, {"x":9.5, "y":4, "w":7}, {"x":16.5, "y":4, "w":1.5}, {"x":18, "y":4, "w":1.5}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}]
+            "layout": [
+                {"label":"Num Lock", "x":0, "y":0},
+                {"label":"/", "x":1, "y":0},
+                {"label":"*", "x":2, "y":0},
+                {"label":"-", "x":3, "y":0},
+                {"label":"Esc", "x":4.5, "y":0},
+                {"label":"1", "x":5.5, "y":0},
+                {"label":"2", "x":6.5, "y":0},
+                {"label":"3", "x":7.5, "y":0},
+                {"label":"4", "x":8.5, "y":0},
+                {"label":"5", "x":9.5, "y":0},
+                {"label":"6", "x":10.5, "y":0},
+                {"label":"7", "x":11.5, "y":0},
+                {"label":"8", "x":12.5, "y":0},
+                {"label":"9", "x":13.5, "y":0},
+                {"label":"0", "x":14.5, "y":0},
+                {"label":"-", "x":15.5, "y":0},
+                {"label":"=", "x":16.5, "y":0},
+                {"label":"Backspace", "x":17.5, "y":0},
+                {"label":"Delete", "x":18.5, "y":0},
+
+                {"label":"7", "x":0, "y":1},
+                {"label":"8", "x":1, "y":1},
+                {"label":"9", "x":2, "y":1},
+                {"label":"+", "x":3, "y":1},
+                {"label":"Tab", "x":4.5, "y":1, "w":1.5},
+                {"label":"Q", "x":6, "y":1},
+                {"label":"W", "x":7, "y":1},
+                {"label":"E", "x":8, "y":1},
+                {"label":"R", "x":9, "y":1},
+                {"label":"T", "x":10, "y":1},
+                {"label":"Y", "x":11, "y":1},
+                {"label":"U", "x":12, "y":1},
+                {"label":"I", "x":13, "y":1},
+                {"label":"O", "x":14, "y":1},
+                {"label":"P", "x":15, "y":1},
+                {"label":"[", "x":16, "y":1},
+                {"label":"]", "x":17, "y":1},
+                {"label":"\\", "x":18, "y":1, "w":1.5},
+
+                {"label":"4", "x":0, "y":2},
+                {"label":"5", "x":1, "y":2},
+                {"label":"6", "x":2, "y":2},
+                {"label":"Enter", "x":3, "y":2},
+                {"label":"Ctrl", "x":4.5, "y":2, "w":1.75},
+                {"label":"A", "x":6.25, "y":2},
+                {"label":"S", "x":7.25, "y":2},
+                {"label":"D", "x":8.25, "y":2},
+                {"label":"F", "x":9.25, "y":2},
+                {"label":"G", "x":10.25, "y":2},
+                {"label":"H", "x":11.25, "y":2},
+                {"label":"J", "x":12.25, "y":2},
+                {"label":"K", "x":13.25, "y":2},
+                {"label":"L", "x":14.25, "y":2},
+                {"label":";", "x":15.25, "y":2},
+                {"label":"'", "x":16.25, "y":2},
+                {"label":"Enter", "x":17.25, "y":2, "w":2.25},
+
+                {"label":"1", "x":0, "y":3},
+                {"label":"2", "x":1, "y":3},
+                {"label":"3", "x":2, "y":3},
+                {"label":"Enter", "x":3, "y":3},
+                {"label":"Up", "x":4.25, "y":3.25},
+                {"label":"Shift", "x":5.5, "y":3, "w":1.25},
+                {"label":"Z", "x":6.75, "y":3},
+                {"label":"X", "x":7.75, "y":3},
+                {"label":"C", "x":8.75, "y":3},
+                {"label":"V", "x":9.75, "y":3},
+                {"label":"B", "x":10.75, "y":3},
+                {"label":"N", "x":11.75, "y":3},
+                {"label":"M", "x":12.75, "y":3},
+                {"label":",", "x":13.75, "y":3},
+                {"label":".", "x":14.75, "y":3},
+                {"label":"/", "x":15.75, "y":3},
+                {"label":"Shift", "x":16.75, "y":3, "w":1.75},
+                {"label":"Fn", "x":18.5, "y":3},
+
+                {"label":"0", "x":0, "y":4},
+                {"label":"0", "x":1, "y":4},
+                {"label":".", "x":2, "y":4},
+                {"label":"Left", "x":3.25, "y":4.25},
+                {"label":"Down", "x":4.25, "y":4.25},
+                {"label":"Right", "x":5.25, "y":4.25},
+                {"label":"GUI", "x":6.5, "y":4, "w":1.5},
+                {"label":"Alt", "x":8, "y":4, "w":1.5},
+                {"label":"Space", "x":9.5, "y":4, "w":7},
+                {"label":"Alt", "x":16.5, "y":4, "w":1.5},
+                {"label":"Menu", "x":18, "y":4, "w":1.5}
+            ]
         }
     }
 }