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

2 files changed, 155 insertions, 2 deletions

diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 7ca44411b8..da9a620d35 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -4,7 +4,84 @@
     "maintainer": "kylemccreery",
     "layouts": {
         "LAYOUT_mirrored": {
-            "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0.47, "y":1, "w":1.5}, {"x":1.97, "y":1}, {"x":15.78, "y":1}, {"x":16.78, "y":1, "w":1.5}, {"x":0.37, "y":2, "w":1.75}, {"x":2.12, "y":2}, {"x":15.63, "y":2}, {"x":16.63, "y":2, "w":1.75}, {"x":0.22, "y":3, "w":1.25}, {"x":1.47, "y":3}, {"x":2.47, "y":3}, {"x":9.43, "y":3}, {"x":15.28, "y":3}, {"x":16.28, "y":3}, {"x":17.28, "y":3, "w":1.25}, {"x":0.47, "y":4}, {"x":1.47, "y":4}, {"x":2.47, "y":4}, {"x":9.68, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.25, "y":4}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":0.5, "y":2.25}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":0.75, "y":3.25}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.57, "y":4.25}, {"x":1, "y":5.25, "w":1.25}, {"x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25, "w":1.5}, {"x":5.32, "y":5.25}, {"x":-1.0, "y":2}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":-1.5, "y":3}, {"x":-0.5, "y":3}, {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":-1.75, "y":4}, {"x":-0.75, "y":4}, {"x":0.25, "y":4}, {"x":1.25, "y":4}, {"x":2.25, "y":4}, {"x":-1.25, "y":5}, {"x":-0.25, "y":5}, {"x":0.75, "y":5}, {"x":1.75, "y":5}, {"x":-1.25, "y":6, "w":1.5}, {"x":0.25, "y":6, "w":1.5}, {"x":1.75, "y":6, "w":1.25}]
+            "layout": [
+                {"label":"Esc", "x":0.62, "y":0},
+                {"label":"1!", "x":1.62, "y":0},
+                {"label":"2@", "x":2.62, "y":0},
+                {"label":"3#", "x":3.62, "y":0},
+                {"label":"4$", "x":4.62, "y":0},
+                {"label":"5%", "x":5.62, "y":0},
+                {"label":"6^", "x":6.62, "y":0},
+                {"label":"7&", "x":10.12, "y":0},
+                {"label":"8*", "x":11.12, "y":0},
+                {"label":"9(", "x":12.12, "y":0},
+                {"label":"0)", "x":13.12, "y":0},
+                {"label":"-_", "x":14.12, "y":0},
+                {"label":"Backspace", "x":15.12, "y":0},
+                {"label":"Backspace", "x":16.12, "y":0},
+
+                {"label":"Tab", "x":0.37, "y":1, "w":1.5},
+                {"label":"Q", "x":1.87, "y":1},
+                {"label":"W", "x":2.87, "y":1},
+                {"label":"E", "x":3.87, "y":1},
+                {"label":"R", "x":4.87, "y":1},
+                {"label":"T", "x":5.87, "y":1},
+                {"label":"Y", "x":6.87, "y":1},
+                {"label":"Y", "x":9.87, "y":1},
+                {"label":"U", "x":10.87, "y":1},
+                {"label":"I", "x":11.87, "y":1},
+                {"label":"O", "x":12.87, "y":1},
+                {"label":"P", "x":13.87, "y":1},
+                {"label":"]}", "x":14.87, "y":1},
+                {"label":"\\|", "x":15.87, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75},
+                {"label":"A", "x":2, "y":2},
+                {"label":"S", "x":3, "y":2},
+                {"label":"D", "x":4, "y":2},
+                {"label":"F", "x":5, "y":2},
+                {"label":"G", "x":6, "y":2},
+                {"label":"H", "x":7, "y":2},
+                {"label":";:", "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":"Enter", "x":15.75, "y":2, "w":1.75},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"Mute", "x":7.37, "y":3},
+                {"label":"Mute", "x":9.37, "y":3},
+                {"label":"B", "x":10.5, "y":3},
+                {"label":"N", "x":11.5, "y":3},
+                {"label":"M", "x":12.5, "y":3},
+                {"label":",<", "x":13.5, "y":3},
+                {"label":".>", "x":14.5, "y":3},
+                {"label":"\u2191", "x":15.5, "y":3},
+                {"label":"Shift", "x":16.5, "y":3, "w":1.25},
+
+                {"label":"Ctrl", "x":0.25, "y":4},
+                {"label":"GUI", "x":1.25, "y":4},
+                {"label":"Alt", "x":2.25, "y":4},
+                {"label":"Fn2", "x":3.5, "y":4, "w":1.25},
+                {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5},
+                {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5},
+                {"label":"RGB Mode -", "x":7.13, "y":4},
+                {"label":"RGB Mode +", "x":9.62, "y":4},
+                {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5},
+                {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5},
+                {"label":"Fn2", "x":13, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.5, "y":4},
+                {"label":"\u2193", "x":15.5, "y":4},
+                {"label":"\u2192", "x":16.5, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index 966505ba84..b132efe064 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -4,7 +4,83 @@
     "maintainer": "kylemccreery",
     "layouts": {
         "LAYOUT_standard": {
-            "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":15.75, "y":0}, {"x":16.75, "y":0}, {"x":0.47, "y":1, "w":1.5}, {"x":1.97, "y":1}, {"x":15.5, "y":1}, {"x":16.5, "y":1, "w":1.5}, {"x":0.37, "y":2, "w":1.75}, {"x":2.12, "y":2}, {"x":15.85, "y":2}, {"x":16.85, "y":2, "w":1.75}, {"x":0.22, "y":3, "w":1.25}, {"x":1.47, "y":3}, {"x":2.47, "y":3}, {"x":9.43, "y":3}, {"x":15.5, "y":3}, {"x":16.5, "y":3}, {"x":17.5, "y":3, "w":1.25}, {"x":0.47, "y":4}, {"x":1.47, "y":4}, {"x":2.47, "y":4}, {"x":9.68, "y":4}, {"x":15.5, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":0.5, "y":2.25}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":0.75, "y":3.25}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.57, "y":4.25}, {"x":1, "y":5.25, "w":1.25}, {"x":2.25, "y":5.25, "w":1.5}, {"x":3.75, "y":5.25, "w":1.5}, {"x":5.32, "y":5.25}, {"x":-1.5, "y":2}, {"x":-0.5, "y":2}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":-1.0, "y":3}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":-1.75, "y":4}, {"x":-0.75, "y":4}, {"x":0.25, "y":4}, {"x":1.25, "y":4}, {"x":2.25, "y":4}, {"x":-1.25, "y":5}, {"x":-0.25, "y":5}, {"x":0.75, "y":5}, {"x":1.75, "y":5}, {"x":-1.25, "y":6, "w":1.5}, {"x":0.25, "y":6, "w":1.5}, {"x":1.75, "y":6, "w":1.25}]
+            "layout": [
+                {"label":"Esc", "x":0.62, "y":0},
+                {"label":"1!", "x":1.62, "y":0},
+                {"label":"2@", "x":2.62, "y":0},
+                {"label":"3#", "x":3.62, "y":0},
+                {"label":"4$", "x":4.62, "y":0},
+                {"label":"5%", "x":5.62, "y":0},
+                {"label":"6^", "x":6.62, "y":0},
+                {"label":"7&", "x":9.62, "y":0},
+                {"label":"8*", "x":10.62, "y":0},
+                {"label":"9(", "x":11.62, "y":0},
+                {"label":"0)", "x":12.62, "y":0},
+                {"label":"-_", "x":13.62, "y":0},
+                {"label":"Backspace", "x":14.62, "y":0},
+                {"label":"Backspace", "x":15.62, "y":0},
+
+                {"label":"Tab", "x":0.37, "y":1, "w":1.5},
+                {"label":"Q", "x":1.87, "y":1},
+                {"label":"W", "x":2.87, "y":1},
+                {"label":"E", "x":3.87, "y":1},
+                {"label":"R", "x":4.87, "y":1},
+                {"label":"T", "x":5.87, "y":1},
+                {"label":"Y", "x":6.87, "y":1},
+                {"label":"U", "x":10.37, "y":1},
+                {"label":"I", "x":11.37, "y":1},
+                {"label":"O", "x":12.37, "y":1},
+                {"label":"P", "x":13.37, "y":1},
+                {"label":"]}", "x":14.37, "y":1},
+                {"label":"\\|", "x":15.37, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75},
+                {"label":"A", "x":2, "y":2},
+                {"label":"S", "x":3, "y":2},
+                {"label":"D", "x":4, "y":2},
+                {"label":"F", "x":5, "y":2},
+                {"label":"G", "x":6, "y":2},
+                {"label":"H", "x":7, "y":2},
+                {"label":";:", "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":"Enter", "x":15.75, "y":2, "w":1.75},
+
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"Mute", "x":7.37, "y":3},
+                {"label":"Mute", "x":9.37, "y":3},
+                {"label":"B", "x":10.5, "y":3},
+                {"label":"N", "x":11.5, "y":3},
+                {"label":"M", "x":12.5, "y":3},
+                {"label":",<", "x":13.5, "y":3},
+                {"label":".>", "x":14.5, "y":3},
+                {"label":"\u2191", "x":15.5, "y":3},
+                {"label":"Shift", "x":16.5, "y":3, "w":1.25},
+
+                {"label":"Ctrl", "x":0.25, "y":4},
+                {"label":"GUI", "x":1.25, "y":4},
+                {"label":"Alt", "x":2.25, "y":4},
+                {"label":"Fn2", "x":3.5, "y":4, "w":1.25},
+                {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5},
+                {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5},
+                {"label":"RGB Mode -", "x":7.13, "y":4},
+                {"label":"RGB Mode +", "x":9.62, "y":4},
+                {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5},
+                {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5},
+                {"label":"Fn2", "x":13, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.5, "y":4},
+                {"label":"\u2193", "x":15.5, "y":4},
+                {"label":"\u2192", "x":16.5, "y":4}
+            ]
         }
     }
 }