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

1 files changed, 82 insertions, 2 deletions

diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json
index 64c3f7eaa5..2d6b676098 100644
--- a/keyboards/kikoslab/ellora65/info.json
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -4,7 +4,87 @@
     "maintainer": "swiftrax", 
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":1.25, "y":0}, {"label":"1,0", "x":2.5, "y":0.25}, {"label":"0,1", "x":3.5, "y":0.25}, {"label":"1,1", "x":4.5, "y":0.25}, {"label":"0,2", "x":5.5, "y":0.25}, {"label":"1,2", "x":6.5, "y":0.25}, {"label":"0,3", "x":7.5, "y":0.25}, {"label":"1,3", "x":8.5, "y":0.25}, {"label":"0,4", "x":9.5, "y":0.25}, {"label":"1,4", "x":10.5, "y":0.25}, {"label":"0,5", "x":11.5, "y":0.25}, {"label":"1,5", "x":12.5, "y":0.25}, {"label":"0,6", "x":13.5, "y":0.25}, {"label":"1,6", "x":14.5, "y":0.25}, {"label":"0,7", "x":15.5, "y":0.25}, {"label":"1,7", "x":16.5, "y":0.25}, {"label":"2,0", "x":1.25, "y":1.25}, {"label":"3,0", "x":2.5, "y":1.25, "w":1.5}, {"label":"2,1", "x":4, "y":1.25}, {"label":"3,1", "x":5, "y":1.25}, {"label":"2,2", "x":6, "y":1.25}, {"label":"3,2", "x":7, "y":1.25}, {"label":"2,3", "x":8, "y":1.25}, {"label":"3,3", "x":9, "y":1.25}, {"label":"2,4", "x":10, "y":1.25}, {"label":"3,4", "x":11, "y":1.25}, {"label":"2,5", "x":12, "y":1.25}, {"label":"3,5", "x":13, "y":1.25}, {"label":"2,6", "x":14, "y":1.25}, {"label":"3,6", "x":15, "y":1.25}, {"label":"2,7", "x":16, "y":1.25, "w":1.5}, {"label":"4,0", "x":1.25, "y":2.25}, {"label":"5,0", "x":2.5, "y":2.25, "w":1.75}, {"label":"4,1", "x":4.25, "y":2.25}, {"label":"5,1", "x":5.25, "y":2.25}, {"label":"4,2", "x":6.25, "y":2.25}, {"label":"5,2", "x":7.25, "y":2.25}, {"label":"4,3", "x":8.25, "y":2.25}, {"label":"5,3", "x":9.25, "y":2.25}, {"label":"4,4", "x":10.25, "y":2.25}, {"label":"5,4", "x":11.25, "y":2.25}, {"label":"4,5", "x":12.25, "y":2.25}, {"label":"5,5", "x":13.25, "y":2.25}, {"label":"4,6", "x":14.25, "y":2.25}, {"label":"5,6", "x":15.25, "y":2.25}, {"label":"4,7", "x":16.25, "y":2.25, "w":1.25}, {"label":"5,7", "x":17.5, "y":2.25}, {"label":"6,0", "x":1.25, "y":3.25}, {"label":"7,0", "x":2.5, "y":3.25, "w":1.25}, {"label":"6,1", "x":3.75, "y":3.25}, {"label":"7,1", "x":4.75, "y":3.25}, {"label":"6,2", "x":5.75, "y":3.25}, {"label":"7,2", "x":6.75, "y":3.25}, {"label":"6,3", "x":7.75, "y":3.25}, {"label":"7,3", "x":8.75, "y":3.25}, {"label":"6,4", "x":9.75, "y":3.25}, {"label":"7,4", "x":10.75, "y":3.25}, {"label":"6,5", "x":11.75, "y":3.25}, {"label":"7,5", "x":12.75, "y":3.25}, {"label":"6,6", "x":13.75, "y":3.25}, {"label":"7,6", "x":14.75, "y":3.25, "w":1.75}, {"label":"6,7", "x":16.5, "y":3.25}, {"label":"7,7", "x":17.5, "y":3.25}, {"label":"8,0", "x":1.25, "y":4.25}, {"label":"9,0", "x":2.5, "y":4.25, "w":1.25}, {"label":"8,1", "x":3.75, "y":4.25, "w":1.25}, {"label":"9,1", "x":5, "y":4.25, "w":1.25}, {"label":"8,2", "x":6.25, "y":4.25, "w":2.75}, {"label":"8,3", "x":9, "y":4.25, "w":1.25}, {"label":"8,4", "x":10.25, "y":4.25, "w":2.25}, {"label":"9,5", "x":12.5, "y":4.25}, {"label":"8,6", "x":13.5, "y":4.25, "w":1.5}, {"label":"9,6", "x":15.5, "y":4.25}, {"label":"8,7", "x":16.5, "y":4.25}, {"label":"9,7", "x":17.5, "y":4.25}]
+            "layout": [
+                {"label":"Mute", "x":0, "y":0},
+                {"label":"Esc", "x":1.25, "y":0.25},
+                {"label":"1", "x":2.25, "y":0.25},
+                {"label":"2", "x":3.25, "y":0.25},
+                {"label":"3", "x":4.25, "y":0.25},
+                {"label":"4", "x":5.25, "y":0.25},
+                {"label":"5", "x":6.25, "y":0.25},
+                {"label":"6", "x":7.25, "y":0.25},
+                {"label":"7", "x":8.25, "y":0.25},
+                {"label":"8", "x":9.25, "y":0.25},
+                {"label":"9", "x":10.25, "y":0.25},
+                {"label":"0", "x":11.25, "y":0.25},
+                {"label":"-_", "x":12.25, "y":0.25},
+                {"label":"=+", "x":13.25, "y":0.25},
+                {"label":"Backspace", "x":14.25, "y":0.25},
+                {"label":"Backspace", "x":15.25, "y":0.25},
+
+                {"label":"F13", "x":0, "y":1.25},
+                {"label":"Tab", "x":1.25, "y":1.25, "w":1.5},
+                {"label":"Q", "x":2.75, "y":1.25},
+                {"label":"W", "x":3.75, "y":1.25},
+                {"label":"E", "x":4.75, "y":1.25},
+                {"label":"R", "x":5.75, "y":1.25},
+                {"label":"T", "x":6.75, "y":1.25},
+                {"label":"Y", "x":7.75, "y":1.25},
+                {"label":"U", "x":8.75, "y":1.25},
+                {"label":"I", "x":9.75, "y":1.25},
+                {"label":"O", "x":10.75, "y":1.25},
+                {"label":"P", "x":11.75, "y":1.25},
+                {"label":"[{", "x":12.75, "y":1.25},
+                {"label":"]}", "x":13.75, "y":1.25},
+                {"label":"\\|", "x":14.75, "y":1.25, "w":1.5},
+
+                {"label":"F14", "x":0, "y":2.25},
+                {"label":"Caps Lock", "x":1.25, "y":2.25, "w":1.75},
+                {"label":"A", "x":3, "y":2.25},
+                {"label":"S", "x":4, "y":2.25},
+                {"label":"D", "x":5, "y":2.25},
+                {"label":"F", "x":6, "y":2.25},
+                {"label":"G", "x":7, "y":2.25},
+                {"label":"H", "x":8, "y":2.25},
+                {"label":"J", "x":9, "y":2.25},
+                {"label":"K", "x":10, "y":2.25},
+                {"label":"L", "x":11, "y":2.25},
+                {"label":";:", "x":12, "y":2.25},
+                {"label":"'\"", "x":13, "y":2.25},
+                {"label":"Enter", "x":14, "y":2.25},
+                {"label":"Enter", "x":15, "y":2.25, "w":1.25},
+                {"label":"Insert", "x":16.25, "y":2.25},
+
+                {"label":"F15", "x":0, "y":3.25},
+                {"label":"Shift", "x":1.25, "y":3.25, "w":1.25},
+                {"label":"\\|", "x":2.5, "y":3.25},
+                {"label":"Z", "x":3.5, "y":3.25},
+                {"label":"X", "x":4.5, "y":3.25},
+                {"label":"C", "x":5.5, "y":3.25},
+                {"label":"V", "x":6.5, "y":3.25},
+                {"label":"B", "x":7.5, "y":3.25},
+                {"label":"N", "x":8.5, "y":3.25},
+                {"label":"M", "x":9.5, "y":3.25},
+                {"label":",<", "x":10.5, "y":3.25},
+                {"label":".>", "x":11.5, "y":3.25},
+                {"label":"/?", "x":12.5, "y":3.25},
+                {"label":"Shift", "x":13.5, "y":3.25, "w":1.75},
+                {"label":"\u2191", "x":15.25, "y":3.25},
+                {"label":"Delete", "x":16.25, "y":3.25},
+
+                {"label":"F16", "x":0, "y":4.25},
+                {"label":"Ctrl", "x":1.25, "y":4.25, "w":1.25},
+                {"label":"GUI", "x":2.5, "y":4.25, "w":1.25},
+                {"label":"Alt", "x":3.75, "y":4.25, "w":1.25},
+                {"label":"Fn", "x":5, "y":4.25, "w":2.75},
+                {"label":"Space", "x":7.75, "y":4.25, "w":1.25},
+                {"label":"Fn", "x":9, "y":4.25, "w":2.25},
+                {"label":"Fn", "x":11.25, "y":4.25},
+                {"label":"Fn", "x":12.25, "y":4.25, "w":1.5},
+                {"label":"\u2190", "x":14.25, "y":4.25},
+                {"label":"\u2193", "x":15.25, "y":4.25},
+                {"label":"\u2192", "x":16.25, "y":4.25}
+            ]
         }
     }
-}
\ No newline at end of file
+}