diff options
Diffstat (limited to 'keyboards/ghs')
-rw-r--r-- | keyboards/ghs/jem/info.json | 416 | ||||
-rw-r--r-- | keyboards/ghs/rar/config.h | 20 | ||||
-rw-r--r-- | keyboards/ghs/rar/info.json | 974 | ||||
-rw-r--r-- | keyboards/ghs/rar/rar.c | 2 | ||||
-rw-r--r-- | keyboards/ghs/rar/rar.h | 145 | ||||
-rw-r--r-- | keyboards/ghs/xls/info.json | 140 | ||||
-rw-r--r-- | keyboards/ghs/xls/keymaps/via/keymap.c | 2 |
7 files changed, 772 insertions, 927 deletions
diff --git a/keyboards/ghs/jem/info.json b/keyboards/ghs/jem/info.json index d35f86c4da..b90655647d 100644 --- a/keyboards/ghs/jem/info.json +++ b/keyboards/ghs/jem/info.json @@ -20,15 +20,14 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "cols": [ "E6", "B0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], - "rows": [ "F1", "F0", "F7", "F6", "F5" ] + "cols": ["E6", "B0", "D5", "D3", "D2", "D1", "D0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F1", "F0", "F7", "F6", "F5"] }, "indicators": { "caps_lock": "B7" }, "rgblight": { "led_count": 22, - "pin": "F4", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, @@ -43,233 +42,236 @@ "alternating": true } }, + "ws2812": { + "pin": "F4" + }, "layouts": { "LAYOUT_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,14], "x":15, "y":0 }, + {"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, 14], "x": 15, "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": [1,13], "x":13.5, "y":1, "w":1.5 }, - { "matrix": [2,14], "x":15, "y":1}, + {"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": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "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,13], "x":12.75, "y":2, "w":2.25 }, - { "matrix": [3,14], "x":15, "y":2 }, + {"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, 14], "x": 15, "y": 2}, - { "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,14], "x":15, "y":3 }, + {"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, 14], "x": 15, "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,9], "x":10, "y":4, "w":1.25 }, - { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4,11], "x":13, "y":4 }, - { "matrix": [4,12], "x":14, "y":4 }, - { "matrix": [4,13], "x":15, "y":4 } + {"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, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4} ] }, "LAYOUT_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,14], "x":15, "y":0 }, + {"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, 14], "x": 15, "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,14], "x":15, "y":1}, + {"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, 14], "x": 15, "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,13], "x":12.75, "y":2 }, - { "matrix": [1,13], "x":13.75, "y":1, "w":1.25, "h":2 }, - { "matrix": [3,14], "x":15, "y":2 }, + {"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}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 14], "x": 15, "y": 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,14], "x":15, "y":3 }, + {"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, 14], "x": 15, "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,9], "x":10, "y":4, "w":1.25 }, - { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4,11], "x":13, "y":4 }, - { "matrix": [4,12], "x":14, "y":4 }, - { "matrix": [4,13], "x":15, "y":4 } + {"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, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4} ] }, "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": [0,14], "x":14, "y":0 }, - { "matrix": [1,14], "x":15, "y":0 }, + {"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": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 14], "x": 15, "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": [1,13], "x":13.5, "y":1, "w":1.5 }, - { "matrix": [2,14], "x":15, "y":1}, + {"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": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "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,13], "x":12.75, "y":2, "w":2.25 }, - { "matrix": [3,14], "x":15, "y":2 }, + {"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, 14], "x": 15, "y": 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,14], "x":15, "y":3 }, + {"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, 14], "x": 15, "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,9], "x":10, "y":4, "w":1.25 }, - { "matrix": [4,10], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4,11], "x":13, "y":4 }, - { "matrix": [4,12], "x":14, "y":4 }, - { "matrix": [4,13], "x":15, "y":4 } + {"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, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4} ] } } diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h index 2853b095cc..9cd6e7be5a 100644 --- a/keyboards/ghs/rar/config.h +++ b/keyboards/ghs/rar/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 17 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -47,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json index 1a8b534e56..9a684c2840 100644 --- a/keyboards/ghs/rar/info.json +++ b/keyboards/ghs/rar/info.json @@ -8,510 +8,518 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D1"], + "rows": ["B0", "B7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5, "w": 2}, - - {"x": 15.5, "y": 1.5}, - - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - {"x": 13.5, "y": 2.5, "w": 1.5}, - - {"x": 15.5, "y": 2.5}, - - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5, "w": 2.25}, - - {"x": 15.5, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 2.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5, "w": 1.75}, - - {"x": 14.25, "y": 4.75}, - - {"x": 15.5, "y": 4.5}, - - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5, "w": 1.25}, - {"x": 2.5, "y": 5.5, "w": 1.25}, - {"x": 3.75, "y": 5.5, "w": 6.25}, - {"x": 10, "y": 5.5, "w": 1.5}, - {"x": 11.5, "y": 5.5, "w": 1.5}, - - {"x": 13.25, "y": 5.75}, - {"x": 14.25, "y": 5.75}, - {"x": 15.25, "y": 5.75} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 7], "x": 15.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [3, 7], "x": 15.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [5, 7], "x": 15.5, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [7, 7], "x": 15.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4.5}, + {"matrix": [9, 1], "x": 3.25, "y": 4.5}, + {"matrix": [8, 2], "x": 4.25, "y": 4.5}, + {"matrix": [9, 2], "x": 5.25, "y": 4.5}, + {"matrix": [8, 3], "x": 6.25, "y": 4.5}, + {"matrix": [9, 3], "x": 7.25, "y": 4.5}, + {"matrix": [8, 4], "x": 8.25, "y": 4.5}, + {"matrix": [9, 4], "x": 9.25, "y": 4.5}, + {"matrix": [8, 5], "x": 10.25, "y": 4.5}, + {"matrix": [9, 5], "x": 11.25, "y": 4.5}, + {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [8, 7], "x": 14.25, "y": 4.75}, + + {"matrix": [9, 7], "x": 15.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.5}, + {"matrix": [10, 6], "x": 11.5, "y": 5.5, "w": 1.5}, + + {"matrix": [11, 6], "x": 13.25, "y": 5.75}, + {"matrix": [10, 7], "x": 14.25, "y": 5.75}, + {"matrix": [11, 7], "x": 15.25, "y": 5.75} ] }, "LAYOUT_ansi_wkl": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5, "w": 2}, - - {"x": 15.5, "y": 1.5}, - - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - {"x": 13.5, "y": 2.5, "w": 1.5}, - - {"x": 15.5, "y": 2.5}, - - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5, "w": 2.25}, - - {"x": 15.5, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 2.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5, "w": 1.75}, - - {"x": 14.25, "y": 4.75}, - - {"x": 15.5, "y": 4.5}, - - {"x": 0, "y": 5.5, "w": 1.5}, - {"x": 1.5, "y": 5.5, "w": 1.5}, - {"x": 3, "y": 5.5, "w": 7}, - {"x": 10, "y": 5.5, "w": 1.5}, - {"x": 11.5, "y": 5.5, "w": 1.5}, - - {"x": 13.25, "y": 5.75}, - {"x": 14.25, "y": 5.75}, - {"x": 15.25, "y": 5.75} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 7], "x": 15.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [3, 7], "x": 15.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [5, 7], "x": 15.5, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [7, 7], "x": 15.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4.5}, + {"matrix": [9, 1], "x": 3.25, "y": 4.5}, + {"matrix": [8, 2], "x": 4.25, "y": 4.5}, + {"matrix": [9, 2], "x": 5.25, "y": 4.5}, + {"matrix": [8, 3], "x": 6.25, "y": 4.5}, + {"matrix": [9, 3], "x": 7.25, "y": 4.5}, + {"matrix": [8, 4], "x": 8.25, "y": 4.5}, + {"matrix": [9, 4], "x": 9.25, "y": 4.5}, + {"matrix": [8, 5], "x": 10.25, "y": 4.5}, + {"matrix": [9, 5], "x": 11.25, "y": 4.5}, + {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [8, 7], "x": 14.25, "y": 4.75}, + + {"matrix": [9, 7], "x": 15.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [11, 0], "x": 1.5, "y": 5.5, "w": 1.5}, + {"matrix": [10, 3], "x": 3, "y": 5.5, "w": 7}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.5}, + {"matrix": [10, 6], "x": 11.5, "y": 5.5, "w": 1.5}, + + {"matrix": [11, 6], "x": 13.25, "y": 5.75}, + {"matrix": [10, 7], "x": 14.25, "y": 5.75}, + {"matrix": [11, 7], "x": 15.25, "y": 5.75} ] }, "LAYOUT_iso": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5, "w": 2}, - - {"x": 15.5, "y": 1.5}, - - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, - - {"x": 15.5, "y": 2.5}, - - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5}, - - {"x": 15.5, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 1.25}, - {"x": 1.25, "y": 4.5}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5, "w": 1.75}, - - {"x": 14.25, "y": 4.75}, - - {"x": 15.5, "y": 4.5}, - - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5, "w": 1.25}, - {"x": 2.5, "y": 5.5, "w": 1.25}, - {"x": 3.75, "y": 5.5, "w": 6.25}, - {"x": 10, "y": 5.5, "w": 1.5}, - {"x": 11.5, "y": 5.5, "w": 1.5}, - - {"x": 13.25, "y": 5.75}, - {"x": 14.25, "y": 5.75}, - {"x": 15.25, "y": 5.75} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 7], "x": 15.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [3, 7], "x": 15.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [4, 7], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [5, 7], "x": 15.5, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5}, + + {"matrix": [7, 7], "x": 15.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4.5}, + {"matrix": [8, 1], "x": 2.25, "y": 4.5}, + {"matrix": [9, 1], "x": 3.25, "y": 4.5}, + {"matrix": [8, 2], "x": 4.25, "y": 4.5}, + {"matrix": [9, 2], "x": 5.25, "y": 4.5}, + {"matrix": [8, 3], "x": 6.25, "y": 4.5}, + {"matrix": [9, 3], "x": 7.25, "y": 4.5}, + {"matrix": [8, 4], "x": 8.25, "y": 4.5}, + {"matrix": [9, 4], "x": 9.25, "y": 4.5}, + {"matrix": [8, 5], "x": 10.25, "y": 4.5}, + {"matrix": [9, 5], "x": 11.25, "y": 4.5}, + {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [8, 7], "x": 14.25, "y": 4.75}, + + {"matrix": [9, 7], "x": 15.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.5}, + {"matrix": [10, 6], "x": 11.5, "y": 5.5, "w": 1.5}, + + {"matrix": [11, 6], "x": 13.25, "y": 5.75}, + {"matrix": [10, 7], "x": 14.25, "y": 5.75}, + {"matrix": [11, 7], "x": 15.25, "y": 5.75} ] }, "LAYOUT_iso_wkl": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5, "w": 2}, - - {"x": 15.5, "y": 1.5}, - - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, - - {"x": 15.5, "y": 2.5}, - - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5}, - - {"x": 15.5, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 1.25}, - {"x": 1.25, "y": 4.5}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5, "w": 1.75}, - - {"x": 14.25, "y": 4.75}, - - {"x": 15.5, "y": 4.5}, - - {"x": 0, "y": 5.5, "w": 1.5}, - {"x": 1.5, "y": 5.5, "w": 1.5}, - {"x": 3, "y": 5.5, "w": 7}, - {"x": 10, "y": 5.5, "w": 1.5}, - {"x": 11.5, "y": 5.5, "w": 1.5}, - - {"x": 13.25, "y": 5.75}, - {"x": 14.25, "y": 5.75}, - {"x": 15.25, "y": 5.75} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 7], "x": 15.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [3, 7], "x": 15.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [4, 7], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [5, 7], "x": 15.5, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5}, + + {"matrix": [7, 7], "x": 15.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4.5}, + {"matrix": [8, 1], "x": 2.25, "y": 4.5}, + {"matrix": [9, 1], "x": 3.25, "y": 4.5}, + {"matrix": [8, 2], "x": 4.25, "y": 4.5}, + {"matrix": [9, 2], "x": 5.25, "y": 4.5}, + {"matrix": [8, 3], "x": 6.25, "y": 4.5}, + {"matrix": [9, 3], "x": 7.25, "y": 4.5}, + {"matrix": [8, 4], "x": 8.25, "y": 4.5}, + {"matrix": [9, 4], "x": 9.25, "y": 4.5}, + {"matrix": [8, 5], "x": 10.25, "y": 4.5}, + {"matrix": [9, 5], "x": 11.25, "y": 4.5}, + {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [8, 7], "x": 14.25, "y": 4.75}, + + {"matrix": [9, 7], "x": 15.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [11, 0], "x": 1.5, "y": 5.5, "w": 1.5}, + {"matrix": [10, 3], "x": 3, "y": 5.5, "w": 7}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.5}, + {"matrix": [10, 6], "x": 11.5, "y": 5.5, "w": 1.5}, + + {"matrix": [11, 6], "x": 13.25, "y": 5.75}, + {"matrix": [10, 7], "x": 14.25, "y": 5.75}, + {"matrix": [11, 7], "x": 15.25, "y": 5.75} ] }, "LAYOUT_all": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.5, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5}, - {"x": 14, "y": 1.5}, - - {"x": 15.5, "y": 1.5}, - - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - {"x": 13.5, "y": 2.5, "w": 1.5}, - - {"x": 15.5, "y": 2.5}, - - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5, "w": 2.25}, - - {"x": 15.5, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 1.25}, - {"x": 1.25, "y": 4.5}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5, "w": 1.75}, - - {"x": 14.25, "y": 4.75}, - - {"x": 15.5, "y": 4.5}, - - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5, "w": 1.25}, - {"x": 2.5, "y": 5.5, "w": 1.25}, - {"x": 3.75, "y": 5.5, "w": 6.25}, - {"x": 10, "y": 5.5}, - {"x": 11, "y": 5.5}, - {"x": 12, "y": 5.5}, - - {"x": 13.25, "y": 5.75}, - {"x": 14.25, "y": 5.75}, - {"x": 15.25, "y": 5.75} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 7], "x": 15.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5}, + {"matrix": [2, 7], "x": 14, "y": 1.5}, + + {"matrix": [3, 7], "x": 15.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [4, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [5, 7], "x": 15.5, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [7, 7], "x": 15.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4.5}, + {"matrix": [8, 1], "x": 2.25, "y": 4.5}, + {"matrix": [9, 1], "x": 3.25, "y": 4.5}, + {"matrix": [8, 2], "x": 4.25, "y": 4.5}, + {"matrix": [9, 2], "x": 5.25, "y": 4.5}, + {"matrix": [8, 3], "x": 6.25, "y": 4.5}, + {"matrix": [9, 3], "x": 7.25, "y": 4.5}, + {"matrix": [8, 4], "x": 8.25, "y": 4.5}, + {"matrix": [9, 4], "x": 9.25, "y": 4.5}, + {"matrix": [8, 5], "x": 10.25, "y": 4.5}, + {"matrix": [9, 5], "x": 11.25, "y": 4.5}, + {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [8, 7], "x": 14.25, "y": 4.75}, + + {"matrix": [9, 7], "x": 15.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5}, + {"matrix": [11, 5], "x": 11, "y": 5.5}, + {"matrix": [10, 6], "x": 12, "y": 5.5}, + + {"matrix": [11, 6], "x": 13.25, "y": 5.75}, + {"matrix": [10, 7], "x": 14.25, "y": 5.75}, + {"matrix": [11, 7], "x": 15.25, "y": 5.75} ] } } diff --git a/keyboards/ghs/rar/rar.c b/keyboards/ghs/rar/rar.c index 8f7ae3ba60..481a2a0c41 100644 --- a/keyboards/ghs/rar/rar.c +++ b/keyboards/ghs/rar/rar.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "rar.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { // Set our LED pins as output. diff --git a/keyboards/ghs/rar/rar.h b/keyboards/ghs/rar/rar.h deleted file mode 100644 index e4d3eb2775..0000000000 --- a/keyboards/ghs/rar/rar.h +++ /dev/null @@ -1,145 +0,0 @@ -/* Copyright 2020 Gone Hacking Studio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define XXX KC_NO - -#define LAYOUT_ansi( \ - k00, k01, k11, k02, k12, k03, k13, k04, k14, k15, k06, k16, k07, k17, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k37, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k77, \ - k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, \ - ka0, kb0, ka1, ka3, ka5, ka6, kb6, ka7, kb7 \ -) \ -{ \ - { k00, k01, k02, k03, k04, XXX, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, XXX, k57 }, \ - { k60, k61, k62, k63, k64, k65, XXX, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { XXX, k91, k92, k93, k94, k95, XXX, k97 }, \ - { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7 }, \ - { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7 }, \ -} - -#define LAYOUT_ansi_wkl( \ - k00, k01, k11, k02, k12, k03, k13, k04, k14, k15, k06, k16, k07, k17, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k37, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k77, \ - k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, \ - ka0, kb0, ka3, ka5, ka6, kb6, ka7, kb7 \ -) \ -{ \ - { k00, k01, k02, k03, k04, XXX, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, XXX, k57 }, \ - { k60, k61, k62, k63, k64, k65, XXX, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { XXX, k91, k92, k93, k94, k95, XXX, k97 }, \ - { ka0, XXX, XXX, ka3, XXX, ka5, ka6, ka7 }, \ - { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7 }, \ -} - -#define LAYOUT_iso( \ - k00, k01, k11, k02, k12, k03, k13, k04, k14, k15, k06, k16, k07, k17, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k37, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k77, \ - k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, \ - ka0, kb0, ka1, ka3, ka5, ka6, kb6, ka7, kb7 \ -) \ -{ \ - { k00, k01, k02, k03, k04, XXX, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, XXX, k57 }, \ - { k60, k61, k62, k63, k64, k65, XXX, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { k90, k91, k92, k93, k94, k95, XXX, k97 }, \ - { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7 }, \ - { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7 }, \ -} - -#define LAYOUT_iso_wkl( \ - k00, k01, k11, k02, k12, k03, k13, k04, k14, k15, k06, k16, k07, k17, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k37, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k77, \ - k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, \ - ka0, kb0, ka3, ka5, ka6, kb6, ka7, kb7 \ -) \ -{ \ - { k00, k01, k02, k03, k04, XXX, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, XXX, k57 }, \ - { k60, k61, k62, k63, k64, k65, XXX, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { k90, k91, k92, k93, k94, k95, XXX, k97 }, \ - { ka0, XXX, XXX, ka3, XXX, ka5, ka6, ka7 }, \ - { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7 }, \ -} - -#define LAYOUT_all( \ - k00, k01, k11, k02, k12, k03, k13, k04, k14, k15, k06, k16, k07, k17, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k77, \ - k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, \ - ka0, kb0, ka1, ka3, ka5, kb5, ka6, kb6, ka7, kb7 \ -) \ -{ \ - { k00, k01, k02, k03, k04, XXX, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, XXX, k57 }, \ - { k60, k61, k62, k63, k64, k65, XXX, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87 }, \ - { k90, k91, k92, k93, k94, k95, XXX, k97 }, \ - { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7 }, \ - { kb0, XXX, XXX, XXX, XXX, kb5, kb6, kb7 }, \ -} diff --git a/keyboards/ghs/xls/info.json b/keyboards/ghs/xls/info.json index 87ed376500..f062f32af8 100644 --- a/keyboards/ghs/xls/info.json +++ b/keyboards/ghs/xls/info.json @@ -29,89 +29,89 @@ "bootloader": "stm32-dfu", "encoder": { "rotary": [ - { "pin_a": "B3", "pin_b": "A15" }, - { "pin_a": "B4", "pin_b": "B5" }, - { "pin_a": "B9", "pin_b": "B8" }, - { "pin_a": "F0", "pin_b": "F1" } + {"pin_a": "B3", "pin_b": "A15"}, + {"pin_a": "B4", "pin_b": "B5"}, + {"pin_a": "B9", "pin_b": "B8"}, + {"pin_a": "F0", "pin_b": "F1"} ] }, "layouts": { "LAYOUT_numpad_6x4": { "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": [1, 0], "x": 0, "y": 1.5 }, - { "matrix": [1, 1], "x": 1, "y": 1.5 }, - { "matrix": [1, 2], "x": 2, "y": 1.5 }, - { "matrix": [1, 3], "x": 3, "y": 1.5 }, - { "matrix": [2, 0], "x": 0, "y": 2.5 }, - { "matrix": [2, 1], "x": 1, "y": 2.5 }, - { "matrix": [2, 2], "x": 2, "y": 2.5 }, - { "matrix": [3, 0], "x": 0, "y": 3.5 }, - { "matrix": [3, 1], "x": 1, "y": 3.5 }, - { "matrix": [3, 2], "x": 2, "y": 3.5 }, - { "h": 2, "matrix": [2, 3], "x": 3, "y": 2.5 }, - { "matrix": [4, 0], "x": 0, "y": 4.5 }, - { "matrix": [4, 1], "x": 1, "y": 4.5 }, - { "matrix": [4, 2], "x": 2, "y": 4.5 }, - { "matrix": [5, 0], "w": 2, "x": 0, "y": 5.5 }, - { "matrix": [5, 2], "x": 2, "y": 5.5 }, - { "h": 2, "matrix": [4, 3], "x": 3, "y": 4.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": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"h": 2, "matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4.5}, + {"matrix": [5, 0], "w": 2, "x": 0, "y": 5.5}, + {"matrix": [5, 2], "x": 2, "y": 5.5}, + {"h": 2, "matrix": [4, 3], "x": 3, "y": 4.5} ] }, "LAYOUT_numpad_6x4_southpaw": { "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": [1, 0], "x": 0, "y": 1.5 }, - { "matrix": [1, 1], "x": 1, "y": 1.5 }, - { "matrix": [1, 2], "x": 2, "y": 1.5 }, - { "matrix": [1, 3], "x": 3, "y": 1.5 }, - { "matrix": [2, 0], "h": 2, "x": 0, "y": 2.5 }, - { "matrix": [2, 1], "x": 1, "y": 2.5 }, - { "matrix": [2, 2], "x": 2, "y": 2.5 }, - { "matrix": [2, 3], "x": 3, "y": 2.5 }, - { "matrix": [3, 1], "x": 1, "y": 3.5 }, - { "matrix": [3, 2], "x": 2, "y": 3.5 }, - { "matrix": [3, 3], "x": 3, "y": 3.5 }, - { "matrix": [5, 0], "h": 2, "x": 0, "y": 4.5 }, - { "matrix": [4, 1], "x": 1, "y": 4.5 }, - { "matrix": [4, 2], "x": 2, "y": 4.5 }, - { "matrix": [4, 3], "x": 3, "y": 4.5 }, - { "matrix": [5, 1], "x": 1, "y": 5.5 }, - { "matrix": [5, 2], "w": 2, "x": 2, "y": 5.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": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [2, 0], "h": 2, "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3.5}, + {"matrix": [5, 0], "h": 2, "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4.5}, + {"matrix": [4, 3], "x": 3, "y": 4.5}, + {"matrix": [5, 1], "x": 1, "y": 5.5}, + {"matrix": [5, 2], "w": 2, "x": 2, "y": 5.5} ] }, "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": [1, 0], "x": 0, "y": 1.5 }, - { "matrix": [1, 1], "x": 1, "y": 1.5 }, - { "matrix": [1, 2], "x": 2, "y": 1.5 }, - { "matrix": [1, 3], "x": 3, "y": 1.5 }, - { "matrix": [2, 0], "x": 0, "y": 2.5 }, - { "matrix": [2, 1], "x": 1, "y": 2.5 }, - { "matrix": [2, 2], "x": 2, "y": 2.5 }, - { "matrix": [2, 3], "x": 3, "y": 2.5 }, - { "matrix": [3, 0], "x": 0, "y": 3.5 }, - { "matrix": [3, 1], "x": 1, "y": 3.5 }, - { "matrix": [3, 2], "x": 2, "y": 3.5 }, - { "matrix": [3, 3], "x": 3, "y": 3.5 }, - { "matrix": [4, 0], "x": 0, "y": 4.5 }, - { "matrix": [4, 1], "x": 1, "y": 4.5 }, - { "matrix": [4, 2], "x": 2, "y": 4.5 }, - { "matrix": [4, 3], "x": 3, "y": 4.5 }, - { "matrix": [5, 0], "x": 0, "y": 5.5 }, - { "matrix": [5, 1], "x": 1, "y": 5.5 }, - { "matrix": [5, 2], "x": 2, "y": 5.5 }, - { "matrix": [5, 3], "x": 3, "y": 5.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": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3.5}, + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4.5}, + {"matrix": [4, 3], "x": 3, "y": 4.5}, + {"matrix": [5, 0], "x": 0, "y": 5.5}, + {"matrix": [5, 1], "x": 1, "y": 5.5}, + {"matrix": [5, 2], "x": 2, "y": 5.5}, + {"matrix": [5, 3], "x": 3, "y": 5.5} ] } } diff --git a/keyboards/ghs/xls/keymaps/via/keymap.c b/keyboards/ghs/xls/keymaps/via/keymap.c index 952073fe2b..3b97ad7ee5 100644 --- a/keyboards/ghs/xls/keymaps/via/keymap.c +++ b/keyboards/ghs/xls/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_BRID, KC_BRIU), ENCODER_CCW_CW(KC_DOWN, KC_UP ), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }, [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }, |