diff options
Diffstat (limited to 'keyboards/flx')
| -rw-r--r-- | keyboards/flx/lodestone/config.h | 17 | ||||
| -rw-r--r-- | keyboards/flx/lodestone/info.json | 709 | ||||
| -rw-r--r-- | keyboards/flx/lodestone/lodestone.c | 17 | ||||
| -rw-r--r-- | keyboards/flx/lodestone/lodestone.h | 93 | ||||
| -rw-r--r-- | keyboards/flx/virgo/config.h | 19 | ||||
| -rw-r--r-- | keyboards/flx/virgo/info.json | 209 | ||||
| -rw-r--r-- | keyboards/flx/virgo/virgo.c | 2 | ||||
| -rw-r--r-- | keyboards/flx/virgo/virgo.h | 42 |
8 files changed, 486 insertions, 622 deletions
diff --git a/keyboards/flx/lodestone/config.h b/keyboards/flx/lodestone/config.h index 97f2434c51..1d22c074e2 100644 --- a/keyboards/flx/lodestone/config.h +++ b/keyboards/flx/lodestone/config.h @@ -16,23 +16,6 @@ #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 { B3, B7, F0, F1, F4 } -#define MATRIX_COL_PINS { B2, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/flx/lodestone/info.json b/keyboards/flx/lodestone/info.json index e4b19ca8cd..a7d6a18e86 100644 --- a/keyboards/flx/lodestone/info.json +++ b/keyboards/flx/lodestone/info.json @@ -8,370 +8,395 @@ "pid": "0x4C53", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "F5", "F6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B3", "B7", "F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { "layout": [ - {"label":"K00 (B3,B2)", "x":0, "y":0}, - {"label":"K01 (B3,F5)", "x":1, "y":0}, - {"label":"K02 (B3,F6)", "x":2, "y":0}, - {"label":"K03 (B3,D0)", "x":3, "y":0}, - {"label":"K04 (B3,D1)", "x":4, "y":0}, - {"label":"K05 (B3,D2)", "x":5, "y":0}, - {"label":"K06 (B3,D3)", "x":6, "y":0}, - {"label":"K07 (B3,D5)", "x":7, "y":0}, - {"label":"K08 (B3,D4)", "x":8, "y":0}, - {"label":"K09 (B3,D6)", "x":9, "y":0}, - {"label":"K0A (B3,D7)", "x":10, "y":0}, - {"label":"K0B (B3,B4)", "x":11, "y":0}, - {"label":"K0C (B3,B5)", "x":12, "y":0}, - {"label":"K0D (B3,B6)", "x":13, "y":0}, - {"label":"K0E (B3,C6)", "x":14, "y":0}, - {"label":"K0F (B3,C7)", "x":15, "y":0}, - {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B7,F5)", "x":1.5, "y":1}, - {"label":"K12 (B7,F6)", "x":2.5, "y":1}, - {"label":"K13 (B7,D0)", "x":3.5, "y":1}, - {"label":"K14 (B7,D1)", "x":4.5, "y":1}, - {"label":"K15 (B7,D2)", "x":5.5, "y":1}, - {"label":"K16 (B7,D3)", "x":6.5, "y":1}, - {"label":"K17 (B7,D5)", "x":7.5, "y":1}, - {"label":"K18 (B7,D4)", "x":8.5, "y":1}, - {"label":"K19 (B7,D6)", "x":9.5, "y":1}, - {"label":"K1A (B7,D7)", "x":10.5, "y":1}, - {"label":"K1B (B7,B4)", "x":11.5, "y":1}, - {"label":"K1C (B7,B5)", "x":12.5, "y":1}, - {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (B7,C7)", "x":15, "y":1}, - {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,D0)", "x":3.75, "y":2}, - {"label":"K24 (F0,D1)", "x":4.75, "y":2}, - {"label":"K25 (F0,D2)", "x":5.75, "y":2}, - {"label":"K26 (F0,D3)", "x":6.75, "y":2}, - {"label":"K27 (F0,D5)", "x":7.75, "y":2}, - {"label":"K28 (F0,D4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D6)", "x":9.75, "y":2}, - {"label":"K2A (F0,D7)", "x":10.75, "y":2}, - {"label":"K2B (F0,B4)", "x":11.75, "y":2}, - {"label":"K2C (F0,B5)", "x":12.75, "y":2}, - {"label":"K2D (F0,B6)", "x":13.75, "y":2, "w":1.25}, - {"label":"K2F (F0,C7)", "x":15, "y":2}, - {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (F1,F5)", "x":1.25, "y":3}, - {"label":"K32 (F1,F6)", "x":2.25, "y":3}, - {"label":"K33 (F1,D0)", "x":3.25, "y":3}, - {"label":"K34 (F1,D1)", "x":4.25, "y":3}, - {"label":"K35 (F1,D2)", "x":5.25, "y":3}, - {"label":"K36 (F1,D3)", "x":6.25, "y":3}, - {"label":"K37 (F1,D5)", "x":7.25, "y":3}, - {"label":"K38 (F1,D4)", "x":8.25, "y":3}, - {"label":"K39 (F1,D6)", "x":9.25, "y":3}, - {"label":"K3A (F1,D7)", "x":10.25, "y":3}, - {"label":"K3B (F1,B4)", "x":11.25, "y":3}, - {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3E (F1,C6)", "x":14, "y":3}, - {"label":"K3F (F1,C7)", "x":15, "y":3}, - {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4D (F4,B6)", "x":13, "y":4}, - {"label":"K4E (F4,C6)", "x":14, "y":4}, - {"label":"K4F (F4,C7)", "x":15, "y":4} + {"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": [0, 15], "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": [1, 15], "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, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 15], "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, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "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, 6], "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, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_blocker": { "layout": [ - {"label":"K00 (B3,B2)", "x":0, "y":0}, - {"label":"K01 (B3,F5)", "x":1, "y":0}, - {"label":"K02 (B3,F6)", "x":2, "y":0}, - {"label":"K03 (B3,D0)", "x":3, "y":0}, - {"label":"K04 (B3,D1)", "x":4, "y":0}, - {"label":"K05 (B3,D2)", "x":5, "y":0}, - {"label":"K06 (B3,D3)", "x":6, "y":0}, - {"label":"K07 (B3,D5)", "x":7, "y":0}, - {"label":"K08 (B3,D4)", "x":8, "y":0}, - {"label":"K09 (B3,D6)", "x":9, "y":0}, - {"label":"K0A (B3,D7)", "x":10, "y":0}, - {"label":"K0B (B3,B4)", "x":11, "y":0}, - {"label":"K0C (B3,B5)", "x":12, "y":0}, - {"label":"K0D (B3,B6)", "x":13, "y":0, "w":2}, - {"label":"K0F (B3,C7)", "x":15, "y":0}, - {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B7,F5)", "x":1.5, "y":1}, - {"label":"K12 (B7,F6)", "x":2.5, "y":1}, - {"label":"K13 (B7,D0)", "x":3.5, "y":1}, - {"label":"K14 (B7,D1)", "x":4.5, "y":1}, - {"label":"K15 (B7,D2)", "x":5.5, "y":1}, - {"label":"K16 (B7,D3)", "x":6.5, "y":1}, - {"label":"K17 (B7,D5)", "x":7.5, "y":1}, - {"label":"K18 (B7,D4)", "x":8.5, "y":1}, - {"label":"K19 (B7,D6)", "x":9.5, "y":1}, - {"label":"K1A (B7,D7)", "x":10.5, "y":1}, - {"label":"K1B (B7,B4)", "x":11.5, "y":1}, - {"label":"K1C (B7,B5)", "x":12.5, "y":1}, - {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (B7,C7)", "x":15, "y":1}, - {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,D0)", "x":3.75, "y":2}, - {"label":"K24 (F0,D1)", "x":4.75, "y":2}, - {"label":"K25 (F0,D2)", "x":5.75, "y":2}, - {"label":"K26 (F0,D3)", "x":6.75, "y":2}, - {"label":"K27 (F0,D5)", "x":7.75, "y":2}, - {"label":"K28 (F0,D4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D6)", "x":9.75, "y":2}, - {"label":"K2A (F0,D7)", "x":10.75, "y":2}, - {"label":"K2B (F0,B4)", "x":11.75, "y":2}, - {"label":"K2D (F0,B6)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2F (F0,C7)", "x":15, "y":2}, - {"label":"K30 (F1,B2)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (F1,F6)", "x":2.25, "y":3}, - {"label":"K33 (F1,D0)", "x":3.25, "y":3}, - {"label":"K34 (F1,D1)", "x":4.25, "y":3}, - {"label":"K35 (F1,D2)", "x":5.25, "y":3}, - {"label":"K36 (F1,D3)", "x":6.25, "y":3}, - {"label":"K37 (F1,D5)", "x":7.25, "y":3}, - {"label":"K38 (F1,D4)", "x":8.25, "y":3}, - {"label":"K39 (F1,D6)", "x":9.25, "y":3}, - {"label":"K3A (F1,D7)", "x":10.25, "y":3}, - {"label":"K3B (F1,B4)", "x":11.25, "y":3}, - {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3E (F1,C6)", "x":14, "y":3}, - {"label":"K3F (F1,C7)", "x":15, "y":3}, - {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4D (F4,B6)", "x":13, "y":4}, - {"label":"K4E (F4,C6)", "x":14, "y":4}, - {"label":"K4F (F4,C7)", "x":15, "y":4} + {"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": [0, 15], "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": [1, 15], "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": [2, 15], "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, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "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, 6], "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, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ - {"label":"K00 (B3,B2)", "x":0, "y":0}, - {"label":"K01 (B3,F5)", "x":1, "y":0}, - {"label":"K02 (B3,F6)", "x":2, "y":0}, - {"label":"K03 (B3,D0)", "x":3, "y":0}, - {"label":"K04 (B3,D1)", "x":4, "y":0}, - {"label":"K05 (B3,D2)", "x":5, "y":0}, - {"label":"K06 (B3,D3)", "x":6, "y":0}, - {"label":"K07 (B3,D5)", "x":7, "y":0}, - {"label":"K08 (B3,D4)", "x":8, "y":0}, - {"label":"K09 (B3,D6)", "x":9, "y":0}, - {"label":"K0A (B3,D7)", "x":10, "y":0}, - {"label":"K0B (B3,B4)", "x":11, "y":0}, - {"label":"K0C (B3,B5)", "x":12, "y":0}, - {"label":"K0D (B3,B6)", "x":13, "y":0}, - {"label":"K0E (B3,C6)", "x":14, "y":0}, - {"label":"K0F (B3,C7)", "x":15, "y":0}, - {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B7,F5)", "x":1.5, "y":1}, - {"label":"K12 (B7,F6)", "x":2.5, "y":1}, - {"label":"K13 (B7,D0)", "x":3.5, "y":1}, - {"label":"K14 (B7,D1)", "x":4.5, "y":1}, - {"label":"K15 (B7,D2)", "x":5.5, "y":1}, - {"label":"K16 (B7,D3)", "x":6.5, "y":1}, - {"label":"K17 (B7,D5)", "x":7.5, "y":1}, - {"label":"K18 (B7,D4)", "x":8.5, "y":1}, - {"label":"K19 (B7,D6)", "x":9.5, "y":1}, - {"label":"K1A (B7,D7)", "x":10.5, "y":1}, - {"label":"K1B (B7,B4)", "x":11.5, "y":1}, - {"label":"K1C (B7,B5)", "x":12.5, "y":1}, - {"label":"K1D (B7,B6)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (B7,C7)", "x":15, "y":1}, - {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,D0)", "x":3.75, "y":2}, - {"label":"K24 (F0,D1)", "x":4.75, "y":2}, - {"label":"K25 (F0,D2)", "x":5.75, "y":2}, - {"label":"K26 (F0,D3)", "x":6.75, "y":2}, - {"label":"K27 (F0,D5)", "x":7.75, "y":2}, - {"label":"K28 (F0,D4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D6)", "x":9.75, "y":2}, - {"label":"K2A (F0,D7)", "x":10.75, "y":2}, - {"label":"K2B (F0,B4)", "x":11.75, "y":2}, - {"label":"K2D (F0,B6)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2F (F0,C7)", "x":15, "y":2}, - {"label":"K30 (F1,B2)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (F1,F6)", "x":2.25, "y":3}, - {"label":"K33 (F1,D0)", "x":3.25, "y":3}, - {"label":"K34 (F1,D1)", "x":4.25, "y":3}, - {"label":"K35 (F1,D2)", "x":5.25, "y":3}, - {"label":"K36 (F1,D3)", "x":6.25, "y":3}, - {"label":"K37 (F1,D5)", "x":7.25, "y":3}, - {"label":"K38 (F1,D4)", "x":8.25, "y":3}, - {"label":"K39 (F1,D6)", "x":9.25, "y":3}, - {"label":"K3A (F1,D7)", "x":10.25, "y":3}, - {"label":"K3B (F1,B4)", "x":11.25, "y":3}, - {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3E (F1,C6)", "x":14, "y":3}, - {"label":"K3F (F1,C7)", "x":15, "y":3}, - {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4D (F4,B6)", "x":13, "y":4}, - {"label":"K4E (F4,C6)", "x":14, "y":4}, - {"label":"K4F (F4,C7)", "x":15, "y":4} + {"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": [0, 15], "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": [1, 15], "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": [2, 15], "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, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "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, 6], "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, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_iso_blocker": { "layout": [ - {"label":"K00 (B3,B2)", "x":0, "y":0}, - {"label":"K01 (B3,F5)", "x":1, "y":0}, - {"label":"K02 (B3,F6)", "x":2, "y":0}, - {"label":"K03 (B3,D0)", "x":3, "y":0}, - {"label":"K04 (B3,D1)", "x":4, "y":0}, - {"label":"K05 (B3,D2)", "x":5, "y":0}, - {"label":"K06 (B3,D3)", "x":6, "y":0}, - {"label":"K07 (B3,D5)", "x":7, "y":0}, - {"label":"K08 (B3,D4)", "x":8, "y":0}, - {"label":"K09 (B3,D6)", "x":9, "y":0}, - {"label":"K0A (B3,D7)", "x":10, "y":0}, - {"label":"K0B (B3,B4)", "x":11, "y":0}, - {"label":"K0C (B3,B5)", "x":12, "y":0}, - {"label":"K0D (B3,B6)", "x":13, "y":0, "w":2}, - {"label":"K0F (B3,C7)", "x":15, "y":0}, - {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B7,F5)", "x":1.5, "y":1}, - {"label":"K12 (B7,F6)", "x":2.5, "y":1}, - {"label":"K13 (B7,D0)", "x":3.5, "y":1}, - {"label":"K14 (B7,D1)", "x":4.5, "y":1}, - {"label":"K15 (B7,D2)", "x":5.5, "y":1}, - {"label":"K16 (B7,D3)", "x":6.5, "y":1}, - {"label":"K17 (B7,D5)", "x":7.5, "y":1}, - {"label":"K18 (B7,D4)", "x":8.5, "y":1}, - {"label":"K19 (B7,D6)", "x":9.5, "y":1}, - {"label":"K1A (B7,D7)", "x":10.5, "y":1}, - {"label":"K1B (B7,B4)", "x":11.5, "y":1}, - {"label":"K1C (B7,B5)", "x":12.5, "y":1}, - {"label":"K1F (B7,C7)", "x":15, "y":1}, - {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,D0)", "x":3.75, "y":2}, - {"label":"K24 (F0,D1)", "x":4.75, "y":2}, - {"label":"K25 (F0,D2)", "x":5.75, "y":2}, - {"label":"K26 (F0,D3)", "x":6.75, "y":2}, - {"label":"K27 (F0,D5)", "x":7.75, "y":2}, - {"label":"K28 (F0,D4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D6)", "x":9.75, "y":2}, - {"label":"K2A (F0,D7)", "x":10.75, "y":2}, - {"label":"K2B (F0,B4)", "x":11.75, "y":2}, - {"label":"K2C (F0,B5)", "x":12.75, "y":2}, - {"label":"K2D (F0,B6)", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"K2F (F0,C7)", "x":15, "y":2}, - {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (F1,F5)", "x":1.25, "y":3}, - {"label":"K32 (F1,F6)", "x":2.25, "y":3}, - {"label":"K33 (F1,D0)", "x":3.25, "y":3}, - {"label":"K34 (F1,D1)", "x":4.25, "y":3}, - {"label":"K35 (F1,D2)", "x":5.25, "y":3}, - {"label":"K36 (F1,D3)", "x":6.25, "y":3}, - {"label":"K37 (F1,D5)", "x":7.25, "y":3}, - {"label":"K38 (F1,D4)", "x":8.25, "y":3}, - {"label":"K39 (F1,D6)", "x":9.25, "y":3}, - {"label":"K3A (F1,D7)", "x":10.25, "y":3}, - {"label":"K3B (F1,B4)", "x":11.25, "y":3}, - {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3E (F1,C6)", "x":14, "y":3}, - {"label":"K3F (F1,C7)", "x":15, "y":3}, - {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4D (F4,B6)", "x":13, "y":4}, - {"label":"K4E (F4,C6)", "x":14, "y":4}, - {"label":"K4F (F4,C7)", "x":15, "y":4} + {"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": [0, 15], "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, 15], "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, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "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, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "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, 6], "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, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_iso_blocker_split_bs": { "layout": [ - {"label":"K00 (B3,B2)", "x":0, "y":0}, - {"label":"K01 (B3,F5)", "x":1, "y":0}, - {"label":"K02 (B3,F6)", "x":2, "y":0}, - {"label":"K03 (B3,D0)", "x":3, "y":0}, - {"label":"K04 (B3,D1)", "x":4, "y":0}, - {"label":"K05 (B3,D2)", "x":5, "y":0}, - {"label":"K06 (B3,D3)", "x":6, "y":0}, - {"label":"K07 (B3,D5)", "x":7, "y":0}, - {"label":"K08 (B3,D4)", "x":8, "y":0}, - {"label":"K09 (B3,D6)", "x":9, "y":0}, - {"label":"K0A (B3,D7)", "x":10, "y":0}, - {"label":"K0B (B3,B4)", "x":11, "y":0}, - {"label":"K0C (B3,B5)", "x":12, "y":0}, - {"label":"K0D (B3,B6)", "x":13, "y":0}, - {"label":"K0E (B3,C6)", "x":14, "y":0}, - {"label":"K0F (B3,C7)", "x":15, "y":0}, - {"label":"K10 (B7,B2)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B7,F5)", "x":1.5, "y":1}, - {"label":"K12 (B7,F6)", "x":2.5, "y":1}, - {"label":"K13 (B7,D0)", "x":3.5, "y":1}, - {"label":"K14 (B7,D1)", "x":4.5, "y":1}, - {"label":"K15 (B7,D2)", "x":5.5, "y":1}, - {"label":"K16 (B7,D3)", "x":6.5, "y":1}, - {"label":"K17 (B7,D5)", "x":7.5, "y":1}, - {"label":"K18 (B7,D4)", "x":8.5, "y":1}, - {"label":"K19 (B7,D6)", "x":9.5, "y":1}, - {"label":"K1A (B7,D7)", "x":10.5, "y":1}, - {"label":"K1B (B7,B4)", "x":11.5, "y":1}, - {"label":"K1C (B7,B5)", "x":12.5, "y":1}, - {"label":"K1F (B7,C7)", "x":15, "y":1}, - {"label":"K20 (F0,B2)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,D0)", "x":3.75, "y":2}, - {"label":"K24 (F0,D1)", "x":4.75, "y":2}, - {"label":"K25 (F0,D2)", "x":5.75, "y":2}, - {"label":"K26 (F0,D3)", "x":6.75, "y":2}, - {"label":"K27 (F0,D5)", "x":7.75, "y":2}, - {"label":"K28 (F0,D4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D6)", "x":9.75, "y":2}, - {"label":"K2A (F0,D7)", "x":10.75, "y":2}, - {"label":"K2B (F0,B4)", "x":11.75, "y":2}, - {"label":"K2C (F0,B5)", "x":12.75, "y":2}, - {"label":"K2D (F0,B6)", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"K2F (F0,C7)", "x":15, "y":2}, - {"label":"K30 (F1,B2)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (F1,F5)", "x":1.25, "y":3}, - {"label":"K32 (F1,F6)", "x":2.25, "y":3}, - {"label":"K33 (F1,D0)", "x":3.25, "y":3}, - {"label":"K34 (F1,D1)", "x":4.25, "y":3}, - {"label":"K35 (F1,D2)", "x":5.25, "y":3}, - {"label":"K36 (F1,D3)", "x":6.25, "y":3}, - {"label":"K37 (F1,D5)", "x":7.25, "y":3}, - {"label":"K38 (F1,D4)", "x":8.25, "y":3}, - {"label":"K39 (F1,D6)", "x":9.25, "y":3}, - {"label":"K3A (F1,D7)", "x":10.25, "y":3}, - {"label":"K3B (F1,B4)", "x":11.25, "y":3}, - {"label":"K3C (F1,B5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3E (F1,C6)", "x":14, "y":3}, - {"label":"K3F (F1,C7)", "x":15, "y":3}, - {"label":"K40 (F4,B2)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F4,F5)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (F4,F6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (F4,D3)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (F4,D7)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (F4,B4)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4D (F4,B6)", "x":13, "y":4}, - {"label":"K4E (F4,C6)", "x":14, "y":4}, - {"label":"K4F (F4,C7)", "x":15, "y":4} + {"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": [0, 15], "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, 15], "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, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "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, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "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, 6], "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, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/flx/lodestone/lodestone.c b/keyboards/flx/lodestone/lodestone.c deleted file mode 100644 index bb0df70cc7..0000000000 --- a/keyboards/flx/lodestone/lodestone.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Shaun Mitchell (Flex) - * - * 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/>. - */ - -#include "lodestone.h" diff --git a/keyboards/flx/lodestone/lodestone.h b/keyboards/flx/lodestone/lodestone.h deleted file mode 100644 index 2e05b67deb..0000000000 --- a/keyboards/flx/lodestone/lodestone.h +++ /dev/null @@ -1,93 +0,0 @@ -/* Copyright 2020 Shaun Mitchell (Flex) - * - * 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" - -#define ___ KC_NO - -// standard 65% layout ANSI + ISO - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \ -} - -#define LAYOUT_65_ansi_blocker( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F }, \ - { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \ -} - -#define LAYOUT_65_ansi_blocker_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___, K2F }, \ - { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \ -} - -#define LAYOUT_65_iso_blocker( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \ -} - -#define LAYOUT_65_iso_blocker_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, ___, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \ -} diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h index f0c8fe016a..963824b82c 100644 --- a/keyboards/flx/virgo/config.h +++ b/keyboards/flx/virgo/config.h @@ -17,24 +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 { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 0 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -50,4 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json index 3464c98976..f7ce772482 100644 --- a/keyboards/flx/virgo/info.json +++ b/keyboards/flx/virgo/info.json @@ -8,106 +8,133 @@ "pid": "0x5647", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"], + "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (C6,F0)", "x":0, "y":0}, - {"label":"K01 (C6,F1)", "x":1.5, "y":0}, - {"label":"K11 (B6,F1)", "x":2.5, "y":0}, - {"label":"K02 (C6,F4)", "x":3.5, "y":0}, - {"label":"K12 (B6,F4)", "x":4.5, "y":0}, - {"label":"K03 (C6,F5)", "x":6, "y":0}, - {"label":"K13 (B6,F5)", "x":9, "y":0}, - {"label":"K04 (C6,F6)", "x":10, "y":0}, - {"label":"K14 (B6,F6)", "x":11, "y":0}, - {"label":"K05 (C6,F7)", "x":12.5, "y":0}, - {"label":"K15 (B6,F7)", "x":13.5, "y":0}, - {"label":"K06 (C6,C7)", "x":14.5, "y":0}, - {"label":"K16 (B6,C7)", "x":15.5, "y":0}, - {"label":"K07 (C6,B0)", "x":17.25, "y":0}, - {"label":"K17 (B6,B0)", "x":18.25, "y":0}, - {"label":"K08 (C6,B1)", "x":19.25, "y":0}, - {"label":"K20 (B5,F0)", "x":0, "y":1.25}, - {"label":"K30 (B4,F0)", "x":1, "y":1.25}, - {"label":"K21 (B5,F1)", "x":2, "y":1.25}, - {"label":"K31 (B4,F1)", "x":3, "y":1.25}, - {"label":"K22 (B5,F4)", "x":4, "y":1.25}, - {"label":"K32 (B4,F4)", "x":5, "y":1.25}, - {"label":"K23 (B5,F5)", "x":6, "y":1.25}, - {"label":"K33 (B4,F5)", "x":9, "y":1.25}, - {"label":"K24 (B5,F6)", "x":10, "y":1.25}, - {"label":"K34 (B4,F6)", "x":11, "y":1.25}, - {"label":"K25 (B5,F7)", "x":12, "y":1.25}, - {"label":"K35 (B4,F7)", "x":13, "y":1.25}, - {"label":"K26 (B5,C7)", "x":14, "y":1.25}, - {"label":"K36 (B4,C7)", "x":15, "y":1.25}, - {"label":"K66 (D4,C7)", "x":16, "y":1.25}, - {"label":"K27 (B5,B0)", "x":17.25, "y":1.25}, - {"label":"K37 (B4,B0)", "x":18.25, "y":1.25}, - {"label":"K28 (B5,B1)", "x":19.25, "y":1.25}, - {"label":"K40 (D7,F0)", "x":0, "y":2.25, "w":1.5}, - {"label":"K50 (D6,F0)", "x":1.5, "y":2.25}, - {"label":"K41 (D7,F1)", "x":2.5, "y":2.25}, - {"label":"K51 (D6,F1)", "x":3.5, "y":2.25}, - {"label":"K42 (D7,F4)", "x":4.5, "y":2.25}, - {"label":"K52 (D6,F4)", "x":5.5, "y":2.25}, - {"label":"K43 (D7,F5)", "x":8.5, "y":2.25}, - {"label":"K53 (D6,F5)", "x":9.5, "y":2.25}, - {"label":"K44 (D7,F6)", "x":10.5, "y":2.25}, - {"label":"K54 (D6,F6)", "x":11.5, "y":2.25}, - {"label":"K45 (D7,F7)", "x":12.5, "y":2.25}, - {"label":"K55 (D6,F7)", "x":13.5, "y":2.25}, - {"label":"K46 (D7,C7)", "x":14.5, "y":2.25}, - {"label":"K56 (D6,C7)", "x":15.5, "y":2.25, "w":1.5}, - {"label":"K47 (D7,B0)", "x":17.25, "y":2.25}, - {"label":"K57 (D6,B0)", "x":18.25, "y":2.25}, - {"label":"K48 (D7,B1)", "x":19.25, "y":2.25}, - {"label":"K60 (D4,F0)", "x":0, "y":3.25, "w":1.75}, - {"label":"K70 (D5,F0)", "x":1.75, "y":3.25}, - {"label":"K61 (D4,F1)", "x":2.75, "y":3.25}, - {"label":"K71 (D5,F1)", "x":3.75, "y":3.25}, - {"label":"K62 (D4,F4)", "x":4.75, "y":3.25}, - {"label":"K72 (D5,F4)", "x":5.75, "y":3.25}, - {"label":"K63 (D4,F5)", "x":8.75, "y":3.25}, - {"label":"K73 (D5,F5)", "x":9.75, "y":3.25}, - {"label":"K64 (D4,F6)", "x":10.75, "y":3.25}, - {"label":"K74 (D5,F6)", "x":11.75, "y":3.25}, - {"label":"K65 (D4,F7)", "x":12.75, "y":3.25}, - {"label":"K75 (D5,F7)", "x":13.75, "y":3.25}, - {"label":"K76 (D5,C7)", "x":14.75, "y":3.25, "w":2.25}, - {"label":"K80 (D3,F0)", "x":0, "y":4.25, "w":1.25}, - {"label":"K90 (D2,F0)", "x":1.25, "y":4.25}, - {"label":"K81 (D3,F1)", "x":2.25, "y":4.25}, - {"label":"K91 (D2,F1)", "x":3.25, "y":4.25}, - {"label":"K82 (D3,F4)", "x":4.25, "y":4.25}, - {"label":"K92 (D2,F4)", "x":5.25, "y":4.25}, - {"label":"K83 (D3,F5)", "x":6.25, "y":4.25}, - {"label":"KA3 (D1,F5)", "x":8.25, "y":4.25}, - {"label":"K93 (D2,F5)", "x":9.25, "y":4.25}, - {"label":"K84 (D3,F6)", "x":10.25, "y":4.25}, - {"label":"K94 (D2,F6)", "x":11.25, "y":4.25}, - {"label":"K85 (D3,F7)", "x":12.25, "y":4.25}, - {"label":"K95 (D2,F7)", "x":13.25, "y":4.25}, - {"label":"K86 (D3,C7)", "x":14.25, "y":4.25, "w":1.75}, - {"label":"K96 (D2,C7)", "x":16, "y":4.25}, - {"label":"K97 (D2,B0)", "x":18.25, "y":4.25}, - {"label":"KA0 (D1,F0)", "x":0, "y":5.25, "w":1.5}, - {"label":"KB0 (D0,F0)", "x":2.5, "y":5.25, "w":1.5}, - {"label":"KA1 (D1,F1)", "x":4, "y":5.25}, - {"label":"KB2 (D0,F4)", "x":5, "y":5.25, "w":2.25}, - {"label":"KB4 (D0,F6)", "x":8.25, "y":5.25, "w":2.75}, - {"label":"KB5 (D0,F7)", "x":11, "y":5.25}, - {"label":"KA6 (D1,C7)", "x":12, "y":5.25, "w":1.5}, - {"label":"KB6 (D0,C7)", "x":14.5, "y":5.25, "w":1.5}, - {"label":"KA7 (D1,B0)", "x":17.25, "y":5.25}, - {"label":"KB7 (D0,B0)", "x":18.25, "y":5.25}, - {"label":"KA8 (D1,B1)", "x":19.25, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [1, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [1, 2], "x": 4.5, "y": 0}, + + {"matrix": [0, 3], "x": 6, "y": 0}, + + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [0, 4], "x": 10, "y": 0}, + {"matrix": [1, 4], "x": 11, "y": 0}, + + {"matrix": [0, 5], "x": 12.5, "y": 0}, + {"matrix": [1, 5], "x": 13.5, "y": 0}, + {"matrix": [0, 6], "x": 14.5, "y": 0}, + {"matrix": [1, 6], "x": 15.5, "y": 0}, + + {"matrix": [0, 7], "x": 17.25, "y": 0}, + {"matrix": [1, 7], "x": 18.25, "y": 0}, + {"matrix": [0, 8], "x": 19.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.25}, + {"matrix": [3, 0], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [2, 2], "x": 4, "y": 1.25}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, + {"matrix": [2, 3], "x": 6, "y": 1.25}, + + {"matrix": [3, 3], "x": 9, "y": 1.25}, + {"matrix": [2, 4], "x": 10, "y": 1.25}, + {"matrix": [3, 4], "x": 11, "y": 1.25}, + {"matrix": [2, 5], "x": 12, "y": 1.25}, + {"matrix": [3, 5], "x": 13, "y": 1.25}, + {"matrix": [2, 6], "x": 14, "y": 1.25}, + {"matrix": [3, 6], "x": 15, "y": 1.25}, + {"matrix": [6, 6], "x": 16, "y": 1.25}, + + {"matrix": [2, 7], "x": 17.25, "y": 1.25}, + {"matrix": [3, 7], "x": 18.25, "y": 1.25}, + {"matrix": [2, 8], "x": 19.25, "y": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + + {"matrix": [4, 3], "x": 8.5, "y": 2.25}, + {"matrix": [5, 3], "x": 9.5, "y": 2.25}, + {"matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"matrix": [5, 4], "x": 11.5, "y": 2.25}, + {"matrix": [4, 5], "x": 12.5, "y": 2.25}, + {"matrix": [5, 5], "x": 13.5, "y": 2.25}, + {"matrix": [4, 6], "x": 14.5, "y": 2.25}, + {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5}, + + {"matrix": [4, 7], "x": 17.25, "y": 2.25}, + {"matrix": [5, 7], "x": 18.25, "y": 2.25}, + {"matrix": [4, 8], "x": 19.25, "y": 2.25}, + + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3.25}, + + {"matrix": [6, 3], "x": 8.75, "y": 3.25}, + {"matrix": [7, 3], "x": 9.75, "y": 3.25}, + {"matrix": [6, 4], "x": 10.75, "y": 3.25}, + {"matrix": [7, 4], "x": 11.75, "y": 3.25}, + {"matrix": [6, 5], "x": 12.75, "y": 3.25}, + {"matrix": [7, 5], "x": 13.75, "y": 3.25}, + {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4.25}, + {"matrix": [9, 1], "x": 3.25, "y": 4.25}, + {"matrix": [8, 2], "x": 4.25, "y": 4.25}, + {"matrix": [9, 2], "x": 5.25, "y": 4.25}, + {"matrix": [8, 3], "x": 6.25, "y": 4.25}, + + {"matrix": [10, 3], "x": 8.25, "y": 4.25}, + {"matrix": [9, 3], "x": 9.25, "y": 4.25}, + {"matrix": [8, 4], "x": 10.25, "y": 4.25}, + {"matrix": [9, 4], "x": 11.25, "y": 4.25}, + {"matrix": [8, 5], "x": 12.25, "y": 4.25}, + {"matrix": [9, 5], "x": 13.25, "y": 4.25}, + {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75}, + {"matrix": [9, 6], "x": 16, "y": 4.25}, + + {"matrix": [9, 7], "x": 18.25, "y": 4.25}, + + {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [10, 1], "x": 4, "y": 5.25}, + {"matrix": [11, 2], "x": 5, "y": 5.25, "w": 2.25}, + + {"matrix": [11, 4], "x": 8.25, "y": 5.25, "w": 2.75}, + {"matrix": [11, 5], "x": 11, "y": 5.25}, + {"matrix": [10, 6], "x": 12, "y": 5.25, "w": 1.5}, + {"matrix": [11, 6], "x": 14.5, "y": 5.25, "w": 1.5}, + + {"matrix": [10, 7], "x": 17.25, "y": 5.25}, + {"matrix": [11, 7], "x": 18.25, "y": 5.25}, + {"matrix": [10, 8], "x": 19.25, "y": 5.25} ] } } diff --git a/keyboards/flx/virgo/virgo.c b/keyboards/flx/virgo/virgo.c index 679f90fb66..5260e15322 100644 --- a/keyboards/flx/virgo/virgo.c +++ b/keyboards/flx/virgo/virgo.c @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "virgo.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/flx/virgo/virgo.h b/keyboards/flx/virgo/virgo.h deleted file mode 100644 index fcfcac50e4..0000000000 --- a/keyboards/flx/virgo/virgo.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 MechMerlin - * Edits etc 2020 Flexerm - * - * 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" - -#define LAYOUT( \ - K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K66, K27, K37, K28, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \ - K80, K90, K81, K91, K82, K92, K83, KA3, K93, K84, K94, K85, K95, K86, K96, K97, \ - KA0, KB0, KA1, KB2, KB4, KB5, KA6, KB6, KA7, KB7, KA8 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { KC_NO, K11, K12, K13, K14, K15, K16, K17, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, K66, KC_NO, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO, KC_NO }, \ - { K80, K81, K82, K83, K84, K85, K86, KC_NO, KC_NO }, \ - { K90, K91, K92, K93, K94, K95, K96, K97, KC_NO }, \ - { KA0, KA1, KC_NO, KA3, KC_NO, KC_NO, KA6, KA7, KA8 }, \ - { KB0, KC_NO, KB2, KC_NO, KB4, KB5, KB6, KB7, KC_NO }, \ -} - |