From fd6449e42cf326bdf17eab118639faa6b0359eb7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 19:27:11 +1000 Subject: Move split space/backspace layouts to data driven (#20356) --- keyboards/mechlovin/hex4b/hex4b.h | 104 ----- keyboards/mechlovin/hex4b/info.json | 708 +++++++++++++++-------------- keyboards/mechlovin/olly/octagon/info.json | 95 +++- keyboards/mechlovin/olly/octagon/octagon.c | 2 +- keyboards/mechlovin/olly/octagon/octagon.h | 37 -- 5 files changed, 459 insertions(+), 487 deletions(-) delete mode 100644 keyboards/mechlovin/hex4b/hex4b.h delete mode 100644 keyboards/mechlovin/olly/octagon/octagon.h (limited to 'keyboards/mechlovin') diff --git a/keyboards/mechlovin/hex4b/hex4b.h b/keyboards/mechlovin/hex4b/hex4b.h deleted file mode 100644 index 17e2da910f..0000000000 --- a/keyboards/mechlovin/hex4b/hex4b.h +++ /dev/null @@ -1,104 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* - * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐ - * │00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │ - * ├───┼─┴─┬─┴─┬─┴─┬─┴─┬─┴─┼───┼───┼───┼───┼─┴─┬─┴─┬─┴─┬─┴─┬─┴─┼───┤ ┌───────┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │1E │ │1D │ 2u Backspace - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └───────┘ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │40 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4E │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───────┼───┤ - * │50 │51 │52 │56 │5A │5B │ │5C │5D │5E │ - * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - * ┌─────┬───┬─────┬───────────────────────────┬─────┐ - * │50 │51 │52 │56 │5B │ Tsangan - * └─────┴───┴─────┴───────────────────────────┴─────┘ - */ - -#define LAYOUT_split_bs( \ - K00, K01, K02, K03, K04, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \ -} - -#define LAYOUT_2u_bs( \ - K00, K01, K02, K03, K04, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \ - { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \ -} - -#define LAYOUT_tsangan_split_bs( \ - K00, K01, K02, K03, K04, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K56, K5B, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }, \ -} - -#define LAYOUT_tsangan_2u_bs( \ - K00, K01, K02, K03, K04, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K56, K5B, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \ - { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }, \ -} diff --git a/keyboards/mechlovin/hex4b/info.json b/keyboards/mechlovin/hex4b/info.json index 3cc4645584..9964736255 100644 --- a/keyboards/mechlovin/hex4b/info.json +++ b/keyboards/mechlovin/hex4b/info.json @@ -16,362 +16,382 @@ "layouts": { "LAYOUT_split_bs": { "layout": [ - {"label":"K00 (B0,B6)", "x":0, "y":0}, - {"label":"K01 (B0,B7)", "x":1.5, "y":0}, - {"label":"K02 (B0,C0)", "x":2.5, "y":0}, - {"label":"K03 (B0,C1)", "x":3.5, "y":0}, - {"label":"K04 (B0,C2)", "x":4.5, "y":0}, - {"label":"K06 (B0,C4)", "x":6, "y":0}, - {"label":"K07 (B0,C5)", "x":7, "y":0}, - {"label":"K08 (B0,C6)", "x":8, "y":0}, - {"label":"K09 (B0,C7)", "x":9, "y":0}, - {"label":"K0A (B0,D0)", "x":10.5, "y":0}, - {"label":"K0B (B0,D1)", "x":11.5, "y":0}, - {"label":"K0C (B0,D2)", "x":12.5, "y":0}, - {"label":"K0D (B0,D3)", "x":13.5, "y":0}, - {"label":"K0E (B0,D4)", "x":15, "y":0}, - - {"label":"K10 (B1,B6)", "x":0, "y":1}, - {"label":"K11 (B1,B7)", "x":1, "y":1}, - {"label":"K12 (B1,C0)", "x":2, "y":1}, - {"label":"K13 (B1,C1)", "x":3, "y":1}, - {"label":"K14 (B1,C2)", "x":4, "y":1}, - {"label":"K15 (B1,C3)", "x":5, "y":1}, - {"label":"K16 (B1,C4)", "x":6, "y":1}, - {"label":"K17 (B1,C5)", "x":7, "y":1}, - {"label":"K18 (B1,C6)", "x":8, "y":1}, - {"label":"K19 (B1,C7)", "x":9, "y":1}, - {"label":"K1A (B1,D0)", "x":10, "y":1}, - {"label":"K1B (B1,D1)", "x":11, "y":1}, - {"label":"K1C (B1,D2)", "x":12, "y":1}, - {"label":"K1D (B1,D3)", "x":13, "y":1}, - {"label":"K3C (B3,D2)", "x":14, "y":1}, - {"label":"K1E (B1,D4)", "x":15, "y":1}, - - {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5}, - {"label":"K21 (B2,B7)", "x":1.5, "y":2}, - {"label":"K22 (B2,C0)", "x":2.5, "y":2}, - {"label":"K23 (B2,C1)", "x":3.5, "y":2}, - {"label":"K24 (B2,C2)", "x":4.5, "y":2}, - {"label":"K25 (B2,C3)", "x":5.5, "y":2}, - {"label":"K26 (B2,C4)", "x":6.5, "y":2}, - {"label":"K27 (B2,C5)", "x":7.5, "y":2}, - {"label":"K28 (B2,C6)", "x":8.5, "y":2}, - {"label":"K29 (B2,C7)", "x":9.5, "y":2}, - {"label":"K2A (B2,D0)", "x":10.5, "y":2}, - {"label":"K2B (B2,D1)", "x":11.5, "y":2}, - {"label":"K2C (B2,D2)", "x":12.5, "y":2}, - {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5}, - {"label":"K2E (B2,D4)", "x":15, "y":2}, - - {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75}, - {"label":"K31 (B3,B7)", "x":1.75, "y":3}, - {"label":"K32 (B3,C0)", "x":2.75, "y":3}, - {"label":"K33 (B3,C1)", "x":3.75, "y":3}, - {"label":"K34 (B3,C2)", "x":4.75, "y":3}, - {"label":"K35 (B3,C3)", "x":5.75, "y":3}, - {"label":"K36 (B3,C4)", "x":6.75, "y":3}, - {"label":"K37 (B3,C5)", "x":7.75, "y":3}, - {"label":"K38 (B3,C6)", "x":8.75, "y":3}, - {"label":"K39 (B3,C7)", "x":9.75, "y":3}, - {"label":"K3A (B3,D0)", "x":10.75, "y":3}, - {"label":"K3B (B3,D1)", "x":11.75, "y":3}, - {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25}, - {"label":"K3E (B3,D4)", "x":15, "y":3}, - - {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25}, - {"label":"K42 (B4,C0)", "x":2.25, "y":4}, - {"label":"K43 (B4,C1)", "x":3.25, "y":4}, - {"label":"K44 (B4,C2)", "x":4.25, "y":4}, - {"label":"K45 (B4,C3)", "x":5.25, "y":4}, - {"label":"K46 (B4,C4)", "x":6.25, "y":4}, - {"label":"K47 (B4,C5)", "x":7.25, "y":4}, - {"label":"K48 (B4,C6)", "x":8.25, "y":4}, - {"label":"K49 (B4,C7)", "x":9.25, "y":4}, - {"label":"K4A (B4,D0)", "x":10.25, "y":4}, - {"label":"K4B (B4,D1)", "x":11.25, "y":4}, - {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75}, - {"label":"K4D (B4,D3)", "x":14, "y":4}, - {"label":"K4E (B4,D4)", "x":15, "y":4}, - - {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.25}, - {"label":"K51 (B5,B7)", "x":1.25, "y":5, "w":1.25}, - {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.25}, - {"label":"K56 (B5,C4)", "x":3.75, "y":5, "w":6.25}, - {"label":"K5A (B5,D0)", "x":10, "y":5, "w":1.25}, - {"label":"K5B (B5,D1)", "x":11.25, "y":5, "w":1.25}, - {"label":"K5C (B5,D2)", "x":13, "y":5}, - {"label":"K5D (B5,D3)", "x":14, "y":5}, - {"label":"K5E (B5,D4)", "x":15, "y":5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.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.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [3, 12], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25}, + + {"matrix": [5, 12], "x": 13, "y": 5}, + {"matrix": [5, 13], "x": 14, "y": 5}, + {"matrix": [5, 14], "x": 15, "y": 5} ] }, "LAYOUT_2u_bs": { "layout": [ - {"label":"K00 (B0,B6)", "x":0, "y":0}, - {"label":"K01 (B0,B7)", "x":1.5, "y":0}, - {"label":"K02 (B0,C0)", "x":2.5, "y":0}, - {"label":"K03 (B0,C1)", "x":3.5, "y":0}, - {"label":"K04 (B0,C2)", "x":4.5, "y":0}, - {"label":"K06 (B0,C4)", "x":6, "y":0}, - {"label":"K07 (B0,C5)", "x":7, "y":0}, - {"label":"K08 (B0,C6)", "x":8, "y":0}, - {"label":"K09 (B0,C7)", "x":9, "y":0}, - {"label":"K0A (B0,D0)", "x":10.5, "y":0}, - {"label":"K0B (B0,D1)", "x":11.5, "y":0}, - {"label":"K0C (B0,D2)", "x":12.5, "y":0}, - {"label":"K0D (B0,D3)", "x":13.5, "y":0}, - {"label":"K0E (B0,D4)", "x":15, "y":0}, - - {"label":"K10 (B1,B6)", "x":0, "y":1}, - {"label":"K11 (B1,B7)", "x":1, "y":1}, - {"label":"K12 (B1,C0)", "x":2, "y":1}, - {"label":"K13 (B1,C1)", "x":3, "y":1}, - {"label":"K14 (B1,C2)", "x":4, "y":1}, - {"label":"K15 (B1,C3)", "x":5, "y":1}, - {"label":"K16 (B1,C4)", "x":6, "y":1}, - {"label":"K17 (B1,C5)", "x":7, "y":1}, - {"label":"K18 (B1,C6)", "x":8, "y":1}, - {"label":"K19 (B1,C7)", "x":9, "y":1}, - {"label":"K1A (B1,D0)", "x":10, "y":1}, - {"label":"K1B (B1,D1)", "x":11, "y":1}, - {"label":"K1C (B1,D2)", "x":12, "y":1}, - {"label":"K1D (B1,D3)", "x":13, "y":1, "w":2}, - {"label":"K1E (B1,D4)", "x":15, "y":1}, - - {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5}, - {"label":"K21 (B2,B7)", "x":1.5, "y":2}, - {"label":"K22 (B2,C0)", "x":2.5, "y":2}, - {"label":"K23 (B2,C1)", "x":3.5, "y":2}, - {"label":"K24 (B2,C2)", "x":4.5, "y":2}, - {"label":"K25 (B2,C3)", "x":5.5, "y":2}, - {"label":"K26 (B2,C4)", "x":6.5, "y":2}, - {"label":"K27 (B2,C5)", "x":7.5, "y":2}, - {"label":"K28 (B2,C6)", "x":8.5, "y":2}, - {"label":"K29 (B2,C7)", "x":9.5, "y":2}, - {"label":"K2A (B2,D0)", "x":10.5, "y":2}, - {"label":"K2B (B2,D1)", "x":11.5, "y":2}, - {"label":"K2C (B2,D2)", "x":12.5, "y":2}, - {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5}, - {"label":"K2E (B2,D4)", "x":15, "y":2}, - - {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75}, - {"label":"K31 (B3,B7)", "x":1.75, "y":3}, - {"label":"K32 (B3,C0)", "x":2.75, "y":3}, - {"label":"K33 (B3,C1)", "x":3.75, "y":3}, - {"label":"K34 (B3,C2)", "x":4.75, "y":3}, - {"label":"K35 (B3,C3)", "x":5.75, "y":3}, - {"label":"K36 (B3,C4)", "x":6.75, "y":3}, - {"label":"K37 (B3,C5)", "x":7.75, "y":3}, - {"label":"K38 (B3,C6)", "x":8.75, "y":3}, - {"label":"K39 (B3,C7)", "x":9.75, "y":3}, - {"label":"K3A (B3,D0)", "x":10.75, "y":3}, - {"label":"K3B (B3,D1)", "x":11.75, "y":3}, - {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25}, - {"label":"K3E (B3,D4)", "x":15, "y":3}, - - {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25}, - {"label":"K42 (B4,C0)", "x":2.25, "y":4}, - {"label":"K43 (B4,C1)", "x":3.25, "y":4}, - {"label":"K44 (B4,C2)", "x":4.25, "y":4}, - {"label":"K45 (B4,C3)", "x":5.25, "y":4}, - {"label":"K46 (B4,C4)", "x":6.25, "y":4}, - {"label":"K47 (B4,C5)", "x":7.25, "y":4}, - {"label":"K48 (B4,C6)", "x":8.25, "y":4}, - {"label":"K49 (B4,C7)", "x":9.25, "y":4}, - {"label":"K4A (B4,D0)", "x":10.25, "y":4}, - {"label":"K4B (B4,D1)", "x":11.25, "y":4}, - {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75}, - {"label":"K4D (B4,D3)", "x":14, "y":4}, - {"label":"K4E (B4,D4)", "x":15, "y":4}, - - {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.25}, - {"label":"K51 (B5,B7)", "x":1.25, "y":5, "w":1.25}, - {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.25}, - {"label":"K56 (B5,C4)", "x":3.75, "y":5, "w":6.25}, - {"label":"K5A (B5,D0)", "x":10, "y":5, "w":1.25}, - {"label":"K5B (B5,D1)", "x":11.25, "y":5, "w":1.25}, - {"label":"K5C (B5,D2)", "x":13, "y":5}, - {"label":"K5D (B5,D3)", "x":14, "y":5}, - {"label":"K5E (B5,D4)", "x":15, "y":5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.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.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25}, + + {"matrix": [5, 12], "x": 13, "y": 5}, + {"matrix": [5, 13], "x": 14, "y": 5}, + {"matrix": [5, 14], "x": 15, "y": 5} ] }, "LAYOUT_tsangan_split_bs": { "layout": [ - {"label":"K00 (B0,B6)", "x":0, "y":0}, - {"label":"K01 (B0,B7)", "x":1.5, "y":0}, - {"label":"K02 (B0,C0)", "x":2.5, "y":0}, - {"label":"K03 (B0,C1)", "x":3.5, "y":0}, - {"label":"K04 (B0,C2)", "x":4.5, "y":0}, - {"label":"K06 (B0,C4)", "x":6, "y":0}, - {"label":"K07 (B0,C5)", "x":7, "y":0}, - {"label":"K08 (B0,C6)", "x":8, "y":0}, - {"label":"K09 (B0,C7)", "x":9, "y":0}, - {"label":"K0A (B0,D0)", "x":10.5, "y":0}, - {"label":"K0B (B0,D1)", "x":11.5, "y":0}, - {"label":"K0C (B0,D2)", "x":12.5, "y":0}, - {"label":"K0D (B0,D3)", "x":13.5, "y":0}, - {"label":"K0E (B0,D4)", "x":15, "y":0}, - - {"label":"K10 (B1,B6)", "x":0, "y":1}, - {"label":"K11 (B1,B7)", "x":1, "y":1}, - {"label":"K12 (B1,C0)", "x":2, "y":1}, - {"label":"K13 (B1,C1)", "x":3, "y":1}, - {"label":"K14 (B1,C2)", "x":4, "y":1}, - {"label":"K15 (B1,C3)", "x":5, "y":1}, - {"label":"K16 (B1,C4)", "x":6, "y":1}, - {"label":"K17 (B1,C5)", "x":7, "y":1}, - {"label":"K18 (B1,C6)", "x":8, "y":1}, - {"label":"K19 (B1,C7)", "x":9, "y":1}, - {"label":"K1A (B1,D0)", "x":10, "y":1}, - {"label":"K1B (B1,D1)", "x":11, "y":1}, - {"label":"K1C (B1,D2)", "x":12, "y":1}, - {"label":"K1D (B1,D3)", "x":13, "y":1}, - {"label":"K3C (B3,D2)", "x":14, "y":1}, - {"label":"K1E (B1,D4)", "x":15, "y":1}, - - {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5}, - {"label":"K21 (B2,B7)", "x":1.5, "y":2}, - {"label":"K22 (B2,C0)", "x":2.5, "y":2}, - {"label":"K23 (B2,C1)", "x":3.5, "y":2}, - {"label":"K24 (B2,C2)", "x":4.5, "y":2}, - {"label":"K25 (B2,C3)", "x":5.5, "y":2}, - {"label":"K26 (B2,C4)", "x":6.5, "y":2}, - {"label":"K27 (B2,C5)", "x":7.5, "y":2}, - {"label":"K28 (B2,C6)", "x":8.5, "y":2}, - {"label":"K29 (B2,C7)", "x":9.5, "y":2}, - {"label":"K2A (B2,D0)", "x":10.5, "y":2}, - {"label":"K2B (B2,D1)", "x":11.5, "y":2}, - {"label":"K2C (B2,D2)", "x":12.5, "y":2}, - {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5}, - {"label":"K2E (B2,D4)", "x":15, "y":2}, - - {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75}, - {"label":"K31 (B3,B7)", "x":1.75, "y":3}, - {"label":"K32 (B3,C0)", "x":2.75, "y":3}, - {"label":"K33 (B3,C1)", "x":3.75, "y":3}, - {"label":"K34 (B3,C2)", "x":4.75, "y":3}, - {"label":"K35 (B3,C3)", "x":5.75, "y":3}, - {"label":"K36 (B3,C4)", "x":6.75, "y":3}, - {"label":"K37 (B3,C5)", "x":7.75, "y":3}, - {"label":"K38 (B3,C6)", "x":8.75, "y":3}, - {"label":"K39 (B3,C7)", "x":9.75, "y":3}, - {"label":"K3A (B3,D0)", "x":10.75, "y":3}, - {"label":"K3B (B3,D1)", "x":11.75, "y":3}, - {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25}, - {"label":"K3E (B3,D4)", "x":15, "y":3}, - - {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25}, - {"label":"K42 (B4,C0)", "x":2.25, "y":4}, - {"label":"K43 (B4,C1)", "x":3.25, "y":4}, - {"label":"K44 (B4,C2)", "x":4.25, "y":4}, - {"label":"K45 (B4,C3)", "x":5.25, "y":4}, - {"label":"K46 (B4,C4)", "x":6.25, "y":4}, - {"label":"K47 (B4,C5)", "x":7.25, "y":4}, - {"label":"K48 (B4,C6)", "x":8.25, "y":4}, - {"label":"K49 (B4,C7)", "x":9.25, "y":4}, - {"label":"K4A (B4,D0)", "x":10.25, "y":4}, - {"label":"K4B (B4,D1)", "x":11.25, "y":4}, - {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75}, - {"label":"K4D (B4,D3)", "x":14, "y":4}, - {"label":"K4E (B4,D4)", "x":15, "y":4}, - - {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5}, - {"label":"K51 (B5,B7)", "x":1.5, "y":5}, - {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5}, - {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7}, - {"label":"K5B (B5,D1)", "x":11, "y":5, "w":1.5}, - {"label":"K5C (B5,D2)", "x":13, "y":5}, - {"label":"K5D (B5,D3)", "x":14, "y":5}, - {"label":"K5E (B5,D4)", "x":15, "y":5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.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.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [3, 12], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5}, + + {"matrix": [5, 12], "x": 13, "y": 5}, + {"matrix": [5, 13], "x": 14, "y": 5}, + {"matrix": [5, 14], "x": 15, "y": 5} ] }, "LAYOUT_tsangan_2u_bs": { "layout": [ - {"label":"K00 (B0,B6)", "x":0, "y":0}, - {"label":"K01 (B0,B7)", "x":1.5, "y":0}, - {"label":"K02 (B0,C0)", "x":2.5, "y":0}, - {"label":"K03 (B0,C1)", "x":3.5, "y":0}, - {"label":"K04 (B0,C2)", "x":4.5, "y":0}, - {"label":"K06 (B0,C4)", "x":6, "y":0}, - {"label":"K07 (B0,C5)", "x":7, "y":0}, - {"label":"K08 (B0,C6)", "x":8, "y":0}, - {"label":"K09 (B0,C7)", "x":9, "y":0}, - {"label":"K0A (B0,D0)", "x":10.5, "y":0}, - {"label":"K0B (B0,D1)", "x":11.5, "y":0}, - {"label":"K0C (B0,D2)", "x":12.5, "y":0}, - {"label":"K0D (B0,D3)", "x":13.5, "y":0}, - {"label":"K0E (B0,D4)", "x":15, "y":0}, - - {"label":"K10 (B1,B6)", "x":0, "y":1}, - {"label":"K11 (B1,B7)", "x":1, "y":1}, - {"label":"K12 (B1,C0)", "x":2, "y":1}, - {"label":"K13 (B1,C1)", "x":3, "y":1}, - {"label":"K14 (B1,C2)", "x":4, "y":1}, - {"label":"K15 (B1,C3)", "x":5, "y":1}, - {"label":"K16 (B1,C4)", "x":6, "y":1}, - {"label":"K17 (B1,C5)", "x":7, "y":1}, - {"label":"K18 (B1,C6)", "x":8, "y":1}, - {"label":"K19 (B1,C7)", "x":9, "y":1}, - {"label":"K1A (B1,D0)", "x":10, "y":1}, - {"label":"K1B (B1,D1)", "x":11, "y":1}, - {"label":"K1C (B1,D2)", "x":12, "y":1}, - {"label":"K1D (B1,D3)", "x":13, "y":1, "w":2}, - {"label":"K1E (B1,D4)", "x":15, "y":1}, - - {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5}, - {"label":"K21 (B2,B7)", "x":1.5, "y":2}, - {"label":"K22 (B2,C0)", "x":2.5, "y":2}, - {"label":"K23 (B2,C1)", "x":3.5, "y":2}, - {"label":"K24 (B2,C2)", "x":4.5, "y":2}, - {"label":"K25 (B2,C3)", "x":5.5, "y":2}, - {"label":"K26 (B2,C4)", "x":6.5, "y":2}, - {"label":"K27 (B2,C5)", "x":7.5, "y":2}, - {"label":"K28 (B2,C6)", "x":8.5, "y":2}, - {"label":"K29 (B2,C7)", "x":9.5, "y":2}, - {"label":"K2A (B2,D0)", "x":10.5, "y":2}, - {"label":"K2B (B2,D1)", "x":11.5, "y":2}, - {"label":"K2C (B2,D2)", "x":12.5, "y":2}, - {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5}, - {"label":"K2E (B2,D4)", "x":15, "y":2}, - - {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75}, - {"label":"K31 (B3,B7)", "x":1.75, "y":3}, - {"label":"K32 (B3,C0)", "x":2.75, "y":3}, - {"label":"K33 (B3,C1)", "x":3.75, "y":3}, - {"label":"K34 (B3,C2)", "x":4.75, "y":3}, - {"label":"K35 (B3,C3)", "x":5.75, "y":3}, - {"label":"K36 (B3,C4)", "x":6.75, "y":3}, - {"label":"K37 (B3,C5)", "x":7.75, "y":3}, - {"label":"K38 (B3,C6)", "x":8.75, "y":3}, - {"label":"K39 (B3,C7)", "x":9.75, "y":3}, - {"label":"K3A (B3,D0)", "x":10.75, "y":3}, - {"label":"K3B (B3,D1)", "x":11.75, "y":3}, - {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25}, - {"label":"K3E (B3,D4)", "x":15, "y":3}, - - {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25}, - {"label":"K42 (B4,C0)", "x":2.25, "y":4}, - {"label":"K43 (B4,C1)", "x":3.25, "y":4}, - {"label":"K44 (B4,C2)", "x":4.25, "y":4}, - {"label":"K45 (B4,C3)", "x":5.25, "y":4}, - {"label":"K46 (B4,C4)", "x":6.25, "y":4}, - {"label":"K47 (B4,C5)", "x":7.25, "y":4}, - {"label":"K48 (B4,C6)", "x":8.25, "y":4}, - {"label":"K49 (B4,C7)", "x":9.25, "y":4}, - {"label":"K4A (B4,D0)", "x":10.25, "y":4}, - {"label":"K4B (B4,D1)", "x":11.25, "y":4}, - {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75}, - {"label":"K4D (B4,D3)", "x":14, "y":4}, - {"label":"K4E (B4,D4)", "x":15, "y":4}, - - {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5}, - {"label":"K51 (B5,B7)", "x":1.5, "y":5}, - {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5}, - {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7}, - {"label":"K5B (B5,D1)", "x":11, "y":5, "w":1.5}, - {"label":"K5C (B5,D2)", "x":13, "y":5}, - {"label":"K5D (B5,D3)", "x":14, "y":5}, - {"label":"K5E (B5,D4)", "x":15, "y":5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.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.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5}, + + {"matrix": [5, 12], "x": 13, "y": 5}, + {"matrix": [5, 13], "x": 14, "y": 5}, + {"matrix": [5, 14], "x": 15, "y": 5} ] } } diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 712b3096f4..81893874e0 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -27,7 +27,100 @@ }, "layouts": { "LAYOUT_split_bs": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"1,10", "x":10, "y":1}, {"label":"1,11", "x":11, "y":1}, {"label":"1,12", "x":12, "y":1}, {"label":"1,13", "x":13, "y":1}, {"label":"1,14", "x":14, "y":1}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.5}, {"label":"2,1", "x":1.5, "y":2}, {"label":"2,2", "x":2.5, "y":2}, {"label":"2,3", "x":3.5, "y":2}, {"label":"2,4", "x":4.5, "y":2}, {"label":"2,5", "x":5.5, "y":2}, {"label":"2,6", "x":6.5, "y":2}, {"label":"2,7", "x":7.5, "y":2}, {"label":"2,8", "x":8.5, "y":2}, {"label":"2,9", "x":9.5, "y":2}, {"label":"2,10", "x":10.5, "y":2}, {"label":"2,11", "x":11.5, "y":2}, {"label":"2,12", "x":12.5, "y":2}, {"label":"2,14", "x":13.5, "y":2, "w":1.5}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.75}, {"label":"3,1", "x":1.75, "y":3}, {"label":"3,2", "x":2.75, "y":3}, {"label":"3,3", "x":3.75, "y":3}, {"label":"3,4", "x":4.75, "y":3}, {"label":"3,5", "x":5.75, "y":3}, {"label":"3,6", "x":6.75, "y":3}, {"label":"3,7", "x":7.75, "y":3}, {"label":"3,8", "x":8.75, "y":3}, {"label":"3,9", "x":9.75, "y":3}, {"label":"3,10", "x":10.75, "y":3}, {"label":"3,11", "x":11.75, "y":3}, {"label":"3,12", "x":12.75, "y":3}, {"label":"3,13", "x":13.75, "y":3, "w":1.25}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4}, {"label":"4,2", "x":2.25, "y":4}, {"label":"4,3", "x":3.25, "y":4}, {"label":"4,4", "x":4.25, "y":4}, {"label":"4,5", "x":5.25, "y":4}, {"label":"4,6", "x":6.25, "y":4}, {"label":"4,7", "x":7.25, "y":4}, {"label":"4,8", "x":8.25, "y":4}, {"label":"4,9", "x":9.25, "y":4}, {"label":"4,10", "x":10.25, "y":4}, {"label":"4,11", "x":11.25, "y":4}, {"label":"4,12", "x":12.25, "y":4, "w":1.75}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":4}, {"label":"5,0", "x":0, "y":5, "w":1.25}, {"label":"5,1", "x":1.25, "y":5, "w":1.25}, {"label":"5,2", "x":2.5, "y":5, "w":1.25}, {"label":"5,6", "x":3.75, "y":5, "w":6.25}, {"label":"5,10", "x":10, "y":5}, {"label":"5,11", "x":11, "y":5}, {"label":"5,12", "x":12, "y":5}, {"label":"5,13", "x":13, "y":5}, {"label":"5,14", "x":14, "y":5}, {"label":"5,15", "x":15, "y":5}] + "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": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 12], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25}, + {"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}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] } } } diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c index 9f70c76638..41f9dbb438 100644 --- a/keyboards/mechlovin/olly/octagon/octagon.c +++ b/keyboards/mechlovin/olly/octagon/octagon.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "octagon.h" +#include "quantum.h" const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations diff --git a/keyboards/mechlovin/olly/octagon/octagon.h b/keyboards/mechlovin/olly/octagon/octagon.h deleted file mode 100644 index d63b345720..0000000000 --- a/keyboards/mechlovin/olly/octagon/octagon.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2022 Team Mechlovin - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_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, K1E, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F \ -) { \ - { 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, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E, K4F }, \ - { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }, \ -} -- cgit v1.2.3