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

1 files changed, 103 insertions, 7 deletions

diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json
index f3df9c947d..03e39b7579 100644
--- a/keyboards/converter/a1200/info.json
+++ b/keyboards/converter/a1200/info.json
@@ -4,13 +4,109 @@
     "width": 22.5, 
     "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, "y":0}, {"label":"F6", "x":8, "y":0}, {"label":"F7", "x":9, "y":0}, {"label":"F8", "x":10, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, 
-            		   {"label":"~", "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":"Backspace", "x":14, "y":1.5}, {"label":"Del", "x":15.25, "y":1.5, "w":1.5}, {"label":"Help", "x":16.75, "y":1.5, "w":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "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":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5}, 
-            		   {"label":"CTRL", "x":0, "y":3.5}, {"label":"Caps Lock", "x":1, "y":3.5}, {"label":"A", "x":2, "y":3.5}, {"label":"S", "x":3, "y":3.5}, {"label":"D", "x":4, "y":3.5}, {"label":"F", "x":5, "y":3.5}, {"label":"G", "x":6, "y":3.5}, {"label":"H", "x":7, "y":3.5}, {"label":"J", "x":8, "y":3.5}, {"label":"K", "x":9, "y":3.5}, {"label":"L", "x":10, "y":3.5}, {"label":":", "x":11, "y":3.5}, {"label":"\"", "x":12, "y":3.5}, {"label":"~", "x":13, "y":3.5}, {"label":"Enter", "x":14, "y":2.5, "w":1, "h":2}, {"label":"\u2191", "x":16.25, "y":3.5}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"+", "x":21.5, "y":3.5},
-            		   {"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":"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":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2190", "x":15.25, "y":4.5}, {"label":"\u2193", "x":16.25, "y":4.5}, {"label":"\u2192", "x":17.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, 
-            		   {"label":"alt", "x":1, "y":5.5, "w":1.5}, {"label":"Amiga", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Amiga", "x":11, "y":5.5, "w":1.5}, {"label":"Alt", "x":12.5, "y":5.5, "w":1.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+        "LAYOUT_default": {
+            "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, "y":0}, 
+            {"label":"F6", "x":8, "y":0}, 
+            {"label":"F7", "x":9, "y":0}, 
+            {"label":"F8", "x":10, "y":0}, 
+            {"label":"F9", "x":11, "y":0}, 
+            {"label":"F10", "x":12, "y":0},
+             
+            {"label":"~", "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":"Backspace", "x":14, "y":1.5}, 
+            {"label":"Del", "x":15.25, "y":1.5, "w":1.5}, 
+            {"label":"Help", "x":16.75, "y":1.5, "w":1.5}, 
+            {"label":"Num Lock", "x":18.5, "y":1.5}, 
+            {"label":"/", "x":19.5, "y":1.5}, 
+            {"label":"*", "x":20.5, "y":1.5}, 
+            {"label":"-", "x":21.5, "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":"7", "x":18.5, "y":2.5}, 
+            {"label":"8", "x":19.5, "y":2.5}, 
+            {"label":"9", "x":20.5, "y":2.5}, 
+            {"label":"+", "x":21.5, "y":2.5},
+             
+            {"label":"CTRL", "x":0, "y":3.5}, 
+            {"label":"Caps Lock", "x":1, "y":3.5}, 
+            {"label":"A", "x":2, "y":3.5}, 
+            {"label":"S", "x":3, "y":3.5}, 
+            {"label":"D", "x":4, "y":3.5}, 
+            {"label":"F", "x":5, "y":3.5}, 
+            {"label":"G", "x":6, "y":3.5}, 
+            {"label":"H", "x":7, "y":3.5}, 
+            {"label":"J", "x":8, "y":3.5}, 
+            {"label":"K", "x":9, "y":3.5}, 
+            {"label":"L", "x":10, "y":3.5}, 
+            {"label":":", "x":11, "y":3.5}, 
+            {"label":"\"", "x":12, "y":3.5}, 
+            {"label":"~", "x":13, "y":3.5}, 
+            {"label":"Enter", "x":14, "y":2.5, "w":1, "h":2}, 
+            {"label":"\u2191", "x":16.25, "y":3.5}, 
+            {"label":"4", "x":18.5, "y":3.5}, 
+            {"label":"5", "x":19.5, "y":3.5}, 
+            {"label":"6", "x":20.5, "y":3.5}, 
+            {"label":"+", "x":21.5, "y":3.5},
+            
+            {"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":"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":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
+            {"label":"\u2190", "x":15.25, "y":4.5}, 
+            {"label":"\u2193", "x":16.25, "y":4.5}, 
+            {"label":"\u2192", "x":17.25, "y":4.5}, 
+            {"label":"1", "x":18.5, "y":4.5}, 
+            {"label":"2", "x":19.5, "y":4.5}, 
+            {"label":"3", "x":20.5, "y":4.5}, 
+            {"label":"Enter", "x":21.5, "y":4.5, "h":2}, 
+            
+            {"label":"Alt", "x":1, "y":5.5, "w":1.5}, 
+            {"label":"Amiga", "x":2.5, "y":5.5, "w":1.5}, 
+            {"label":"Space", "x":4, "y":5.5, "w":7}, 
+            {"label":"Amiga", "x":11, "y":5.5, "w":1.5}, 
+            {"label":"Alt", "x":12.5, "y":5.5, "w":1.5}, 
+            {"label":"0", "x":18.5, "y":5.5, "w":2}, 
+            {"label":".", "x":20.5, "y":5.5}]
         }
     }
 }