summaryrefslogtreecommitdiffstats
path: root/keyboards/melgeek/mj6xy
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2022-10-27 09:52:21 -0700
committerGitHub <noreply@github.com>2022-10-27 09:52:21 -0700
commit84569788d59ab01f0dec22aed53450bdfae5230e (patch)
tree7dc8103ad63c670bbc8ad79d56c956396e544934 /keyboards/melgeek/mj6xy
parent20ce76f48c4c8c0978b6b78075319b41bb503c76 (diff)
MelGeek MJ6XY Refactor (#18862)
* mj6xy.h: convert tabs to spaces * info.json: convert tabs to spaces * info.json: apply friendly formatting Whitespace-only change. * rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan - rename `60_ansi_7u_spc` keymap to `default_ansi_tsangan` * add K31 position to LAYOUT_60_iso * rename LAYOUT_60_iso_7u_spc_split_rshift to LAYOUT_60_iso_tsangan_split_rshift - rename `60_iso_7u_spc_split_rshift` keymap to `default_iso_tsangan_split_rshift` * add K31 position to LAYOUT_60_iso_arrow * add K31 position to LAYOUT_60_iso_arrow_6u_spc * add K31 position to LAYOUT_60_iso_arrow_3u_spc * refactor LAYOUT_60_iso_7u_spc into LAYOUT_60_iso_tsangan - add K31 position to layout macro - rename `60_iso_7u_spc` keymap to `default_iso_tsangan` * add K31 position to LAYOUT_64_iso - rename `64_iso` keymap to `default_64_iso` * add K31 position to LAYOUT_64_iso_3u_spc - rename `64_iso_3u_spc` keymap to `default_64_iso_3u_spc` * add K31 position to LAYOUT_64_iso_split_3u_spc - rename `64_iso_split_3u_spc` keymap to `default_64_iso_split_3u_spc` * remove LAYOUT_60_iso_1u_lshift_split_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_split_rshift`. * remove LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_tsangan_split_rshift`. * rename LAYOUT_60_ansi_7u_spc_split_bs to LAYOUT_60_ansi_tsangan_split_bs - rename `60_ansi_7u_spc_split_bs` keymap to `default_60_ansi_tsangan_split_bs` * add K31 position to LAYOUT_60_iso_split_bs * rename LAYOUT_60_iso_7u_spc_split_bs_rshift to LAYOUT_60_iso_tsangan_split_bs_rshift - rename `60_iso_7u_spc_split_bs_rshift` keymap to `default_60_iso_tsangan_split_bs_rshift` * add K31 position to LAYOUT_60_iso_arrow_split_bs * add K31 position to LAYOUT_60_iso_arrow_3u_spc_split_bs - rename `60_iso_arrow_3u_spc_split_bs` keymap to `default_60_iso_arrow_3u_spc_split_bs` * add K31 position to LAYOUT_60_iso_arrow_split_bs_3u_spc - rename `60_iso_arrow_split_bs_3u_spc` keymap to `default_60_iso_arrow_split_bs_3u_spc` * refactor LAYOUT_60_iso_7u_spc_split_bs into LAYOUT_60_iso_tsangan_split_bs - add K31 position to layout macro - rename `60_iso_7u_spc_split_bs` keymap to `default_60_iso_tsangan_split_bs` * add K31 position to LAYOUT_64_iso_split_bs - rename `64_iso_split_bs` keymap to `default_64_iso_split_bs` * add K31 position to LAYOUT_64_iso_3u_spc_split_bs rename `64_iso_3u_spc_split_bs` keymap to `default_64_iso_3u_spc_split_bs` * add K31 position to LAYOUT_64_iso_split_bs_3u_spc - rename `64_iso_split_bs_3u_spc` keymap to `default_64_iso_split_bs_3u_spc` * remove LAYOUT_60_ansi_arrow_6u_spc macro and keymap Functionally identical to `LAYOUT_60_ansi_arrow`. * remove LAYOUT_64_ansi_6u_spc macro and keymap Functionally identical to `LAYOUT_64_ansi`. * remove LAYOUT_60_iso_arrow_6u_spc macro and keymap Functionally identical to `LAYOUT_60_iso_arrow`. * remove LAYOUT_64_iso_6u_spc macro and keymap Functionally identical to `LAYOUT_64_iso`. * remove LAYOUT_60_ansi_arrow_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_60_ansi_arrow_split_bs`. * remove LAYOUT_64_ansi_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_64_ansi_split_bs`. * remove LAYOUT_60_iso_arrow_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_60_iso_arrow_split_bs`. * remove LAYOUT_64_iso_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_64_iso_split_bs`. * remove LAYOUT_60_iso_1u_lshift_split_bs_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_split_bs_rshift`. * remove LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_tsangan_split_bs_rshift`. * refactor keymaps - convert tabs to spaces - update keycode grid alignment * remove LAYOUT_60_ansi_arrow_3u_spc macro and keymap Subset of `LAYOUT_60_ansi_arrow_3u_spc_split_bs`. * remove LAYOUT_60_iso_arrow_3u_spc macro and keymap Subset of `LAYOUT_60_iso_arrow_3u_spc_split_bs`. * remove LAYOUT_60_iso_tsangan_split_bs macro and keymap Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`. * remove LAYOUT_60_iso_tsangan_split_rshift macro and keymap Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`. * remove LAYOUT_64_ansi_3u_spc macro and keymap Subset of `LAYOUT_64_ansi_3u_spc_split_bs`. * remove LAYOUT_64_iso_3u_spc macro and keymap Subset of `LAYOUT_64_iso_3u_spc_split_bs`. * remove LAYOUT_60_iso_split_bs macro and keymap Subset of `LAYOUT_60_iso_split_bs_rshift`. * remove LAYOUT_60_iso_split_rshift macro and keymap Subset of `LAYOUT_60_iso_split_bs_rshift`. * add LAYOUT_60_ansi_split_bs_rshift macro and keymap * remove LAYOUT_60_ansi_split_bs macro and keymap Subset of `LAYOUT_60_ansi_split_bs_rshift`. * add LAYOUT_60_tsangan_hhkb macro and keymap * remove LAYOUT_60_ansi_tsangan_split_bs macro and keymap Subset of `LAYOUT_60_tsangan_hhkb`. * standardize keymap names Rename all keymaps per QMK guidelines (e.g. keymap using `LAYOUT_60_ansi_arrow` should be named `default_60_ansi_arrow`). * add LAYOUT_all; refactor default keymap Add a `LAYOUT_all` macro, and update the `default` keymap to use the new macro. * refactor via keymap Update the `via` keymap to match the behaviour of the `default` keymap. * improve keyboard readme - fix broken image reference - improve grammar on keyboard description - fix Hardware Availability link - fix `make` instructions - add bootloader and flashing instructions * fix default_60_tsangan_hhkb keymap Fix a keycode count mismatch. * mj6xy.h: add matrix diagram * KC_GESC -> QK_GESC per fauxpark * KC_SLCK -> KC_SCRL per fauxpark
Diffstat (limited to 'keyboards/melgeek/mj6xy')
-rwxr-xr-xkeyboards/melgeek/mj6xy/info.json5469
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c36
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c39
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c39
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c39
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c39
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c39
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c39
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c39
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c39
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default/keymap.c26
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_arrow_split_bs_3u_spc/keymap.c35
-rw-r--r--keyboards/melgeek/mj6xy/keymaps/default_60_ansi_split_bs_rshift/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_ansi_tsangan/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_arrow_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_split_bs_rshift/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_60_iso_tsangan_split_bs_rshift/keymap.c35
-rw-r--r--keyboards/melgeek/mj6xy/keymaps/default_60_tsangan_hhkb/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_ansi_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso_3u_spc_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso_split_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/default_64_iso_split_bs_3u_spc/keymap.c35
-rwxr-xr-xkeyboards/melgeek/mj6xy/keymaps/via/keymap.c54
-rwxr-xr-xkeyboards/melgeek/mj6xy/mj6xy.h468
-rwxr-xr-xkeyboards/melgeek/mj6xy/readme.md23
81 files changed, 3231 insertions, 5502 deletions
diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json
index 7bd66020b0..cdd2e05749 100755
--- a/keyboards/melgeek/mj6xy/info.json
+++ b/keyboards/melgeek/mj6xy/info.json
@@ -8,3455 +8,2126 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "layout_aliases": {
+ "LAYOUT_60_ansi_7u_spc": "LAYOUT_60_ansi_tsangan",
+ "LAYOUT_60_iso_7u_spc_split_bs_rshift": "LAYOUT_60_iso_tsangan_split_bs_rshift",
+ "LAYOUT_60_ansi_arrow_6u_spc": "LAYOUT_60_ansi_arrow",
+ "LAYOUT_64_ansi_6u_spc": "LAYOUT_64_ansi",
+ "LAYOUT_60_iso_arrow_6u_spc": "LAYOUT_60_iso_arrow",
+ "LAYOUT_64_iso_6u_spc": "LAYOUT_64_iso",
+ "LAYOUT_60_ansi_arrow_6u_spc_split_bs": "LAYOUT_60_ansi_arrow_split_bs",
+ "LAYOUT_64_ansi_6u_spc_split_bs": "LAYOUT_64_ansi_split_bs",
+ "LAYOUT_60_iso_arrow_6u_spc_split_bs": "LAYOUT_60_iso_arrow_split_bs",
+ "LAYOUT_64_iso_6u_spc_split_bs": "LAYOUT_64_iso_split_bs",
+ "LAYOUT_60_iso_1u_lshift_split_bs_rshift": "LAYOUT_60_iso_split_bs_rshift",
+ "LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift": "LAYOUT_60_iso_tsangan_split_bs_rshift"
+ },
"layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":13.5, "y":1, "w":1.5},
+
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2},
+ {"x":13.75, "y":2, "w":1.25},
+
+ {"x":0, "y":3},
+ {"x":1, "y":3},
+ {"x":2, "y":3},
+ {"x":3, "y":3},
+ {"x":4, "y":3},
+ {"x":5, "y":3},
+ {"x":6, "y":3},
+ {"x":7, "y":3},
+ {"x":8, "y":3},
+ {"x":9, "y":3},
+ {"x":10, "y":3},
+ {"x":11, "y":3},
+ {"x":12, "y":3},
+ {"x":13, "y":3},
+ {"x":14, "y":3},
+
+ {"x":0, "y":4, "w":1.25},
+ {"x":1.25, "y":4, "w":1.25},
+ {"x":2.5, "y":4, "w":1.25},
+ {"label":"1.25u Left Mod / 3u Left Spacebar", "x":3.75, "y":4, "w":1.25},
+ {"label":"3u Center/6u/6.25u Spacebar", "x":5, "y":4, "w":2},
+ {"label":"7u Spacebar", "x":7, "y":4},
+ {"label":"3u Right Spacebar", "x":8, "y":4},
+ {"label":"1.25u Right Mod", "x":9, "y":4},
+ {"x":10, "y":4},
+ {"x":11, "y":4},
+ {"x":12, "y":4},
+ {"x":13, "y":4},
+ {"x":14, "y":4}
+ ]
+ },
"LAYOUT_60_ansi": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0, "w": 2},
-
- {"x": 0, "y": 1, "w": 1.5},
- {"x": 1.5, "y": 1},
- {"x": 2.5, "y": 1},
- {"x": 3.5, "y": 1},
- {"x": 4.5, "y": 1},
- {"x": 5.5, "y": 1},
- {"x": 6.5, "y": 1},
- {"x": 7.5, "y": 1},
- {"x": 8.5, "y": 1},
- {"x": 9.5, "y": 1},
- {"x": 10.5, "y": 1},
- {"x": 11.5, "y": 1},
- {"x": 12.5, "y": 1},
- {"x": 13.5, "y": 1, "w": 1.5},
-
- {"x": 0, "y": 2, "w": 1.75},
- {"x": 1.75, "y": 2},
- {"x": 2.75, "y": 2},
- {"x": 3.75, "y": 2},
- {"x": 4.75, "y": 2},
- {"x": 5.75, "y": 2},
- {"x": 6.75, "y": 2},
- {"x": 7.75, "y": 2},
- {"x": 8.75, "y": 2},
- {"x": 9.75, "y": 2},
- {"x": 10.75, "y": 2},
- {"x": 11.75, "y": 2},
- {"x": 12.75, "y": 2, "w": 2.25},
-
- {"x": 0, "y": 3, "w": 2.25},
- {"x": 2.25, "y": 3},
- {"x": 3.25, "y": 3},
- {"x": 4.25, "y": 3},
- {"x": 5.25, "y": 3},
- {"x": 6.25, "y": 3},
- {"x": 7.25, "y": 3},
- {"x": 8.25, "y": 3},
- {"x": 9.25, "y": 3},
- {"x": 10.25, "y": 3},
- {"x": 11.25, "y": 3},
- {"x": 12.25, "y": 3, "w": 2.75},
-
- {"x": 0, "y": 4, "w": 1.25},
- {"x": 1.25, "y": 4, "w": 1.25},
- {"x": 2.5, "y": 4, "w": 1.25},
- {"x": 3.75, "y": 4, "w": 6.25},
- {"x": 10, "y": 4, "w": 1.25},
- {"x": 11.25, "y": 4, "w": 1.25},
- {"x": 12.5, "y": 4, "w": 1.25},
- {"x": 13.75, "y": 4, "w": 1.25}
- ]
- },
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0, "w":2},
+
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":13.5, "y":1, "w":1.5},
+
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2, "w":2.25},
+
+ {"x":0, "y":3, "w":2.25},
+ {"x":2.25, "y":3},
+ {"x":3.25, "y":3},
+ {"x":4.25, "y":3},
+ {"x":5.25, "y":3},
+ {"x":6.25, "y":3},
+ {"x":7.25, "y":3},
+ {"x":8.25, "y":3},
+ {"x":9.25, "y":3},
+ {"x":10.25, "y":3},
+ {"x":11.25, "y":3},
+ {"x":12.25, "y":3, "w":2.75},
+
+ {"x":0, "y":4, "w":1.25},
+ {"x":1.25, "y":4, "w":1.25},
+ {"x":2.5, "y":4, "w":1.25},
+ {"x":3.75, "y":4, "w":6.25},
+ {"x":10, "y":4, "w":1.25},
+