diff options
Diffstat (limited to 'keyboards/synthlabs')
| -rw-r--r-- | keyboards/synthlabs/060/config.h | 4 | ||||
| -rw-r--r-- | keyboards/synthlabs/060/info.json | 1206 | ||||
| -rw-r--r-- | keyboards/synthlabs/solo/config.h | 2 | ||||
| -rw-r--r-- | keyboards/synthlabs/solo/info.json | 77 | ||||
| -rw-r--r-- | keyboards/synthlabs/solo/keymaps/iidx/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/synthlabs/solo/keymaps/via/keymap.c | 6 |
6 files changed, 649 insertions, 648 deletions
diff --git a/keyboards/synthlabs/060/config.h b/keyboards/synthlabs/060/config.h index 60dfb6ad51..1870286c81 100644 --- a/keyboards/synthlabs/060/config.h +++ b/keyboards/synthlabs/060/config.h @@ -8,8 +8,6 @@ #define RGB_MATRIX_KEYPRESSES #define RGB_DISABLE_WHEN_USB_SUSPENDED -#define RGB_DI_PIN E6 - // RGB Matrix Animation modes // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects @@ -60,5 +58,3 @@ #undef ENABLE_RGB_MATRIX_DUAL_BEACON #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS - -#define FORCE_NKRO diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json index aee8d16713..1953af10e7 100644 --- a/keyboards/synthlabs/060/info.json +++ b/keyboards/synthlabs/060/info.json @@ -16,85 +16,89 @@ "rgblight": false, "rgb_matrix": true }, + "ws2812": { + "pin": "E6" + }, "matrix_pins": { - "cols": [ "D6", "D7", "B4", "B5", "B6", "C6", "C7", "D4", "D5", "D3", "D2", "D1", "D0", "B7" ], - "rows": [ "F0", "F1", "F4", "F5", "F6" ] + "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "D4", "D5", "D3", "D2", "D1", "D0", "B7"], + "rows": ["F0", "F1", "F4", "F5", "F6"] }, "usb": { "vid": "0x534E", "pid": "0x3630", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 32, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 48, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 64, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 80, "y": 0 }, - { "flags": 4, "matrix": [0, 6], "x": 96, "y": 0 }, - { "flags": 4, "matrix": [0, 7], "x":112, "y": 0 }, - { "flags": 4, "matrix": [0, 8], "x":128, "y": 0 }, - { "flags": 4, "matrix": [0, 9], "x":144, "y": 0 }, - { "flags": 4, "matrix": [0,10], "x":160, "y": 0 }, - { "flags": 4, "matrix": [0,11], "x":176, "y": 0 }, - { "flags": 4, "matrix": [0,12], "x":192, "y": 0 }, - { "flags": 1, "matrix": [0,13], "x":216, "y": 0 }, - - { "flags": 1, "matrix": [2,12], "x":220, "y":16 }, - { "flags": 4, "matrix": [1,12], "x":200, "y":16 }, - { "flags": 4, "matrix": [1,11], "x":184, "y":16 }, - { "flags": 4, "matrix": [1,10], "x":168, "y":16 }, - { "flags": 4, "matrix": [1, 9], "x":152, "y":16 }, - { "flags": 4, "matrix": [1, 8], "x":136, "y":16 }, - { "flags": 4, "matrix": [1, 7], "x":120, "y":16 }, - { "flags": 4, "matrix": [1, 6], "x":104, "y":16 }, - { "flags": 4, "matrix": [1, 5], "x": 88, "y":16 }, - { "flags": 4, "matrix": [1, 4], "x": 72, "y":16 }, - { "flags": 4, "matrix": [1, 3], "x": 56, "y":16 }, - { "flags": 4, "matrix": [1, 2], "x": 40, "y":16 }, - { "flags": 4, "matrix": [1, 1], "x": 24, "y":16 }, - { "flags": 1, "matrix": [1, 0], "x": 4, "y":16 }, - - { "flags": 1, "matrix": [2, 0], "x": 6, "y":32 }, - { "flags": 4, "matrix": [2, 1], "x": 28, "y":32 }, - { "flags": 4, "matrix": [2, 2], "x": 44, "y":32 }, - { "flags": 4, "matrix": [2, 3], "x": 60, "y":32 }, - { "flags": 4, "matrix": [2, 4], "x": 76, "y":32 }, - { "flags": 4, "matrix": [2, 5], "x": 92, "y":32 }, - { "flags": 4, "matrix": [2, 6], "x":108, "y":32 }, - { "flags": 4, "matrix": [2, 7], "x":124, "y":32 }, - { "flags": 4, "matrix": [2, 8], "x":140, "y":32 }, - { "flags": 4, "matrix": [2, 9], "x":156, "y":32 }, - { "flags": 4, "matrix": [2,10], "x":172, "y":32 }, - { "flags": 4, "matrix": [2,11], "x":188, "y":32 }, - { "flags": 1, "matrix": [2,13], "x":214, "y":32 }, - - { "flags": 1, "matrix": [3,13], "x":224, "y":48 }, - { "flags": 1, "matrix": [3,12], "x":202, "y":48 }, - { "flags": 4, "matrix": [3,11], "x":180, "y":48 }, - { "flags": 4, "matrix": [3,10], "x":164, "y":48 }, - { "flags": 4, "matrix": [3, 9], "x":148, "y":48 }, - { "flags": 4, "matrix": [3, 8], "x":132, "y":48 }, - { "flags": 4, "matrix": [3, 7], "x":116, "y":48 }, - { "flags": 4, "matrix": [3, 6], "x":100, "y":48 }, - { "flags": 4, "matrix": [3, 5], "x": 84, "y":48 }, - { "flags": 4, "matrix": [3, 4], "x": 68, "y":48 }, - { "flags": 4, "matrix": [3, 3], "x": 52, "y":48 }, - { "flags": 4, "matrix": [3, 2], "x": 36, "y":48 }, - { "flags": 1, "matrix": [3, 0], "x": 10, "y":48 }, - - { "flags": 1, "matrix": [4, 0], "x": 4, "y":64 }, - { "flags": 1, "matrix": [4, 1], "x": 24, "y":64 }, - { "flags": 1, "matrix": [4, 2], "x": 44, "y":64 }, - { "flags": 4, "matrix": [4, 5], "x": 78, "y":64 }, - { "flags": 4, "matrix": [4, 7], "x":112, "y":64 }, - { "flags": 4, "matrix": [4, 9], "x":146, "y":64 }, - { "flags": 1, "matrix": [4,11], "x":180, "y":64 }, - { "flags": 1, "matrix": [4,12], "x":200, "y":64 }, - { "flags": 1, "matrix": [4,13], "x":220, "y":64 } + {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0}, + {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0}, + {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0}, + {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0}, + {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0}, + {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0}, + {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0}, + {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0}, + {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0}, + {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0}, + {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0}, + {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0}, + {"flags": 1, "matrix": [0, 13], "x": 216, "y": 0}, + + {"flags": 1, "matrix": [2, 12], "x": 220, "y": 16}, + {"flags": 4, "matrix": [1, 12], "x": 200, "y": 16}, + {"flags": 4, "matrix": [1, 11], "x": 184, "y": 16}, + {"flags": 4, "matrix": [1, 10], "x": 168, "y": 16}, + {"flags": 4, "matrix": [1, 9], "x": 152, "y": 16}, + {"flags": 4, "matrix": [1, 8], "x": 136, "y": 16}, + {"flags": 4, "matrix": [1, 7], "x": 120, "y": 16}, + {"flags": 4, "matrix": [1, 6], "x": 104, "y": 16}, + {"flags": 4, "matrix": [1, 5], "x": 88, "y": 16}, + {"flags": 4, "matrix": [1, 4], "x": 72, "y": 16}, + {"flags": 4, "matrix": [1, 3], "x": 56, "y": 16}, + {"flags": 4, "matrix": [1, 2], "x": 40, "y": 16}, + {"flags": 4, "matrix": [1, 1], "x": 24, "y": 16}, + {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16}, + + {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32}, + {"flags": 4, "matrix": [2, 1], "x": 28, "y": 32}, + {"flags": 4, "matrix": [2, 2], "x": 44, "y": 32}, + {"flags": 4, "matrix": [2, 3], "x": 60, "y": 32}, + {"flags": 4, "matrix": [2, 4], "x": 76, "y": 32}, + {"flags": 4, "matrix": [2, 5], "x": 92, "y": 32}, + {"flags": 4, "matrix": [2, 6], "x": 108, "y": 32}, + {"flags": 4, "matrix": [2, 7], "x": 124, "y": 32}, + {"flags": 4, "matrix": [2, 8], "x": 140, "y": 32}, + {"flags": 4, "matrix": [2, 9], "x": 156, "y": 32}, + {"flags": 4, "matrix": [2, 10], "x": 172, "y": 32}, + {"flags": 4, "matrix": [2, 11], "x": 188, "y": 32}, + {"flags": 1, "matrix": [2, 13], "x": 214, "y": 32}, + + {"flags": 1, "matrix": [3, 13], "x": 224, "y": 48}, + {"flags": 1, "matrix": [3, 12], "x": 202, "y": 48}, + {"flags": 4, "matrix": [3, 11], "x": 180, "y": 48}, + {"flags": 4, "matrix": [3, 10], "x": 164, "y": 48}, + {"flags": 4, "matrix": [3, 9], "x": 148, "y": 48}, + {"flags": 4, "matrix": [3, 8], "x": 132, "y": 48}, + {"flags": 4, "matrix": [3, 7], "x": 116, "y": 48}, + {"flags": 4, "matrix": [3, 6], "x": 100, "y": 48}, + {"flags": 4, "matrix": [3, 5], "x": 84, "y": 48}, + {"flags": 4, "matrix": [3, 4], "x": 68, "y": 48}, + {"flags": 4, "matrix": [3, 3], "x": 52, "y": 48}, + {"flags": 4, "matrix": [3, 2], "x": 36, "y": 48}, + {"flags": 1, "matrix": [3, 0], "x": 10, "y": 48}, + + {"flags": 1, "matrix": [4, 0], "x": 4, "y": 64}, + {"flags": 1, "matrix": [4, 1], "x": 24, "y": 64}, + {"flags": 1, "matrix": [4, 2], "x": 44, "y": 64}, + {"flags": 4, "matrix": [4, 5], "x": 78, "y": 64}, + {"flags": 4, "matrix": [4, 7], "x": 112, "y": 64}, + {"flags": 4, "matrix": [4, 9], "x": 146, "y": 64}, + {"flags": 1, "matrix": [4, 11], "x": 180, "y": 64}, + {"flags": 1, "matrix": [4, 12], "x": 200, "y": 64}, + {"flags": 1, "matrix": [4, 13], "x": 220, "y": 64} ] }, "community_layouts": [ @@ -109,565 +113,565 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "matrix": [0,0], "x":0, "y":0 }, - { "matrix": [0,1], "x":1, "y":0 }, - { "matrix": [0,2], "x":2, "y":0 }, - { "matrix": [0,3], "x":3, "y":0 }, - { "matrix": [0,4], "x":4, "y":0 }, - { "matrix": [0,5], "x":5, "y":0 }, - { "matrix": [0,6], "x":6, "y":0 }, - { "matrix": [0,7], "x":7, "y":0 }, - { "matrix": [0,8], "x":8, "y":0 }, - { "matrix": [0,9], "x":9, "y":0 }, - { "matrix": [0,10], "x":10, "y":0 }, - { "matrix": [0,11], "x":11, "y":0 }, - { "matrix": [0,12], "x":12, "y":0 }, - { "matrix": [0,13], "x":13, "y":0 }, - { "matrix": [1,13], "x":14, "y":0 }, - - { "matrix": [1,0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1,1], "x":1.5, "y":1 }, - { "matrix": [1,2], "x":2.5, "y":1 }, - { "matrix": [1,3], "x":3.5, "y":1 }, - { "matrix": [1,4], "x":4.5, "y":1 }, - { "matrix": [1,5], "x":5.5, "y":1 }, - { "matrix": [1,6], "x":6.5, "y":1 }, - { "matrix": [1,7], "x":7.5, "y":1 }, - { "matrix": [1,8], "x":8.5, "y":1 }, - { "matrix": [1,9], "x":9.5, "y":1 }, - { "matrix": [1,10], "x":10.5, "y":1 }, - { "matrix": [1,11], "x":11.5, "y":1 }, - { "matrix": [1,12], "x":12.5, "y":1 }, - { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 }, - - { "matrix": [2,0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2,1], "x":1.75, "y":2 }, - { "matrix": [2,2], "x":2.75, "y":2 }, - { "matrix": [2,3], "x":3.75, "y":2 }, - { "matrix": [2,4], "x":4.75, "y":2 }, - { "matrix": [2,5], "x":5.75, "y":2 }, - { "matrix": [2,6], "x":6.75, "y":2 }, - { "matrix": [2,7], "x":7.75, "y":2 }, - { "matrix": [2,8], "x":8.75, "y":2 }, - { "matrix": [2,9], "x":9.75, "y":2 }, - { "matrix": [2,10], "x":10.75, "y":2 }, - { "matrix": [2,11], "x":11.75, "y":2 }, - { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 }, - - { "matrix": [3,0], "x":0, "y":3, "w":1.25 }, - { "matrix": [3,1], "x":1.25, "y":3 }, - { "matrix": [3,2], "x":2.25, "y":3 }, - { "matrix": [3,3], "x":3.25, "y":3 }, - { "matrix": [3,4], "x":4.25, "y":3 }, - { "matrix": [3,5], "x":5.25, "y":3 }, - { "matrix": [3,6], "x":6.25, "y":3 }, - { "matrix": [3,7], "x":7.25, "y":3 }, - { "matrix": [3,8], "x":8.25, "y":3 }, - { "matrix": [3,9], "x":9.25, "y":3 }, - { "matrix": [3,10], "x":10.25, "y":3 }, - { "matrix": [3,11], "x":11.25, "y":3 }, - { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3,13], "x":14, "y":3 }, - - { "matrix": [4,0], "x":0, "y":4, "w":1.5 }, - { "matrix": [4,1], "x":1.5, "y":4 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 }, - { "matrix": [4,5], "x":4, "y":4, "w":2.75 }, - { "matrix": [4,7], "x":6.75, "y":4 }, - { "matrix": [4,9], "x":7.75, "y":4, "w":2.25 }, - { "matrix": [4,10], "x":10, "y":4, "w":1.25 }, - { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4,12], "x":12.5, "y":4 }, - { "matrix": [4,13], "x":13.5, "y":4, "w":1.5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 7], "x": 6.75, "y": 4}, + {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 2.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_ansi": { "layout": [ - { "matrix": [0,0], "x":0, "y":0 }, - { "matrix": [0,1], "x":1, "y":0 }, - { "matrix": [0,2], "x":2, "y":0 }, - { "matrix": [0,3], "x":3, "y":0 }, - { "matrix": [0,4], "x":4, "y":0 }, - { "matrix": [0,5], "x":5, "y":0 }, - { "matrix": [0,6], "x":6, "y":0 }, - { "matrix": [0,7], "x":7, "y":0 }, - { "matrix": [0,8], "x":8, "y":0 }, - { "matrix": [0,9], "x":9, "y":0 }, - { "matrix": [0,10], "x":10, "y":0 }, - { "matrix": [0,11], "x":11, "y":0 }, - { "matrix": [0,12], "x":12, "y":0 }, - { "matrix": [0,13], "x":13, "y":0, "w":2 }, - - { "matrix": [1,0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1,1], "x":1.5, "y":1 }, - { "matrix": [1,2], "x":2.5, "y":1 }, - { "matrix": [1,3], "x":3.5, "y":1 }, - { "matrix": [1,4], "x":4.5, "y":1 }, - { "matrix": [1,5], "x":5.5, "y":1 }, - { "matrix": [1,6], "x":6.5, "y":1 }, - { "matrix": [1,7], "x":7.5, "y":1 }, - { "matrix": [1,8], "x":8.5, "y":1 }, - { "matrix": [1,9], "x":9.5, "y":1 }, - { "matrix": [1,10], "x":10.5, "y":1 }, - { "matrix": [1,11], "x":11.5, "y":1 }, - { "matrix": [1,12], "x":12.5, "y":1 }, - { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 }, - - { "matrix": [2,0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2,1], "x":1.75, "y":2 }, - { "matrix": [2,2], "x":2.75, "y":2 }, - { "matrix": [2,3], "x":3.75, "y":2 }, - { "matrix": [2,4], "x":4.75, "y":2 }, - { "matrix": [2,5], "x":5.75, "y":2 }, - { "matrix": [2,6], "x":6.75, "y":2 }, - { "matrix": [2,7], "x":7.75, "y":2 }, - { "matrix": [2,8], "x":8.75, "y":2 }, - { "matrix": [2,9], "x":9.75, "y":2 }, - { "matrix": [2,10], "x":10.75, "y":2 }, - { "matrix": [2,11], "x":11.75, "y":2 }, - { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 }, - - { "matrix": [3,0], "x":0, "y":3, "w":2.25 }, - { "matrix": [3,2], "x":2.25, "y":3 }, - { "matrix": [3,3], "x":3.25, "y":3 }, - { "matrix": [3,4], "x":4.25, "y":3 }, - { "matrix": [3,5], "x":5.25, "y":3 }, - { "matrix": [3,6], "x":6.25, "y":3 }, - { "matrix": [3,7], "x":7.25, "y":3 }, - { "matrix": [3,8], "x":8.25, "y":3 }, - { "matrix": [3,9], "x":9.25, "y":3 }, - { "matrix": [3,10], "x":10.25, "y":3 }, - { "matrix": [3,11], "x":11.25, "y":3 }, - { "matrix": [3,12], "x":12.25, "y":3, "w":2.75 }, - - { "matrix": [4,0], "x":0, "y":4, "w":1.25 }, - { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 }, - { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 }, - { "matrix": [4,10], "x":10, "y":4, "w":1.25 }, - { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 }, - { "matrix": [4,13], "x":13.75, "y":4, "w":1.25 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ - { "matrix": [0,0], "x":0, "y":0 }, - { "matrix": [0,1], "x":1, "y":0 }, - { "matrix": [0,2], "x":2, "y":0 }, - { "matrix": [0,3], "x":3, "y":0 }, - { "matrix": [0,4], "x":4, "y":0 }, - { "matrix": [0,5], "x":5, "y":0 }, - { "matrix": [0,6], "x":6, "y":0 }, - { "matrix": [0,7], "x":7, "y":0 }, - { "matrix": [0,8], "x":8, "y":0 }, - { "matrix": [0,9], "x":9, "y":0 }, - { "matrix": [0,10], "x":10, "y":0 }, - { "matrix": [0,11], "x":11, "y":0 }, - { "matrix": [0,12], "x":12, "y":0 }, - { "matrix": [0,13], "x":13, "y":0 }, - { "matrix": [1,13], "x":14, "y":0 }, - - { "matrix": [1,0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1,1], "x":1.5, "y":1 }, - { "matrix": [1,2], "x":2.5, "y":1 }, - { "matrix": [1,3], "x":3.5, "y":1 }, - { "matrix": [1,4], "x":4.5, "y":1 }, - { "matrix": [1,5], "x":5.5, "y":1 }, - { "matrix": [1,6], "x":6.5, "y":1 }, - { "matrix": [1,7], "x":7.5, "y":1 }, - { "matrix": [1,8], "x":8.5, "y":1 }, - { "matrix": [1,9], "x":9.5, "y":1 }, - { "matrix": [1,10], "x":10.5, "y":1 }, - { "matrix": [1,11], "x":11.5, "y":1 }, - { "matrix": [1,12], "x":12.5, "y":1 }, - { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 }, - - { "matrix": [2,0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2,1], "x":1.75, "y":2 }, - { "matrix": [2,2], "x":2.75, "y":2 }, - { "matrix": [2,3], "x":3.75, "y":2 }, - { "matrix": [2,4], "x":4.75, "y":2 }, - { "matrix": [2,5], "x":5.75, "y":2 }, - { "matrix": [2,6], "x":6.75, "y":2 }, - { "matrix": [2,7], "x":7.75, "y":2 }, - { "matrix": [2,8], "x":8.75, "y":2 }, - { "matrix": [2,9], "x":9.75, "y":2 }, - { "matrix": [2,10], "x":10.75, "y":2 }, - { "matrix": [2,11], "x":11.75, "y":2 }, - { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 }, - - { "matrix": [3,0], "x":0, "y":3, "w":2.25 }, - { "matrix": [3,2], "x":2.25, "y":3 }, - { "matrix": [3,3], "x":3.25, "y":3 }, - { "matrix": [3,4], "x":4.25, "y":3 }, - { "matrix": [3,5], "x":5.25, "y":3 }, - { "matrix": [3,6], "x":6.25, "y":3 }, - { "matrix": [3,7], "x":7.25, "y":3 }, - { "matrix": [3,8], "x":8.25, "y":3 }, - { "matrix": [3,9], "x":9.25, "y":3 }, - { "matrix": [3,10], "x":10.25, "y":3 }, - { "matrix": [3,11], "x":11.25, "y":3 }, - { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3,13], "x":14, "y":3 }, - - { "matrix": [4,0], "x":0, "y":4, "w":1.25 }, - { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 }, - { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 }, - { "matrix": [4,10], "x":10, "y":4, "w":1.25 }, - { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 }, - { "matrix": [4,13], "x":13.75, "y":4, "w":1.25 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_ansi_tsangan": { "layout": [ - { "matrix": [0,0], "x":0, "y":0 }, - { "matrix": [0,1], "x":1, "y":0 }, - { "matrix": [0,2], "x":2, "y":0 }, - { "matrix": [0,3], "x":3, "y":0 }, - { "matrix": [0,4], "x":4, "y":0 }, - { "matrix": [0,5], "x":5, "y":0 }, - { "matrix": [0,6], "x":6, "y":0 }, - { "matrix": [0,7], "x":7, "y":0 }, - { "matrix": [0,8], "x":8, "y":0 }, - { "matrix": [0,9], "x":9, "y":0 }, - { "matrix": [0,10], "x":10, "y":0 }, - { "matrix": [0,11], "x":11, "y":0 }, - { "matrix": [0,12], "x":12, "y":0 }, - { "matrix": [0,13], "x":13, "y":0, "w":2 }, - - { "matrix": [1,0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1,1], "x":1.5, "y":1 }, - { "matrix": [1,2], "x":2.5, "y":1 }, - { "matrix": [1,3], "x":3.5, "y":1 }, - { "matrix": [1,4], "x":4.5, "y":1 }, - { "matrix": [1,5], "x":5.5, "y":1 }, - { "matrix": [1,6], "x":6.5, "y":1 }, - { "matrix": [1,7], "x":7.5, "y":1 }, - { "matrix": [1,8], "x":8.5, "y":1 }, - { "matrix": [1,9], "x":9.5, "y":1 }, - { "matrix": [1,10], "x":10.5, "y":1 }, - { "matrix": [1,11], "x":11.5, "y":1 }, - { "matrix": [1,12], "x":12.5, "y":1 }, - { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 }, - - { "matrix": [2,0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2,1], "x":1.75, "y":2 }, - { "matrix": [2,2], "x":2.75, "y":2 }, - { "matrix": [2,3], "x":3.75, "y":2 }, - { "matrix": [2,4], "x":4.75, "y":2 }, - { "matrix": [2,5], "x":5.75, "y":2 }, - { "matrix": [2,6], "x":6.75, "y":2 }, - { "matrix": [2,7], "x":7.75, "y":2 }, - { "matrix": [2,8], "x":8.75, "y":2 }, - { "matrix": [2,9], "x":9.75, "y":2 }, - { "matrix": [2,10], "x":10.75, "y":2 }, - { "matrix": [2,11], "x":11.75, "y":2 }, - { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 }, - - { "matrix": [3,0], "x":0, "y":3, "w":2.25 }, - { "matrix": [3,2], "x":2.25, "y":3 }, - { "matrix": [3,3], "x":3.25, "y":3 }, - { "matrix": [3,4], "x":4.25, "y":3 }, - { "matrix": [3,5], "x":5.25, "y":3 }, - { "matrix": [3,6], "x":6.25, "y":3 }, - { "matrix": [3,7], "x":7.25, "y":3 }, - { "matrix": [3,8], "x":8.25, "y":3 }, - { "matrix": [3,9], "x":9.25, "y":3 }, - { "matrix": [3,10], "x":10.25, "y":3 }, - { "matrix": [3,11], "x":11.25, "y":3 }, - { "matrix": [3,12], "x":12.25, "y":3, "w":2.75 }, - - { "matrix": [4,0], "x":0, "y":4, "w":1.5 }, - { "matrix": [4,1], "x":1.5, "y":4 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 }, - { "matrix": [4,7], "x":4, "y":4, "w":7 }, - { "matrix": [4,11], "x":11, "y":4, "w":1.5 }, - { "matrix": [4,12], "x":12.5, "y":4 }, - { "matrix": [4,13], "x":13.5, "y":4, "w":1.5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_tsangan_hhkb": { "layout": [ - { "matrix": [0,0], "x":0, "y":0 }, - { "matrix": [0,1], "x":1, "y":0 }, - { "matrix": [0,2], "x":2, "y":0 }, - { "matrix": [0,3], "x":3, "y":0 }, - { "matrix": [0,4], "x":4, "y":0 }, - { "matrix": [0,5], "x":5, "y":0 }, - { "matrix": [0,6], "x":6, "y":0 }, - { "matrix": [0,7], "x":7, "y":0 }, - { "matrix": [0,8], "x":8, "y":0 }, - { "matrix": [0,9], "x":9, "y":0 }, - { "matrix": [0,10], "x":10, "y":0 }, - { "matrix": [0,11], "x":11, "y":0 }, - { "matrix": [0,12], "x":12, "y":0 }, - { "matrix": [0,13], "x":13, "y":0 }, - { "matrix": [1,13], "x":14, "y":0 }, - - { "matrix": [1,0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1,1], "x":1.5, "y":1 }, - { "matrix": [1,2], "x":2.5, "y":1 }, - { "matrix": [1,3], "x":3.5, "y":1 }, - { "matrix": [1,4], "x":4.5, "y":1 }, - { "matrix": [1,5], "x":5.5, "y":1 }, - { "matrix": [1,6], "x":6.5, "y":1 }, - { "matrix": [1,7], "x":7.5, "y":1 }, - { "matrix": [1,8], "x":8.5, "y":1 }, - { "matrix": [1,9], "x":9.5, "y":1 }, - { "matrix": [1,10], "x":10.5, "y":1 }, - { "matrix": [1,11], "x":11.5, "y":1 }, - { "matrix": [1,12], "x":12.5, "y":1 }, - { "matrix": [2,12], "x":13.5, "y":1, "w":1.5 }, - - { "matrix": [2,0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2,1], "x":1.75, "y":2 }, - { "matrix": [2,2], "x":2.75, "y":2 }, - { "matrix": [2,3], "x":3.75, "y":2 }, - { "matrix": [2,4], "x":4.75, "y":2 }, - { "matrix": [2,5], "x":5.75, "y":2 }, - { "matrix": [2,6], "x":6.75, "y":2 }, - { "matrix": [2,7], "x":7.75, "y":2 }, - { "matrix": [2,8], "x":8.75, "y":2 }, - { "matrix": [2,9], "x":9.75, "y":2 }, - { "matrix": [2,10], "x":10.75, "y":2 }, - { "matrix": [2,11], "x":11.75, "y":2 }, - { "matrix": [2,13], "x":12.75, "y":2, "w":2.25 }, - - { "matrix": [3,0], "x":0, "y":3, "w":2.25 }, - { "matrix": [3,2], "x":2.25, "y":3 }, - { "matrix": [3,3], "x":3.25, "y":3 }, - { "matrix": [3,4], "x":4.25, "y":3 }, - { "matrix": [3,5], "x":5.25, "y":3 }, - { "matrix": [3,6], "x":6.25, "y":3 }, - { "matrix": [3,7], "x":7.25, "y":3 }, - { "matrix": [3,8], "x":8.25, "y":3 }, - { "matrix": [3,9], "x":9.25, "y":3 }, - { "matrix": [3,10], "x":10.25, "y":3 }, - { "matrix": [3,11], "x":11.25, "y":3 }, - { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3,13], "x":14, "y":3 }, - - { "matrix": [4,0], "x":0, "y":4, "w":1.5 }, - { "matrix": [4,1], "x":1.5, "y":4 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 }, - { "matrix": [4,7], "x":4, "y":4, "w":7 }, - { "matrix": [4,11], "x":11, "y":4, "w":1.5 }, - { "matrix": [4,12], "x":12.5, "y":4 }, - { "matrix": [4,13], "x":13.5, "y":4, "w":1.5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_iso": { "layout": [ - { "matrix": [0,0], "x":0, "y":0 }, - { "matrix": [0,1], "x":1, "y":0 }, - { "matrix": [0,2], "x":2, "y":0 }, - { "matrix": [0,3], "x":3, "y":0 }, - { "matrix": [0,4], "x":4, "y":0 }, - { "matrix": [0,5], "x":5, "y":0 }, - { "matrix": [0,6], "x":6, "y":0 }, - { "matrix": [0,7], "x":7, "y":0 }, - { "matrix": [0,8], "x":8, "y":0 }, - { "matrix": [0,9], "x":9, "y":0 }, - { "matrix": [0,10], "x":10, "y":0 }, - { "matrix": [0,11], "x":11, "y":0 }, - { "matrix": [0,12], "x":12, "y":0 }, - { "matrix": [0,13], "x":13, "y":0, "w":2 }, - - { "matrix": [1,0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1,1], "x":1.5, "y":1 }, - { "matrix": [1,2], "x":2.5, "y":1 }, - { "matrix": [1,3], "x":3.5, "y":1 }, - { "matrix": [1,4], "x":4.5, "y":1 }, - { "matrix": [1,5], "x":5.5, "y":1 }, - { "matrix": [1,6], "x":6.5, "y":1 }, - { "matrix": [1,7], "x":7.5, "y":1 }, - { "matrix": [1,8], "x":8.5, "y":1 }, - { "matrix": [1,9], "x":9.5, "y":1 }, - { "matrix": [1,10], "x":10.5, "y":1 }, - { "matrix": [1,11], "x":11.5, "y":1 }, - { "matrix": [1,12], "x":12.5, "y":1 }, - - { "matrix": [2,0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2,1], "x":1.75, "y":2 }, - { "matrix": [2,2], "x":2.75, "y":2 }, - { "matrix": [2,3], "x":3.75, "y":2 }, - { "matrix": [2,4], "x":4.75, "y":2 }, - { "matrix": [2,5], "x":5.75, "y":2 }, - { "matrix": [2,6], "x":6.75, "y":2 }, - { "matrix": [2,7], "x":7.75, "y":2 }, - { "matrix": [2,8], "x":8.75, "y":2 }, - { "matrix": [2,9], "x":9.75, "y":2 }, - { "matrix": [2,10], "x":10.75, "y":2 }, - { "matrix": [2,11], "x":11.75, "y":2 }, - { "matrix": [2,12], "x":12.75, "y":2 }, - { "matrix": [2,13], "x":13.75, "y":1, "w":1.25, "h":2 }, - - { "matrix": [3,0], "x":0, "y":3, "w":1.25 }, - { "matrix": [3,1], "x":1.25, "y":3 }, - { "matrix": [3,2], "x":2.25, "y":3 }, - { "matrix": [3,3], "x":3.25, "y":3 }, - { "matrix": [3,4], "x":4.25, "y":3 }, - { "matrix": [3,5], "x":5.25, "y":3 }, - { "matrix": [3,6], "x":6.25, "y":3 }, - { "matrix": [3,7], "x":7.25, "y":3 }, - { "matrix": [3,8], "x":8.25, "y":3 }, - { "matrix": [3,9], "x":9.25, "y":3 }, - { "matrix": [3,10], "x":10.25, "y":3 }, - { "matrix": [3,11], "x":11.25, "y":3 }, - { "matrix": [3,12], "x":12.25, "y":3, "w":2.75 }, - - { "matrix": [4,0], "x":0, "y":4, "w":1.25 }, - { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 }, - { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 }, - { "matrix": [4,10], "x":10, "y":4, "w":1.25 }, - { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 }, - { "matrix": [4,13], "x":13.75, "y":4, "w":1.25 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_iso_split_bs_rshift": { "layout": [ - { "matrix": [0,0], "x":0, "y":0 }, - { "matrix": [0,1], "x":1, "y":0 }, - { "matrix": [0,2], "x":2, "y":0 }, - { "matrix": [0,3], "x":3, "y":0 }, - { "matrix": [0,4], "x":4, "y":0 }, - { "matrix": [0,5], "x":5, "y":0 }, - { "matrix": [0,6], "x":6, "y":0 }, - { "matrix": [0,7], "x":7, "y":0 }, - { "matrix": [0,8], "x":8, "y":0 }, - { "matrix": [0,9], "x":9, "y":0 }, - { "matrix": [0,10], "x":10, "y":0 }, - { "matrix": [0,11], "x":11, "y":0 }, - { "matrix": [0,12], "x":12, "y":0 }, - { "matrix": [0,13], "x":13, "y":0 }, - { "matrix": [1,13], "x":14, "y":0 }, - - { "matrix": [1,0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1,1], "x":1.5, "y":1 }, - { "matrix": [1,2], "x":2.5, "y":1 }, - { "matrix": [1,3], "x":3.5, "y":1 }, - { "matrix": [1,4], "x":4.5, "y":1 }, - { "matrix": [1,5], "x":5.5, "y":1 }, - { "matrix": [1,6], "x":6.5, "y":1 }, - { "matrix": [1,7], "x":7.5, "y":1 }, - { "matrix": [1,8], "x":8.5, "y":1 }, - { "matrix": [1,9], "x":9.5, "y":1 }, - { "matrix": [1,10], "x":10.5, "y":1 }, - { "matrix": [1,11], "x":11.5, "y":1 }, - { "matrix": [1,12], "x":12.5, "y":1 }, - - { "matrix": [2,0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2,1], "x":1.75, "y":2 }, - { "matrix": [2,2], "x":2.75, "y":2 }, - { "matrix": [2,3], "x":3.75, "y":2 }, - { "matrix": [2,4], "x":4.75, "y":2 }, - { "matrix": [2,5], "x":5.75, "y":2 }, - { "matrix": [2,6], "x":6.75, "y":2 }, - { "matrix": [2,7], "x":7.75, "y":2 }, - { "matrix": [2,8], "x":8.75, "y":2 }, - { "matrix": [2,9], "x":9.75, "y":2 }, - { "matrix": [2,10], "x":10.75, "y":2 }, - { "matrix": [2,11], "x":11.75, "y":2 }, - { "matrix": [2,12], "x":12.75, "y":2 }, - { "matrix": [2,13], "x":13.75, "y":1, "w":1.25, "h":2 }, - - { "matrix": [3,0], "x":0, "y":3, "w":1.25 }, - { "matrix": [3,1], "x":1.25, "y":3 }, - { "matrix": [3,2], "x":2.25, "y":3 }, - { "matrix": [3,3], "x":3.25, "y":3 }, - { "matrix": [3,4], "x":4.25, "y":3 }, - { "matrix": [3,5], "x":5.25, "y":3 }, - { "matrix": [3,6], "x":6.25, "y":3 }, - { "matrix": [3,7], "x":7.25, "y":3 }, - { "matrix": [3,8], "x":8.25, "y":3 }, - { "matrix": [3,9], "x":9.25, "y":3 }, - { "matrix": [3,10], "x":10.25, "y":3 }, - { "matrix": [3,11], "x":11.25, "y":3 }, - { "matrix": [3,12], "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3,13], "x":14, "y":3 }, - - { "matrix": [4,0], "x":0, "y":4, "w":1.25 }, - { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 }, - { "matrix": [4,7], "x":3.75, "y":4, "w":6.25 }, - { "matrix": [4,10], "x":10, "y":4, "w":1.25 }, - { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 }, - { "matrix": [4,13], "x":13.75, "y":4, "w":1.25 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_iso_tsangan": { "layout": [ - { "matrix": [0,0], "x":0, "y":0 }, - { "matrix": [0,1], "x":1, "y":0 }, - { "matrix": [0,2], "x":2, "y":0 }, - { "matrix": [0,3], "x":3, "y":0 }, - { "matrix": [0,4], "x":4, "y":0 }, - { "matrix": [0,5], "x":5, "y":0 }, - { "matrix": [0,6], "x":6, "y":0 }, - { "matrix": [0,7], "x":7, "y":0 }, - { "matrix": [0,8], "x":8, "y":0 }, - { "matrix": [0,9], "x":9, "y":0 }, - { "matrix": [0,10], "x":10, "y":0 }, - { "matrix": [0,11], "x":11, "y":0 }, - { "matrix": [0,12], "x":12, "y":0 }, - { "matrix": [0,13], "x":13, "y":0, "w":2 }, - - { "matrix": [1,0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1,1], "x":1.5, "y":1 }, - { "matrix": [1,2], "x":2.5, "y":1 }, - { "matrix": [1,3], "x":3.5, "y":1 }, - { "matrix": [1,4], "x":4.5, "y":1 }, - { "matrix": [1,5], "x":5.5, "y":1 }, - { "matrix": [1,6], "x":6.5, "y":1 }, - { "matrix": [1,7], "x":7.5, "y":1 }, - { "matrix": [1,8], "x":8.5, "y":1 }, - { "matrix": [1,9], "x":9.5, "y":1 }, - { "matrix": [1,10], "x":10.5, "y":1 }, - { "matrix": [1,11], "x":11.5, "y":1 }, - { "matrix": [1,12], "x":12.5, "y":1 }, - - { "matrix": [2,0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2,1], "x":1.75, "y":2 }, - { "matrix": [2,2], "x":2.75, "y":2 }, - { "matrix": [2,3], "x":3.75, "y":2 }, - { "matrix": [2,4], "x":4.75, "y":2 }, - { "matrix": [2,5], "x":5.75, "y":2 }, - { "matrix": [2,6], "x":6.75, "y":2 }, - { "matrix": [2,7], "x":7.75, "y":2 }, - { "matrix": [2,8], "x":8.75, "y":2 }, - { "matrix": [2,9], "x":9.75, "y":2 }, - { "matrix": [2,10], "x":10.75, "y":2 }, - { "matrix": [2,11], "x":11.75, "y":2 }, - { "matrix": [2,12], "x":12.75, "y":2 }, - { "matrix": [2,13], "x":13.75, "y":1, "w":1.25, "h":2 }, - - { "matrix": [3,0], "x":0, "y":3, "w":1.25 }, - { "matrix": [3,1], "x":1.25, "y":3 }, - { "matrix": [3,2], "x":2.25, "y":3 }, - { "matrix": [3,3], "x":3.25, "y":3 }, - { "matrix": [3,4], "x":4.25, "y":3 }, - { "matrix": [3,5], "x":5.25, "y":3 }, - { "matrix": [3,6], "x":6.25, "y":3 }, - { "matrix": [3,7], "x":7.25, "y":3 }, - { "matrix": [3,8], "x":8.25, "y":3 }, - { "matrix": [3,9], "x":9.25, "y":3 }, - { "matrix": [3,10], "x":10.25, "y":3 }, - { "matrix": [3,11], "x":11.25, "y":3 }, - { "matrix": [3,12], "x":12.25, "y":3, "w":2.75 }, - - { "matrix": [4,0], "x":0, "y":4, "w":1.5 }, - { "matrix": [4,1], "x":1.5, "y":4 }, - { "matrix": [4,2], "x":2.5, "y":4, "w":1.5 }, - { "matrix": [4,7], "x":4, "y":4, "w":7 }, - { "matrix": [4,11], "x":11, "y":4, "w":1.5 }, - { "matrix": [4,12], "x":12.5, "y":4 }, - { "matrix": [4,13], "x":13.5, "y":4, "w":1.5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h index 3411aa9f68..71170a12ce 100644 --- a/keyboards/synthlabs/solo/config.h +++ b/keyboards/synthlabs/solo/config.h @@ -6,8 +6,6 @@ #define ENCODERS_CW_KEY { { 2, 1 } } #define ENCODERS_CCW_KEY { { 0, 1 } } -#define FORCE_NKRO - #define JOYSTICK_BUTTON_COUNT 13 #define JOYSTICK_AXIS_COUNT 1 #define JOYSTICK_AXIS_RESOLUTION 16 diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json index 14d39d63cc..168d2d06dc 100644 --- a/keyboards/synthlabs/solo/info.json +++ b/keyboards/synthlabs/solo/info.json @@ -15,7 +15,8 @@ "usb": { "vid": "0x534E", "pid": "0x3031", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "encoder": { "rotary": [ @@ -28,57 +29,57 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0,0]}, - {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]}, - {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0,2]}, - {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]}, - {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0,4]}, - {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]}, - {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0,6]}, + {"label": "P2 1", "x": 3, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 0]}, + {"label": "P1 2", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]}, + {"label": "P2 3", "x": 4, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 2]}, + {"label": "P1 4", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]}, + {"label": "P2 5", "x": 5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 4]}, + {"label": "P1 6", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]}, + {"label": "P2 7", "x": 6, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 6]}, - {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]}, - {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label": "Knob CCW", "x": 0, "y": 1.25, "w": 0.5, "matrix": [1, 0]}, + {"label": "Knob Press", "x": 0.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]}, + {"label": "Knob CW", "x": 2, "y": 1.25, "w": 0.5, "matrix": [1, 2]}, - {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]}, - {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,1]}, - {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]}, - {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,3]}, - {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]}, - {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,5]}, - {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]} + {"label": "P1 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]}, + {"label": "P2 2", "x": 3.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 1]}, + {"label": "P1 3", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]}, + {"label": "P2 4", "x": 4.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 3]}, + {"label": "P1 5", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]}, + {"label": "P2 6", "x": 5.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 5]}, + {"label": "P1 7", "x": 6, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]} ] }, "LAYOUT_left": { "layout": [ - {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]}, - {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]}, - {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]}, + {"label": "P1 2", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]}, + {"label": "P1 4", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]}, + {"label": "P1 6", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]}, - {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]}, - {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label": "Knob CCW", "x": 0, "y": 1.25, "w": 0.5, "matrix": [1, 0]}, + {"label": "Knob Press", "x": 0.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]}, + {"label": "Knob CW", "x": 2, "y": 1.25, "w": 0.5, "matrix": [1, 2]}, - {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]}, - {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]}, - {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]}, - {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]} + {"label": "P1 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]}, + {"label": "P1 3", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]}, + {"label": "P1 5", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]}, + {"label": "P1 7", "x": 6, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]} ] }, "LAYOUT_right": { "layout": [ - {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,5]}, - {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,3]}, - {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,1]}, + {"label": "P2 6", "x": 0.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 5]}, + {"label": "P2 4", "x": 1.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 3]}, + {"label": "P2 2", "x": 2.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 1]}, - {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1,0] }, - {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]}, - {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1,2]}, + {"label": "Knob CCW", "x": 4, "y": 1.25, "w": 0.5, "matrix": [1, 0]}, + {"label": "Knob Press", "x": 4.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]}, + {"label": "Knob CW", "x": 6, "y": 1.25, "w": 0.5, "matrix": [1, 2]}, - {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0,6]}, - {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0,4]}, - {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0,2]}, - {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0,0]} + {"label": "P2 7", "x": 0, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 6]}, + {"label": "P2 5", "x": 1, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 4]}, + {"label": "P2 3", "x": 2, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 2]}, + {"label": "P2 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 0]} ] } } diff --git a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c index aedb00d968..d124a011f6 100644 --- a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c +++ b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c @@ -62,7 +62,7 @@ void housekeeping_task_user(void) { } } -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW( CCW_MACRO, CW_MACRO diff --git a/keyboards/synthlabs/solo/keymaps/via/keymap.c b/keyboards/synthlabs/solo/keymaps/via/keymap.c index c6634c42d4..84f99df9ab 100644 --- a/keyboards/synthlabs/solo/keymaps/via/keymap.c +++ b/keyboards/synthlabs/solo/keymaps/via/keymap.c @@ -37,7 +37,8 @@ void encoder_action_unregister(void) { keyevent_t encoder_event = (keyevent_t) { .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = 0; action_exec(encoder_event); @@ -49,7 +50,8 @@ void encoder_action_register(uint8_t index, bool clockwise) { keyevent_t encoder_event = (keyevent_t) { .key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); action_exec(encoder_event); |