]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
XMMX refactor, Configurator support and readme update (#4722)
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>
Tue, 25 Dec 2018 19:24:47 +0000 (11:24 -0800)
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>
Tue, 25 Dec 2018 19:24:47 +0000 (11:24 -0800)
* XMMX: matrix and keymap refactor

- xmmx.h updated to use #pragma once
- renamed LAYOUT_ansi_wk macro to LAYOUT_tkl_ansi
- renamed LAYOUT_ansi_wkl macro to LAYOUT_tkl_ansi_wkl
- renamed LAYOUT_iso_wk macro to LAYOUT_tkl_iso
- renamed LAYOUT_iso_wkl macro to LAYOUT_tkl_iso_wkl

* XMMX: Configurator support

* XMMX: readme update

keyboards/xmmx/info.json [new file with mode: 0644]
keyboards/xmmx/keymaps/ansi_wk/keymap.c
keyboards/xmmx/keymaps/ansi_wkl/keymap.c
keyboards/xmmx/keymaps/default/keymap.c
keyboards/xmmx/keymaps/iso_wk/keymap.c
keyboards/xmmx/keymaps/iso_wkl/keymap.c
keyboards/xmmx/readme.md
keyboards/xmmx/xmmx.h

diff --git a/keyboards/xmmx/info.json b/keyboards/xmmx/info.json
new file mode 100644 (file)
index 0000000..28bd06b
--- /dev/null
@@ -0,0 +1,475 @@
+{
+    "keyboard_name": "XMMX",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 18.25,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT_all": {
+            "key_count": 96,
+            "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.5, "y":0}, 
+                {"label":"F6", "x":7.5, "y":0}, 
+                {"label":"F7", "x":8.5, "y":0}, 
+                {"label":"F8", "x":9.5, "y":0}, 
+                {"label":"F9", "x":11, "y":0}, 
+                {"label":"F10", "x":12, "y":0}, 
+                {"label":"F11", "x":13, "y":0}, 
+                {"label":"F12", "x":14, "y":0}, 
+                {"label":"PrtSc", "x":15.25, "y":0}, 
+                {"label":"Scroll Lock", "x":16.25, "y":0}, 
+                {"label":"Pause", "x":17.25, "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":"Back Space", "x":13, "y":1.5}, 
+                {"label":"Back Space", "x":14, "y":1.5}, 
+                {"label":"Insert", "x":15.25, "y":1.5}, 
+                {"label":"Home", "x":16.25, "y":1.5}, 
+                {"label":"PgUp", "x":17.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":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":"|", "x":13.5, "y":2.5, "w":1.5}, 
+                {"label":"Delete", "x":15.25, "y":2.5}, 
+                {"label":"End", "x":16.25, "y":2.5}, 
+                {"label":"PgDn", "x":17.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":6.75, "y":3.5}, 
+                {"label":"J", "x":7.75, "y":3.5}, 
+                {"label":"K", "x":8.75, "y":3.5}, 
+                {"label":"L", "x":9.75, "y":3.5}, 
+                {"label":":", "x":10.75, "y":3.5}, 
+                {"label":"\"", "x":11.75, "y":3.5}, 
+                {"label":"~", "x":12.75, "y":3.5}, 
+                {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, 
+                {"x":15.25, "y":3.5}, 
+                {"x":16.25, "y":3.5}, 
+                {"x":17.25, "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":1.75}, 
+                {"label":"Fn", "x":14, "y":4.5}, 
+                {"x":15.25, "y":4.5}, 
+                {"label":"Up", "x":16.25, "y":4.5}, 
+                {"x":17.25, "y":4.5}, 
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
+                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25}, 
+                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
+                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
+                {"label":"Left", "x":15.25, "y":5.5}, 
+                {"label":"Down", "x":16.25, "y":5.5}, 
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "key_count": 87,
+            "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.5, "y":0}, 
+                {"label":"F6", "x":7.5, "y":0}, 
+                {"label":"F7", "x":8.5, "y":0}, 
+                {"label":"F8", "x":9.5, "y":0}, 
+                {"label":"F9", "x":11, "y":0}, 
+                {"label":"F10", "x":12, "y":0}, 
+                {"label":"F11", "x":13, "y":0}, 
+                {"label":"F12", "x":14, "y":0}, 
+                {"label":"PrtSc", "x":15.25, "y":0}, 
+                {"label":"Scroll Lock", "x":16.25, "y":0}, 
+                {"label":"Pause", "x":17.25, "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":"Backspace", "x":13, "y":1.5, "w":2}, 
+                {"label":"Insert", "x":15.25, "y":1.5}, 
+                {"label":"Home", "x":16.25, "y":1.5}, 
+                {"label":"PgUp", "x":17.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":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":"|", "x":13.5, "y":2.5, "w":1.5}, 
+                {"label":"Delete", "x":15.25, "y":2.5}, 
+                {"label":"End", "x":16.25, "y":2.5}, 
+                {"label":"PgDn", "x":17.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":6.75, "y":3.5}, 
+                {"label":"J", "x":7.75, "y":3.5}, 
+                {"label":"K", "x":8.75, "y":3.5}, 
+                {"label":"L", "x":9.75, "y":3.5}, 
+                {"label":":", "x":10.75, "y":3.5}, 
+                {"label":"\"", "x":11.75, "y":3.5}, 
+                {"label":"Enter", "x":12.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":"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":"Up", "x":16.25, "y":4.5}, 
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
+                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25}, 
+                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
+                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
+                {"label":"Left", "x":15.25, "y":5.5}, 
+                {"label":"Down", "x":16.25, "y":5.5}, 
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "key_count": 84,
+            "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.5, "y":0}, 
+                {"label":"F6", "x":7.5, "y":0}, 
+                {"label":"F7", "x":8.5, "y":0}, 
+                {"label":"F8", "x":9.5, "y":0}, 
+                {"label":"F9", "x":11, "y":0}, 
+                {"label":"F10", "x":12, "y":0}, 
+                {"label":"F11", "x":13, "y":0}, 
+                {"label":"F12", "x":14, "y":0}, 
+                {"label":"PrtSc", "x":15.25, "y":0}, 
+                {"label":"Scroll Lock", "x":16.25, "y":0}, 
+                {"label":"Pause", "x":17.25, "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":"Backspace", "x":13, "y":1.5, "w":2}, 
+                {"label":"Insert", "x":15.25, "y":1.5}, 
+                {"label":"Home", "x":16.25, "y":1.5}, 
+                {"label":"PgUp", "x":17.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":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":"|", "x":13.5, "y":2.5, "w":1.5}, 
+                {"label":"Delete", "x":15.25, "y":2.5}, 
+                {"label":"End", "x":16.25, "y":2.5}, 
+                {"label":"PgDn", "x":17.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":6.75, "y":3.5}, 
+                {"label":"J", "x":7.75, "y":3.5}, 
+                {"label":"K", "x":8.75, "y":3.5}, 
+                {"label":"L", "x":9.75, "y":3.5}, 
+                {"label":":", "x":10.75, "y":3.5}, 
+                {"label":"\"", "x":11.75, "y":3.5}, 
+                {"label":"Enter", "x":12.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":"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":"Up", "x":16.25, "y":4.5}, 
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, 
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, 
+                {"label":"Space", "x":4, "y":5.5, "w":7}, 
+                {"label":"Alt", "x":11, "y":5.5, "w":1.5}, 
+                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, 
+                {"label":"Left", "x":15.25, "y":5.5}, 
+                {"label":"Down", "x":16.25, "y":5.5}, 
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "key_count": 88,
+            "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.5, "y":0}, 
+                {"label":"F6", "x":7.5, "y":0}, 
+                {"label":"F7", "x":8.5, "y":0}, 
+                {"label":"F8", "x":9.5, "y":0}, 
+                {"label":"F9", "x":11, "y":0}, 
+                {"label":"F10", "x":12, "y":0}, 
+                {"label":"F11", "x":13, "y":0}, 
+                {"label":"F12", "x":14, "y":0}, 
+                {"label":"PrtSc", "x":15.25, "y":0}, 
+                {"label":"Scroll Lock", "x":16.25, "y":0}, 
+                {"label":"Pause", "x":17.25, "y":0}, 
+                {"label":"\u00ac", "x":0, "y":1.5}, 
+                {"label":"!", "x":1, "y":1.5}, 
+                {"label":"\"", "x":2, "y":1.5}, 
+                {"label":"\u00a3", "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":"Backspace", "x":13, "y":1.5, "w":2}, 
+                {"label":"Insert", "x":15.25, "y":1.5}, 
+                {"label":"Home", "x":16.25, "y":1.5}, 
+                {"label":"PgUp", "x":17.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":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":"Delete", "x":15.25, "y":2.5}, 
+                {"label":"End", "x":16.25, "y":2.5}, 
+                {"label":"PgDn", "x":17.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":6.75, "y":3.5}, 
+                {"label":"J", "x":7.75, "y":3.5}, 
+                {"label":"K", "x":8.75, "y":3.5}, 
+                {"label":"L", "x":9.75, "y":3.5}, 
+                {"label":":", "x":10.75, "y":3.5}, 
+                {"label":"@", "x":11.75, "y":3.5}, 
+                {"label":"~", "x":12.75, "y":3.5}, 
+                {"label":"Enter", "x":13.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":"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":"Up", "x":16.25, "y":4.5}, 
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, 
+                {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, 
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, 
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, 
+                {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, 
+                {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, 
+                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, 
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, 
+                {"label":"Left", "x":15.25, "y":5.5}, 
+                {"label":"Down", "x":16.25, "y":5.5}, 
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "key_count": 85,
+            "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.5, "y":0}, 
+                {"label":"F6", "x":7.5, "y":0}, 
+                {"label":"F7", "x":8.5, "y":0}, 
+                {"label":"F8", "x":9.5, "y":0}, 
+                {"label":"F9", "x":11, "y":0}, 
+                {"label":"F10", "x":12, "y":0}, 
+                {"label":"F11", "x":13, "y":0}, 
+                {"label":"F12", "x":14, "y":0}, 
+                {"label":"PrtSc", "x":15.25, "y":0}, 
+                {"label":"Scroll Lock", "x":16.25, "y":0}, 
+                {"label":"Pause", "x":17.25, "y":0}, 
+                {"label":"\u00ac", "x":0, "y":1.5}, 
+                {"label":"!", "x":1, "y":1.5}, 
+                {"label":"\"", "x":2, "y":1.5}, 
+                {"label":"\u00a3", "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":"Backspace", "x":13, "y":1.5, "w":2}, 
+                {"label":"Insert", "x":15.25, "y":1.5}, 
+                {"label":"Home", "x":16.25, "y":1.5}, 
+                {"label":"PgUp", "x":17.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":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":"Delete", "x":15.25, "y":2.5}, 
+                {"label":"End", "x":16.25, "y":2.5}, 
+                {"label":"PgDn", "x":17.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":6.75, "y":3.5}, 
+                {"label":"J", "x":7.75, "y":3.5}, 
+                {"label":"K", "x":8.75, "y":3.5}, 
+                {"label":"L", "x":9.75, "y":3.5}, 
+                {"label":":", "x":10.75, "y":3.5}, 
+                {"label":"@", "x":11.75, "y":3.5}, 
+                {"label":"~", "x":12.75, "y":3.5}, 
+                {"label":"Enter", "x":13.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":"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":"Up", "x":16.25, "y":4.5}, 
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, 
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, 
+                {"label":"Space", "x":4, "y":5.5, "w":7}, 
+                {"label":"AltGr", "x":11, "y":5.5, "w":1.5}, 
+                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, 
+                {"label":"Left", "x":15.25, "y":5.5}, 
+                {"label":"Down", "x":16.25, "y":5.5}, 
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        }
+    }
+}
+
index abdba99ba79dd9072e651f3ff962381b32345ca2..213f65a4a26240f06915f857f5d89cecf9c4c06c 100644 (file)
@@ -2,12 +2,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-       LAYOUT_ansi_wk(
-       KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                            KC_PSCR, KC_SLCK, KC_PAUS, \
+  LAYOUT_tkl_ansi(
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS, \
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,           KC_INS,KC_HOME, KC_PGUP,   \
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC, KC_BSLS,           KC_DEL, KC_END, KC_PGDN,   \
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,          KC_ENT,                                    \
     KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,                         KC_UP,             \
     KC_LCTL,KC_LGUI,KC_LALT,                                  KC_SPC,                 KC_RALT,KC_RGUI, KC_APP,KC_RCTL,          KC_LEFT,KC_DOWN,KC_RGHT
-       )
+  )
 };
+
index aeb61ff2cabb8e5aed6f9ce123ae376be365af79..d566f1a21014fcfa3df34534703967a6e48c5cbd 100644 (file)
@@ -2,12 +2,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-       LAYOUT_ansi_wkl(
-       KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                            KC_PSCR, KC_SLCK, KC_PAUS, \
+  LAYOUT_tkl_ansi_wkl(
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS, \
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,           KC_INS,KC_HOME, KC_PGUP,   \
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC, KC_BSLS,           KC_DEL, KC_END, KC_PGDN,   \
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,          KC_ENT,                                    \
     KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,                          KC_UP,            \
     KC_LCTL,        KC_LALT,                                  KC_SPC,                 KC_RALT,      KC_RCTL,                    KC_LEFT,KC_DOWN,KC_RGHT
-       )
+  )
 };
+
index a7522fe25a2798b905b9a87c1664b6c21a8b4560..a4c38cd54ee0697cd781da852b466ccc881e86f2 100644 (file)
@@ -2,12 +2,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-       LAYOUT_all(
-       KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                            KC_PSCR, KC_SLCK, KC_PAUS, \
+  LAYOUT_all(
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS, \
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,  KC_INS,KC_HOME, KC_PGUP,   \
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC, KC_BSLS,           KC_DEL, KC_END, KC_PGDN,   \
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,         KC_NO,  KC_NO, KC_NO,      \
     KC_LSFT,KC_NUBS,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,        KC_NO,  KC_UP, KC_NO,      \
     KC_LCTL,KC_LGUI,KC_LALT,                                  KC_SPC,                 KC_RALT,KC_RGUI, KC_APP,KC_RCTL,          KC_LEFT,KC_DOWN,KC_RGHT
-       )
+  )
 };
+
index 882cb224a6016925757552b3d644351ae3397037..a71795ccf0a8680025cc438cd0d7f9e26e6c3df4 100644 (file)
@@ -2,12 +2,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-       LAYOUT_iso_wk(
-       KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                            KC_PSCR, KC_SLCK, KC_PAUS, \
+  LAYOUT_tkl_iso(
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS, \
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,           KC_INS,KC_HOME, KC_PGUP,   \
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC,                    KC_DEL, KC_END, KC_PGDN,   \
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,                                    \
     KC_LSFT,  KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,                         KC_UP,             \
     KC_LCTL,KC_LGUI,KC_LALT,                                  KC_SPC,                 KC_RALT,KC_RGUI, KC_APP,KC_RCTL,          KC_LEFT,KC_DOWN,KC_RGHT
-       )
+  )
 };
+
index 18ba79e1f95192bb2f0b1b145366273476c36023..d40257177dde18917db12cdc4d225666b157de4e 100644 (file)
@@ -2,12 +2,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-       LAYOUT_iso_wkl(
-       KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,                            KC_PSCR, KC_SLCK, KC_PAUS, \
+  LAYOUT_tkl_iso_wkl(
+    KC_ESC,           KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,            KC_PSCR, KC_SLCK, KC_PAUS, \
     KC_GRV,   KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,KC_MINS, KC_EQL,  KC_BSPC,           KC_INS,KC_HOME, KC_PGUP,   \
     KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,KC_LBRC, KC_RBRC,                    KC_DEL, KC_END, KC_PGDN,   \
     KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT,                                    \
     KC_LSFT,  KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH, KC_RSFT,                         KC_UP,             \
     KC_LCTL,        KC_LALT,                                  KC_SPC,                 KC_RALT,                KC_RCTL,          KC_LEFT,KC_DOWN,KC_RGHT
-       )
+  )
 };
+
index 8f94df4b92f7c2afdec227606d2e63c5b72a0fbd..51775f2414902b38d7750b89e84010b6e28faaad 100644 (file)
@@ -1,14 +1,14 @@
 # XMMX
 
-XMMX: Tenkeyless Mechanical Keyboard PCB designed to fit Filco Majestouch TKL and Cooler Master Quickfire Rapid cases
+XMMX is a Tenkeyless Mechanical Keyboard PCB designed to fit Filco Majestouch TKL and Cooler Master Quickfire Rapid cases. 
 
-XMMX schematic and PCB are available opensource under Creative Commons BY-SA 3.0 license on EasyEDA at [this link](https://easyeda.com/farmakon/XMMX-0447d28c1e4644b88fd04905d983684d)
+XMMX schematic and PCB are available opensource under Creative Commons BY-SA 3.0 license on EasyEDA at [this link](https://easyeda.com/farmakon/XMMX-0447d28c1e4644b88fd04905d983684d).
 
-For more informations on the XMMX please visit this [geekhack.org thread](https://geekhack.org/index.php?topic=93422.0)
+For more informations on the XMMX please visit [this geekhack.org thread](https://geekhack.org/index.php?topic=93422.0).
 
-Make examples for these keyboards (after setting up your build environment):
+Make example for this keyboard (after setting up your build environment):
 
     make xmmx:default
 
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
index 22d0f1480d8d9f2ab11b7e3c4b4009fb1b44623f..82c3fb5882a68da07f633c25ce8f97e7104da7d2 100644 (file)
@@ -1,5 +1,4 @@
-#ifndef XMMX
-#define XMMX
+#pragma once
 
 #include "quantum.h"
 
@@ -21,7 +20,7 @@
 }
 
 // 80% keyboard: ANSI Winkey
-#define LAYOUT_ansi_wk( \
+#define LAYOUT_tkl_ansi( \
        K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
@@ -38,7 +37,7 @@
 }
 
 // 80% keyboard: ANSI Winkeyless
-#define LAYOUT_ansi_wkl( \
+#define LAYOUT_tkl_ansi_wkl( \
        K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
@@ -55,7 +54,7 @@
 }
 
 // 80% keyboard: ISO Winkey
-#define LAYOUT_iso_wk( \
+#define LAYOUT_tkl_iso( \
        K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, \
@@ -72,7 +71,7 @@
 }
 
 // 80% keyboard: ISO Winkeyless
-#define LAYOUT_iso_wkl( \
+#define LAYOUT_tkl_iso_wkl( \
        K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, K015, K016, \
        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, \
@@ -88,4 +87,3 @@
        { K500, KC_NO,K502, KC_NO,KC_NO,KC_NO,KC_NO,K507, KC_NO,KC_NO,KC_NO,K511, KC_NO,K513, K514, K515, K516 }  \
 }
 
-#endif