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

1 files changed, 302 insertions, 2 deletions

diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json
index bf37fdf6a4..0f2ad67561 100755
--- a/keyboards/suavity/ehan/info.json
+++ b/keyboards/suavity/ehan/info.json
@@ -3,8 +3,308 @@
     "url": "",
     "maintainer": "qmk",
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"PrtSc", "x":18.75, "y":0}, {"label":"Scroll Lock", "x":19.75, "y":0}, {"label":"Pause", "x":20.75, "y":0}, {"label":"Insert", "x":18.75, "y":1.5}, {"label":"Home", "x":19.75, "y":1.5}, {"label":"PgUp", "x":20.75, "y":1.5}, {"label":"Delete", "x":18.75, "y":2.5}, {"label":"End", "x":19.75, "y":2.5}, {"label":"PgDn", "x":20.75, "y":2.5}, {"label":"\u2191", "x":19.75, "y":4.5}, {"label":"\u2190", "x":18.75, "y":5.5}, {"label":"\u2193", "x":19.75, "y":5.5}, {"label":"\u2192", "x":20.75, "y":5.5}, {"label":"Esc", "x":2.5, "y":0}, {"label":"F1", "x":3.75, "y":0}, {"label":"F2", "x":4.75, "y":0}, {"label":"F3", "x":5.75, "y":0}, {"label":"F4", "x":6.75, "y":0}, {"label":"F5", "x":8, "y":0}, {"label":"~", "x":2.5, "y":1.5}, {"label":"!", "x":3.5, "y":1.5}, {"label":"@", "x":4.5, "y":1.5}, {"label":"#", "x":5.5, "y":1.5}, {"label":"$", "x":6.5, "y":1.5}, {"label":"%", "x":7.5, "y":1.5}, {"label":"^", "x":8.5, "y":1.5}, {"label":"Tab", "x":2.5, "y":2.5, "w":1.5}, {"label":"Q", "x":4, "y":2.5}, {"label":"W", "x":5, "y":2.5}, {"label":"E", "x":6, "y":2.5}, {"label":"R", "x":7, "y":2.5}, {"label":"T", "x":8, "y":2.5}, {"label":"Caps Lock", "x":2.5, "y":3.5, "w":1.75}, {"label":"A", "x":4.25, "y":3.5}, {"label":"S", "x":5.25, "y":3.5}, {"label":"D", "x":6.25, "y":3.5}, {"label":"F", "x":7.25, "y":3.5}, {"label":"G", "x":8.25, "y":3.5}, {"label":"Shift", "x":2.5, "y":4.5, "w":2.25}, {"label":"Z", "x":4.75, "y":4.5}, {"label":"X", "x":5.75, "y":4.5}, {"label":"C", "x":6.75, "y":4.5}, {"label":"V", "x":7.75, "y":4.5}, {"label":"B", "x":8.75, "y":4.5}, {"label":"Ctrl", "x":2.5, "y":5.5, "w":1.5}, {"label":"Alt", "x":5.25, "y":5.5, "w":1.5}, {"x":6.75, "y":5.5, "w":3}, {"label":"F6", "x":8.75, "y":3.25}, {"label":"F7", "x":9.75, "y":3.25}, {"label":"F8", "x":10.75, "y":3.25}, {"label":"F9", "x":11.75, "y":3.25}, {"label":"F10", "x":13.25, "y":3.25}, {"label":"F11", "x":14.25, "y":3.25}, {"label":"F12", "x":15.25, "y":3.25}, {"label":"F13", "x":16.25, "y":3.25}, {"label":"&", "x":9.25, "y":4.75}, {"label":"*", "x":10.25, "y":4.75}, {"label":"(", "x":11.25, "y":4.75}, {"label":")", "x":12.25, "y":4.75}, {"label":"_", "x":13.25, "y":4.75}, {"label":"+", "x":14.25, "y":4.75}, {"label":"Backspace", "x":15.25, "y":4.75, "w":2}, {"label":"Y", "x":8.75, "y":5.75}, {"label":"U", "x":9.75, "y":5.75}, {"label":"I", "x":10.75, "y":5.75}, {"label":"O", "x":11.75, "y":5.75}, {"label":"P", "x":12.75, "y":5.75}, {"label":"{", "x":13.75, "y":5.75}, {"label":"}", "x":14.75, "y":5.75}, {"label":"|", "x":15.75, "y":5.75, "w":1.5}, {"label":"H", "x":9, "y":6.75}, {"label":"J", "x":10, "y":6.75}, {"label":"K", "x":11, "y":6.75}, {"label":"L", "x":12, "y":6.75}, {"label":":", "x":13, "y":6.75}, {"label":"\"", "x":14, "y":6.75}, {"label":"Enter", "x":15, "y":6.75, "w":2.25}, {"label":"B", "x":8.5, "y":7.75}, {"label":"N", "x":9.5, "y":7.75}, {"label":"M", "x":10.5, "y":7.75}, {"label":"<", "x":11.5, "y":7.75}, {"label":">", "x":12.5, "y":7.75}, {"label":"?", "x":13.5, "y":7.75}, {"label":"Shift", "x":14.5, "y":7.75, "w":2.75}, {"x":8.5, "y":8.75, "w":3}, {"label":"Alt", "x":11.5, "y":8.75, "w":1.5}, {"label":"Win", "x":13, "y":8.75, "w":1.25}, {"label":"Ctrl", "x":15.5, "y":8.75, "w":1.5}]
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":8.5, "y":0},
+                {"label":"F7", "x":9.5, "y":0},
+                {"label":"F8", "x":10.5, "y":0},
+                {"label":"F9", "x":11.5, "y":0},
+                {"label":"F10", "x":13, "y":0},
+                {"label":"F11", "x":14, "y":0},
+                {"label":"F12", "x":15, "y":0},
+                {"label":"F13", "x":16, "y":0},
+                {"label":"PrtSc", "x":17.25, "y":0},
+                {"label":"Scroll Lock", "x":18.25, "y":0},
+                {"label":"Pause", "x":19.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":9, "y":1.5},
+                {"label":"8*", "x":10, "y":1.5},
+                {"label":"9(", "x":11, "y":1.5},
+                {"label":"0)", "x":12, "y":1.5},
+                {"label":"-_", "x":13, "y":1.5},
+                {"label":"=+", "x":14, "y":1.5},
+                {"label":"\\|", "x":15, "y":1.5},
+                {"label":"Backspace", "x":16, "y":1.5},
+                {"label":"Insert", "x":17.25, "y":1.5},
+                {"label":"Home", "x":18.25, "y":1.5},
+                {"label":"Page Up", "x":19.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":8.5, "y":2.5},
+                {"label":"U", "x":9.5, "y":2.5},
+                {"label":"I", "x":10.5, "y":2.5},
+                {"label":"O", "x":11.5, "y":2.5},
+                {"label":"P", "x":12.5, "y":2.5},
+                {"label":"[{", "x":13.5, "y":2.5},
+                {"label":"]}", "x":14.5, "y":2.5},
+                {"label":"\\|", "x":15.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":17.25, "y":2.5},
+                {"label":"End", "x":18.25, "y":2.5},
+                {"label":"Page Down", "x":19.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":8.75, "y":3.5},
+                {"label":"J", "x":9.75, "y":3.5},
+                {"label":"K", "x":10.75, "y":3.5},
+                {"label":"L", "x":11.75, "y":3.5},
+                {"label":";:", "x":12.75, "y":3.5},
+                {"label":"'\"", "x":13.75, "y":3.5},
+                {"label":"#~", "x":14.75, "y":3.5},
+                {"label":"Enter", "x":15.75, "y":3.5, "w":1.25},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"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":"B", "x":8.25, "y":4.5},
+                {"label":"N", "x":9.25, "y":4.5},
+                {"label":"M", "x":10.25, "y":4.5},
+                {"label":",<", "x":11.25, "y":4.5},
+                {"label":".>", "x":12.25, "y":4.5},
+                {"label":"/?", "x":13.25, "y":4.5},
+                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
+                {"label":"Fn", "x":16, "y":4.5},
+                {"label":"\u2191", "x":18.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":4.25, "y":5.5},
+                {"label":"Space", "x":5.25, "y":5.5, "w":2},
+                {"label":"Space", "x":8.25, "y":5.5, "w":3},
+                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":17.25, "y":5.5},
+                {"label":"\u2193", "x":18.25, "y":5.5},
+                {"label":"\u2193", "x":19.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_rshift_lspace": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":8.5, "y":0},
+                {"label":"F7", "x":9.5, "y":0},
+                {"label":"F8", "x":10.5, "y":0},
+                {"label":"F9", "x":11.5, "y":0},
+                {"label":"F10", "x":13, "y":0},
+                {"label":"F11", "x":14, "y":0},
+                {"label":"F12", "x":15, "y":0},
+                {"label":"F13", "x":16, "y":0},
+                {"label":"PrtSc", "x":17.25, "y":0},
+                {"label":"Scroll Lock", "x":18.25, "y":0},
+                {"label":"Pause", "x":19.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":9, "y":1.5},
+                {"label":"8*", "x":10, "y":1.5},
+                {"label":"9(", "x":11, "y":1.5},
+                {"label":"0)", "x":12, "y":1.5},
+                {"label":"-_", "x":13, "y":1.5},
+                {"label":"=+", "x":14, "y":1.5},
+                {"label":"\\|", "x":15, "y":1.5},
+                {"label":"Backspace", "x":16, "y":1.5},
+                {"label":"Insert", "x":17.25, "y":1.5},
+                {"label":"Home", "x":18.25, "y":1.5},
+                {"label":"Page Up", "x":19.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":8.5, "y":2.5},
+                {"label":"U", "x":9.5, "y":2.5},
+                {"label":"I", "x":10.5, "y":2.5},
+                {"label":"O", "x":11.5, "y":2.5},
+                {"label":"P", "x":12.5, "y":2.5},
+                {"label":"[{", "x":13.5, "y":2.5},
+                {"label":"]}", "x":14.5, "y":2.5},
+                {"label":"\\|", "x":15.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":17.25, "y":2.5},
+                {"label":"End", "x":18.25, "y":2.5},
+                {"label":"Page Down", "x":19.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":8.75, "y":3.5},
+                {"label":"J", "x":9.75, "y":3.5},
+                {"label":"K", "x":10.75, "y":3.5},
+                {"label":"L", "x":11.75, "y":3.5},
+                {"label":";:", "x":12.75, "y":3.5},
+                {"label":"'\"", "x":13.75, "y":3.5},
+                {"label":"Enter", "x":14.75, "y":3.5, "w":2.25},
+
+                {"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":"B", "x":8.25, "y":4.5},
+                {"label":"N", "x":9.25, "y":4.5},
+                {"label":"M", "x":10.25, "y":4.5},
+                {"label":",<", "x":11.25, "y":4.5},
+                {"label":".>", "x":12.25, "y":4.5},
+                {"label":"/?", "x":13.25, "y":4.5},
+                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
+                {"label":"Fn", "x":16, "y":4.5},
+                {"label":"\u2191", "x":18.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":4.25, "y":5.5},
+                {"label":"Space", "x":5.25, "y":5.5, "w":2},
+                {"label":"Space", "x":8.25, "y":5.5, "w":3},
+                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":17.25, "y":5.5},
+                {"label":"\u2193", "x":18.25, "y":5.5},
+                {"label":"\u2193", "x":19.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso_split_bs_rshift_lspace": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":8.5, "y":0},
+                {"label":"F7", "x":9.5, "y":0},
+                {"label":"F8", "x":10.5, "y":0},
+                {"label":"F9", "x":11.5, "y":0},
+                {"label":"F10", "x":13, "y":0},
+                {"label":"F11", "x":14, "y":0},
+                {"label":"F12", "x":15, "y":0},
+                {"label":"F13", "x":16, "y":0},
+                {"label":"PrtSc", "x":17.25, "y":0},
+                {"label":"Scroll Lock", "x":18.25, "y":0},
+                {"label":"Pause", "x":19.25, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2\"", "x":2, "y":1.5},
+                {"label":"3\u00a3", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":9, "y":1.5},
+                {"label":"8*", "x":10, "y":1.5},
+                {"label":"9(", "x":11, "y":1.5},
+                {"label":"0)", "x":12, "y":1.5},
+                {"label":"-_", "x":13, "y":1.5},
+                {"label":"=+", "x":14, "y":1.5},
+                {"label":"\\|", "x":15, "y":1.5},
+                {"label":"Backspace", "x":16, "y":1.5},
+                {"label":"Insert", "x":17.25, "y":1.5},
+                {"label":"Home", "x":18.25, "y":1.5},
+                {"label":"Page Up", "x":19.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":8.5, "y":2.5},
+                {"label":"U", "x":9.5, "y":2.5},
+                {"label":"I", "x":10.5, "y":2.5},
+                {"label":"O", "x":11.5, "y":2.5},
+                {"label":"P", "x":12.5, "y":2.5},
+                {"label":"[{", "x":13.5, "y":2.5},
+                {"label":"]}", "x":14.5, "y":2.5},
+                {"label":"Delete", "x":17.25, "y":2.5},
+                {"label":"End", "x":18.25, "y":2.5},
+                {"label":"Page Down", "x":19.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":8.75, "y":3.5},
+                {"label":"J", "x":9.75, "y":3.5},
+                {"label":"K", "x":10.75, "y":3.5},
+                {"label":"L", "x":11.75, "y":3.5},
+                {"label":";:", "x":12.75, "y":3.5},
+                {"label":"'@", "x":13.75, "y":3.5},
+                {"label":"#~", "x":14.75, "y":3.5},
+                {"label":"Enter", "x":15.75, "y":2.5, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"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":"B", "x":8.25, "y":4.5},
+                {"label":"N", "x":9.25, "y":4.5},
+                {"label":"M", "x":10.25, "y":4.5},
+                {"label":",<", "x":11.25, "y":4.5},
+                {"label":".>", "x":12.25, "y":4.5},
+                {"label":"/?", "x":13.25, "y":4.5},
+                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
+                {"label":"Fn", "x":16, "y":4.5},
+                {"label":"\u2191", "x":18.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":4.25, "y":5.5},
+                {"label":"Space", "x":5.25, "y":5.5, "w":2},
+                {"label":"Space", "x":8.25, "y":5.5, "w":3},
+                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":12.75, "y":5.5, "w":1},
+                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":17.25, "y":5.5},
+                {"label":"\u2193", "x":18.25, "y":5.5},
+                {"label":"\u2192", "x":19.25, "y":5.5}
+            ]
         }
     }
 }