From 0a2a7641558a80aeb115c14cb99655132c30413b Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 26 Jan 2022 11:23:18 -0800 Subject: Krush60 Solder Refactor (#16029) * solder.h: add matrix diagram * solder.h: remove unnecessary comments * rework LAYOUT_60_iso to LAYOUT_60_isoenter_split_bs True ISO layouts are not supported on this keyboard because the PCB lacks support for split Left Shift. Renames the `iso` to `isoenter` to specify this. - denotes use of Split Backspace - move Backslash keycode to home row * info.json: remove trailing whitespace * info.json: clean up Sort the layout trees into the same order as `solder.h`, and remove the `LAYOUT_60_all` tree (doesn't exist in source). * solder.h: align positional arguments Helps me proof-read the layouts at a glance. No logic change. * fix syntax errors in keymaps * remove ISO layouts As previously noted, ISO layouts are not supported due to the PCB's lack of support for split Left Shift. * rename LAYOUT_60_ansi_tsangan_split_bs to LAYOUT_60_tsangan_hhkb Also renames `60_tsangan_splt_bs` keymap to `60_tsangan_hhkb`. * rename LAYOUT_60_ansi_tsangan to LAYOUT_60_ansi_tsangan_split_rshift Also renames `60_tsangan` keymap to `60_ansi_tsangan_split_rshift`. * rename LAYOUT_60_ansi_arrow_split_bs_7u_spc to LAYOUT_60_ansi_arrow_tsangan_split_bs Also rename `60_ansi_arrow_splt_bs_7u` to `60_ansi_arrow_tsangan_split_bs`. * rename LAYOUT_60_ansi_arrow_7u_spc to LAYOUT_60_ansi_arrow_tsangan Also renames `60_ansi_arrow_7u` keymap to `60_ansi_arrow_tsangan`. * rename keymaps based on layout macro used Making this easier to track in my head while I work on it. * info.json: fix syntax errors * rename LAYOUT_60_ansi_split_bs_7u_spc to LAYOUT_60_ansi_tsangan_split_bs - renames `60_ansi_split_bs_7u_spc` keymap to `60_ansi_tsangan_split_bs` - removes `layout_aliases` entry from `info.json` (creates incompatible data conflict) * rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan - renames `60_ansi_7u_spc` keymap to `60_ansi_tsangan` * info.json: remove LAYOUT_60_ansi_tsangan layout_aliases entry Causes an incompatible data conflict. * add second layer to 60_ansi keymap * update via keymap Now matches the behaviour of the default keymap. * fix syntax errors in keymaps, take 2 * add RGB and Navigation keycodes Adds RGB and Navigation keycodes to the `60_isoenter_split_bs`, `default` and `via` keymaps. --- .../sawnsprojects/krush/krush60/solder/info.json | 551 +++++++-------------- 1 file changed, 173 insertions(+), 378 deletions(-) (limited to 'keyboards/sawnsprojects/krush/krush60/solder/info.json') diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json index 79f0aed87f..d95c475509 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json @@ -2,6 +2,10 @@ "keyboard_name": "Krush60 Solder", "url": "", "maintainer": "MaiTheSan", + "layout_aliases": { + "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs", + "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan" + }, "layouts": { "LAYOUT_all": { "layout": [ @@ -74,7 +78,7 @@ {"x":10, "y": 4}, {"x":11, "y": 4}, {"x":12, "y": 4}, - {"x":13, "y": 4}, + {"x":13, "y": 4}, {"x":14, "y": 4} ] }, @@ -147,78 +151,7 @@ {"x":13.75, "y":4, "w":1.25} ] }, - "LAYOUT_60_ansi_arrow": { - "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, "w":1.75}, - {"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}, - {"x":3.75, "y": 4, "w": 6.25}, - {"x":10, "y": 4}, - {"x":11, "y": 4}, - {"x":12, "y": 4}, - {"x":13, "y": 4}, - {"x":14, "y": 4} - ] - }, - "LAYOUT_60_ansi_arrow_split_bs_7u_spc": { + "LAYOUT_60_isoenter_split_bs": { "layout": [ {"x":0, "y":0}, {"x":1, "y":0}, @@ -249,7 +182,6 @@ {"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}, @@ -263,9 +195,10 @@ {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, + {"x":12.75, "y":2}, + {"x":13.75, "y":1, "w":1.25, "h":2}, - {"x":0, "y":3, "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}, @@ -275,18 +208,17 @@ {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, - {"x":11.25, "y":3, "w":1.75}, - {"x":13, "y":3}, - {"x":14, "y":3}, + {"x":11.25, "y":3}, + {"x":12.25, "y":3, "w":2.75}, - {"x":0, "y": 4, "w": 1.5}, - {"x":1.5, "y": 4}, - {"x":2.5, "y": 4, "w": 1.5}, - {"x":4, "y": 4, "w": 7}, - {"x":11, "y": 4}, - {"x":12, "y": 4}, - {"x":13, "y": 4}, - {"x":14, "y": 4} + {"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} ] }, "LAYOUT_60_ansi_split_bs": { @@ -502,7 +434,7 @@ {"x":13.75, "y":4, "w":1.25} ] }, - "LAYOUT_60_ansi_7u_spc": { + "LAYOUT_60_ansi_tsangan": { "layout": [ {"x":0, "y":0}, {"x":1, "y":0}, @@ -567,10 +499,10 @@ {"x":4, "y": 4, "w": 7}, {"x":11, "y": 4, "w": 1.5}, {"x":12.5, "y": 4}, - {"x":13.5, "y": 4, "w": 1.5}, + {"x":13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_ansi_split_bs_7u_spc": { + "LAYOUT_60_ansi_tsangan_split_bs": { "layout": [ {"x":0, "y":0}, {"x":1, "y":0}, @@ -636,7 +568,7 @@ {"x": 4, "y": 4, "w": 7}, {"x": 11, "y": 4, "w": 1.5}, {"x": 12.5, "y": 4}, - {"x": 13.5, "y": 4, "w": 1.5}, + {"x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_ansi_arrow_split_bs": { @@ -707,7 +639,7 @@ {"x":10, "y": 4}, {"x":11, "y": 4}, {"x":12, "y": 4}, - {"x":13, "y": 4}, + {"x":13, "y": 4}, {"x":14, "y": 4} ] }, @@ -780,7 +712,7 @@ {"x":10, "y": 4}, {"x":11, "y": 4}, {"x":12, "y": 4}, - {"x":13, "y": 4}, + {"x":13, "y": 4}, {"x":14, "y": 4} ] }, @@ -854,11 +786,11 @@ {"x":10, "y": 4}, {"x":11, "y": 4}, {"x":12, "y": 4}, - {"x":13, "y": 4}, + {"x":13, "y": 4}, {"x":14, "y": 4} ] }, - "LAYOUT_60_ansi_arrow_7u_spc": { + "LAYOUT_60_ansi_arrow_tsangan": { "layout": [ {"x": 0, "y": 0}, {"x": 1, "y": 0}, @@ -928,7 +860,149 @@ {"x":14, "y": 4} ] }, - "LAYOUT_60_ansi_tsangan": { + "LAYOUT_60_ansi_arrow": { + "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, "w":1.75}, + {"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}, + {"x":3.75, "y": 4, "w": 6.25}, + {"x":10, "y": 4}, + {"x":11, "y": 4}, + {"x":12, "y": 4}, + {"x":13, "y": 4}, + {"x":14, "y": 4} + ] + }, + "LAYOUT_60_ansi_arrow_tsangan_split_bs": { + "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, "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, "w":1.75}, + {"x":13, "y":3}, + {"x":14, "y":3}, + + {"x":0, "y": 4, "w": 1.5}, + {"x":1.5, "y": 4}, + {"x":2.5, "y": 4, "w": 1.5}, + {"x":4, "y": 4, "w": 7}, + {"x":11, "y": 4}, + {"x":12, "y": 4}, + {"x":13, "y": 4}, + {"x":14, "y": 4} + ] + }, + "LAYOUT_60_ansi_tsangan_split_rshift": { "layout": [ {"x": 0, "y": 0}, {"x": 1, "y": 0}, @@ -994,10 +1068,10 @@ {"x": 4, "y": 4, "w": 7}, {"x": 11, "y": 4, "w": 1.5}, {"x": 12.5, "y": 4}, - {"x": 13.5, "y": 4, "w": 1.5}, + {"x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_ansi_tsangan_split_bs": { + "LAYOUT_60_tsangan_hhkb": { "layout": [ {"x": 0, "y": 0}, {"x": 1, "y": 0}, @@ -1064,286 +1138,7 @@ {"x": 4, "y": 4, "w": 7}, {"x": 11, "y": 4, "w": 1.5}, {"x": 12.5, "y": 4}, - {"x": 13.5, "y": 4, "w": 1.5}, - ] - }, - "LAYOUT_60_iso_tsangan": { - "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":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":1, "w":1.25, "h":2}, - - {"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": 1.75}, - {"x": 14, "y": 3}, - - {"x":0, "y": 4, "w": 1.5}, - {"x":1.5, "y": 4}, - {"x":2.5, "y": 4, "w": 1.5}, - {"x":4, "y": 4, "w": 7}, - {"x":11, "y": 4, "w": 1.5}, - {"x":12.5, "y": 4}, - {"x":13.5, "y": 4, "w": 1.5}, - ] - }, - "LAYOUT_60_iso": { - "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":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":1, "w":1.25, "h":2}, - - {"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} - ] - }, - "LAYOUT_60_iso_tsangan": { - "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":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":1, "w":1.25, "h":2}, - - {"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": 1.75}, - {"x": 14, "y": 3}, - - {"x":0, "y": 4, "w": 1.5}, - {"x":1.5, "y": 4}, - {"x":2.5, "y": 4, "w": 1.5}, - {"x":4, "y": 4, "w": 7}, - {"x":11, "y": 4, "w": 1.5}, - {"x":12.5, "y": 4}, - {"x":13.5, "y": 4, "w": 1.5}, - ] - }, - "LAYOUT_60_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, "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":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":1, "w":1.25, "h":2}, - - {"x":0, "y":3, "w":2}, - {"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.5}, - {"x":1.5, "y": 4}, - {"x":2.5, "y": 4, "w": 1.5}, - {"x":4, "y": 4, "w": 7}, - {"x":11, "y": 4, "w": 1.5}, - {"x":12.5, "y": 4}, - {"x":13.5, "y": 4, "w": 1.5}, + {"x": 13.5, "y": 4, "w": 1.5} ] } } -- cgit v1.2.3