Fix cypher iso (#5971)

* Reformat JSON to look less like AIDS

* Fix location of ISO Enter

diff --git a/keyboards/westfoxtrot/cypher/info.json b/keyboards/westfoxtrot/cypher/info.json
index ab139aeafb388f41cb78c107e1f8d74e3b06f9e1..ddf4e9d5a81cc9ec90278fc58574e6aff25a654a 100644 (file)
--- a/keyboards/westfoxtrot/cypher/info.json
+++ b/keyboards/westfoxtrot/cypher/info.json
@@ -4,9 +4,204 @@
   "height": 5,
   "layouts": {
     "LAYOUT_ansi": {
- "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Num Lock", "x":15.5, "y":0}, {"label":"/", "x":16.5, "y":0}, {"label":"*", "x":17.5, "y":0}, {"label":"-", "x":18.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"7", "x":15.5, "y":1}, {"label":"8", "x":16.5, "y":1}, {"label":"9", "x":17.5, "y":1}, {"label":"+", "x":18.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":15.5, "y":2}, {"label":"5", "x":16.5, "y":2}, {"label":"6", "x":17.5, "y":2}, {"label":"=", "x":18.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14.25, "y":3.25}, {"label":"1", "x":15.5, "y":3}, {"label":"2", "x":16.5, "y":3}, {"label":"3", "x":17.5, "y":3}, {"label":"Enter", "x":18.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"label":"Space", "x":3.5, "y":4, "w":6}, {"label":"Alt", "x":9.5, "y":4, "w":1.25}, {"label":"Win", "x":10.75, "y":4}, {"label":"Ctrl", "x":11.75, "y":4, "w":1.25}, {"label":"Left", "x":13.25, "y":4.25}, {"label":"Down", "x":14.25, "y":4.25}, {"label":"Right", "x":15.25, "y":4.25}, {"label":"0", "x":16.5, "y":4}, {"label":".", "x":17.5, "y":4}, {"label":"Backspace", "x":18.5, "y":4}]    },
+      "layout": [
+        {"label":"~","x":0,"y":0},
+        {"label":"!","x":1,"y":0},
+        {"label":"@","x":2,"y":0},
+        {"label":"#","x":3,"y":0},
+        {"label":"$","x":4,"y":0},
+        {"label":"%","x":5,"y":0},
+        {"label":"^","x":6,"y":0},
+        {"label":"&","x":7,"y":0},
+        {"label":"*","x":8,"y":0},
+        {"label":"(","x":9,"y":0},
+        {"label":")","x":10,"y":0},
+        {"label":"_","x":11,"y":0},
+        {"label":"+","x":12,"y":0},
+        {"label":"Backspace","x":13,"y":0},
+        {"label":"~","x":14,"y":0},
+
+        {"label":"Num Lock","x":15.5,"y":0},
+        {"label":"/","x":16.5,"y":0},
+        {"label":"*","x":17.5,"y":0},
+        {"label":"-","x":18.5,"y":0},
+
+        {"label":"Tab","x":0,"y":1,"w":1.5},
+        {"label":"Q","x":1.5,"y":1},
+        {"label":"W","x":2.5,"y":1},
+        {"label":"E","x":3.5,"y":1},
+        {"label":"R","x":4.5,"y":1},
+        {"label":"T","x":5.5,"y":1},
+        {"label":"Y","x":6.5,"y":1},
+        {"label":"U","x":7.5,"y":1},
+        {"label":"I","x":8.5,"y":1},
+        {"label":"O","x":9.5,"y":1},
+        {"label":"P","x":10.5,"y":1},
+        {"label":"{","x":11.5,"y":1},
+        {"label":"}","x":12.5,"y":1},
+        {"label":"|","x":13.5,"y":1,"w":1.5},
+
+        {"label":"7","x":15.5,"y":1},
+        {"label":"8","x":16.5,"y":1},
+        {"label":"9","x":17.5,"y":1},
+        {"label":"+","x":18.5,"y":1},
+
+        {"label":"Caps Lock","x":0,"y":2,"w":1.75},
+        {"label":"A","x":1.75,"y":2},
+        {"label":"S","x":2.75,"y":2},
+        {"label":"D","x":3.75,"y":2},
+        {"label":"F","x":4.75,"y":2},
+        {"label":"G","x":5.75,"y":2},
+        {"label":"H","x":6.75,"y":2},
+        {"label":"J","x":7.75,"y":2},
+        {"label":"K","x":8.75,"y":2},
+        {"label":"L","x":9.75,"y":2},
+        {"label":":","x":10.75,"y":2},
+        {"label":"\"","x":11.75,"y":2},
+        {"label":"Enter","x":12.75,"y":2,"w":2.25},
+
+        {"label":"4","x":15.5,"y":2},
+        {"label":"5","x":16.5,"y":2},
+        {"label":"6","x":17.5,"y":2},
+        {"label":"=","x":18.5,"y":2},
+
+        {"label":"Shift","x":0,"y":3,"w":2.25},
+        {"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":"N","x":7.25,"y":3},
+        {"label":"M","x":8.25,"y":3},
+        {"label":"<","x":9.25,"y":3},
+        {"label":">","x":10.25,"y":3},
+        {"label":"?","x":11.25,"y":3},
+        {"label":"Shift","x":12.25,"y":3,"w":1.75},
+
+        {"label":"Up","x":14.25,"y":3.25},
+
+        {"label":"1","x":15.5,"y":3},
+        {"label":"2","x":16.5,"y":3},
+        {"label":"3","x":17.5,"y":3},
+        {"label":"Enter","x":18.5,"y":3},
+
+        {"label":"Ctrl","x":0,"y":4,"w":1.25},
+        {"label":"Win","x":1.25,"y":4},
+        {"label":"Alt","x":2.25,"y":4,"w":1.25},
+        {"label":"Space","x":3.5,"y":4,"w":6},
+        {"label":"Alt","x":9.5,"y":4,"w":1.25},
+        {"label":"Win","x":10.75,"y":4},
+        {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
+
+        {"label":"Left","x":13.25,"y":4.25},
+        {"label":"Down","x":14.25,"y":4.25},
+        {"label":"Right","x":15.25,"y":4.25},
+
+        {"label":"0","x":16.5,"y":4},
+        {"label":".","x":17.5,"y":4},
+        {"label":"Backspace","x":18.5,"y":4}
+      ]
+    },
 
     "LAYOUT_iso": {
- "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Num Lock", "x":15.5, "y":0}, {"label":"/", "x":16.5, "y":0}, {"label":"*", "x":17.5, "y":0}, {"label":"-", "x":18.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"7", "x":15.5, "y":1}, {"label":"8", "x":16.5, "y":1}, {"label":"9", "x":17.5, "y":1}, {"label":"+", "x":18.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"4", "x":15.5, "y":2}, {"label":"5", "x":16.5, "y":2}, {"label":"6", "x":17.5, "y":2}, {"label":"=", "x":18.5, "y":2}, {"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":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14.25, "y":3.25}, {"label":"1", "x":15.5, "y":3}, {"label":"2", "x":16.5, "y":3}, {"label":"3", "x":17.5, "y":3}, {"label":"Enter", "x":18.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"label":"Space", "x":3.5, "y":4, "w":6}, {"label":"Alt", "x":9.5, "y":4, "w":1.25}, {"label":"Win", "x":10.75, "y":4}, {"label":"Ctrl", "x":11.75, "y":4, "w":1.25}, {"label":"Left", "x":13.25, "y":4.25}, {"label":"Down", "x":14.25, "y":4.25}, {"label":"Right", "x":15.25, "y":4.25}, {"label":"0", "x":16.5, "y":4}, {"label":".", "x":17.5, "y":4}, {"label":"Backspace", "x":18.5, "y":4}]    }
+      "layout": [
+        {"label":"~","x":0,"y":0},
+        {"label":"!","x":1,"y":0},
+        {"label":"@","x":2,"y":0},
+        {"label":"#","x":3,"y":0},
+        {"label":"$","x":4,"y":0},
+        {"label":"%","x":5,"y":0},
+        {"label":"^","x":6,"y":0},
+        {"label":"&","x":7,"y":0},
+        {"label":"*","x":8,"y":0},
+        {"label":"(","x":9,"y":0},
+        {"label":")","x":10,"y":0},
+        {"label":"_","x":11,"y":0},
+        {"label":"+","x":12,"y":0},
+        {"label":"Backspace","x":13,"y":0},
+        {"label":"~","x":14,"y":0},
+
+        {"label":"Num Lock","x":15.5,"y":0},
+        {"label":"/","x":16.5,"y":0},
+        {"label":"*","x":17.5,"y":0},
+        {"label":"-","x":18.5,"y":0},
+
+        {"label":"Tab","x":0,"y":1,"w":1.5},
+        {"label":"Q","x":1.5,"y":1},
+        {"label":"W","x":2.5,"y":1},
+        {"label":"E","x":3.5,"y":1},
+        {"label":"R","x":4.5,"y":1},
+        {"label":"T","x":5.5,"y":1},
+        {"label":"Y","x":6.5,"y":1},
+        {"label":"U","x":7.5,"y":1},
+        {"label":"I","x":8.5,"y":1},
+        {"label":"O","x":9.5,"y":1},
+        {"label":"P","x":10.5,"y":1},
+        {"label":"{","x":11.5,"y":1},
+        {"label":"}","x":12.5,"y":1},
+
+        {"label":"7","x":15.5,"y":1},
+        {"label":"8","x":16.5,"y":1},
+        {"label":"9","x":17.5,"y":1},
+        {"label":"+","x":18.5,"y":1},
+
+        {"label":"Caps Lock","x":0,"y":2,"w":1.75},
+        {"label":"A","x":1.75,"y":2},
+        {"label":"S","x":2.75,"y":2},
+        {"label":"D","x":3.75,"y":2},
+        {"label":"F","x":4.75,"y":2},
+        {"label":"G","x":5.75,"y":2},
+        {"label":"H","x":6.75,"y":2},
+        {"label":"J","x":7.75,"y":2},
+        {"label":"K","x":8.75,"y":2},
+        {"label":"L","x":9.75,"y":2},
+        {"label":":","x":10.75,"y":2},
+        {"label":"\"","x":11.75,"y":2},
+        {"label":"~","x":12.75,"y":2},
+        {"label":"Enter","x":13.75,"y":1,"w":1.25,"h":2},
+
+        {"label":"4","x":15.5,"y":2},
+        {"label":"5","x":16.5,"y":2},
+        {"label":"6","x":17.5,"y":2},
+        {"label":"=","x":18.5,"y":2},
+
+        {"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":"N","x":7.25,"y":3},
+        {"label":"M","x":8.25,"y":3},
+        {"label":"<","x":9.25,"y":3},
+        {"label":">","x":10.25,"y":3},
+        {"label":"?","x":11.25,"y":3},
+        {"label":"Shift","x":12.25,"y":3,"w":1.75},
+
+        {"label":"Up","x":14.25,"y":3.25},
+
+        {"label":"1","x":15.5,"y":3},
+        {"label":"2","x":16.5,"y":3},
+        {"label":"3","x":17.5,"y":3},
+        {"label":"Enter","x":18.5,"y":3},
+
+        {"label":"Ctrl","x":0,"y":4,"w":1.25},
+        {"label":"Win","x":1.25,"y":4},
+        {"label":"Alt","x":2.25,"y":4,"w":1.25},
+        {"label":"Space","x":3.5,"y":4,"w":6},
+        {"label":"Alt","x":9.5,"y":4,"w":1.25},
+        {"label":"Win","x":10.75,"y":4},
+        {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
+
+        {"label":"Left","x":13.25,"y":4.25},
+        {"label":"Down","x":14.25,"y":4.25},
+        {"label":"Right","x":15.25,"y":4.25},
+
+        {"label":"0","x":16.5,"y":4},
+        {"label":".","x":17.5,"y":4},
+        {"label":"Backspace","x":18.5,"y":4}
+      ]
+    }
   }
 }