From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/avalanche/v1/info.json | 129 +++++++++++++++++++------------------ keyboards/avalanche/v1/v1.h | 29 --------- keyboards/avalanche/v2/info.json | 133 ++++++++++++++++++++------------------- keyboards/avalanche/v2/v2.h | 29 --------- keyboards/avalanche/v3/info.json | 133 ++++++++++++++++++++------------------- keyboards/avalanche/v3/v3.h | 29 --------- keyboards/avalanche/v4/info.json | 133 ++++++++++++++++++++------------------- keyboards/avalanche/v4/v4.c | 2 +- keyboards/avalanche/v4/v4.h | 29 --------- 9 files changed, 275 insertions(+), 371 deletions(-) delete mode 100644 keyboards/avalanche/v1/v1.h delete mode 100644 keyboards/avalanche/v2/v2.h delete mode 100644 keyboards/avalanche/v3/v3.h delete mode 100644 keyboards/avalanche/v4/v4.h (limited to 'keyboards/avalanche') diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json index e8ce03904f..7787ae2a95 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/info.json @@ -21,72 +21,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L01", "x":1, "y":0.75}, - {"label":"L02", "x":2, "y":0.75}, - {"label":"L03", "x":3, "y":0.25}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0.25}, - {"label":"L06", "x":6, "y":0.35}, - {"label":"R06", "x":10, "y":0.35}, - {"label":"R05", "x":11, "y":0.25}, - {"label":"R04", "x":12, "y":0}, - {"label":"R03", "x":13, "y":0.25}, - {"label":"R02", "x":14, "y":0.75}, - {"label":"R01", "x":15, "y":0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.75}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.35}, - {"label":"L11", "x":1, "y":1.75}, - {"label":"L12", "x":2, "y":1.75}, - {"label":"L13", "x":3, "y":1.25}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1.25}, - {"label":"L16", "x":6, "y":1.35}, - {"label":"R16", "x":10, "y":1.35}, - {"label":"R15", "x":11, "y":1.25}, - {"label":"R14", "x":12, "y":1}, - {"label":"R13", "x":13, "y":1.25}, - {"label":"R12", "x":14, "y":1.75}, - {"label":"R11", "x":15, "y":1.75}, + {"matrix": [5, 6], "x": 10, "y": 0.35}, + {"matrix": [5, 5], "x": 11, "y": 0.25}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0.25}, + {"matrix": [5, 2], "x": 14, "y": 0.75}, + {"matrix": [5, 1], "x": 15, "y": 0.75}, - {"label":"L20", "x":0, "y":2.85}, - {"label":"L21", "x":1, "y":2.75}, - {"label":"L22", "x":2, "y":2.75}, - {"label":"L23", "x":3, "y":2.25}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2.25}, - {"label":"L26", "x":6, "y":2.35}, - {"label":"L27", "x":7, "y":2.6}, - {"label":"R27", "x":9, "y":2.6}, - {"label":"R26", "x":10, "y":2.35}, - {"label":"R25", "x":11, "y":2.25}, - {"label":"R24", "x":12, "y":2}, - {"label":"R23", "x":13, "y":2.25}, - {"label":"R22", "x":14, "y":2.75}, - {"label":"R21", "x":15, "y":2.75}, - {"label":"R20", "x":16, "y":2.85}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.75}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.35}, - {"label":"L31", "x":1, "y":3.75}, - {"label":"L32", "x":2, "y":3.75}, - {"label":"L33", "x":3, "y":3.25}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3.25}, - {"label":"L36", "x":6, "y":3.35}, - {"label":"L37", "x":7, "y":3.7}, - {"label":"R37", "x":9, "y":3.7}, - {"label":"R36", "x":10, "y":3.35}, - {"label":"R35", "x":11, "y":3.25}, - {"label":"R34", "x":12, "y":3}, - {"label":"R33", "x":13, "y":3.25}, - {"label":"R32", "x":14, "y":3.75}, - {"label":"R31", "x":15, "y":3.75}, + {"matrix": [6, 6], "x": 10, "y": 1.35}, + {"matrix": [6, 5], "x": 11, "y": 1.25}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1.25}, + {"matrix": [6, 2], "x": 14, "y": 1.75}, + {"matrix": [6, 1], "x": 15, "y": 1.75}, - {"label":"L44", "x":3.5, "y":4.45, "w":1.25}, - {"label":"L45", "x":4.75, "y":4.4, "w":1.25}, - {"label":"L46", "x":6, "y":4.45}, - {"label":"L47", "x":7, "y":4.8}, - {"label":"R47", "x":9, "y":4.8}, - {"label":"R46", "x":10, "y":4.45}, - {"label":"R45", "x":11, "y":4.4, "w":1.25}, - {"label":"R44", "x":12.25, "y":4.45, "w":1.25} + {"matrix": [2, 0], "x": 0, "y": 2.85}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.75}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.35}, + {"matrix": [2, 7], "x": 7, "y": 2.6}, + + {"matrix": [7, 7], "x": 9, "y": 2.6}, + {"matrix": [7, 6], "x": 10, "y": 2.35}, + {"matrix": [7, 5], "x": 11, "y": 2.25}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2.25}, + {"matrix": [7, 2], "x": 14, "y": 2.75}, + {"matrix": [7, 1], "x": 15, "y": 2.75}, + {"matrix": [7, 0], "x": 16, "y": 2.85}, + + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.75}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.35}, + {"matrix": [3, 7], "x": 7, "y": 3.7}, + + {"matrix": [8, 7], "x": 9, "y": 3.7}, + {"matrix": [8, 6], "x": 10, "y": 3.35}, + {"matrix": [8, 5], "x": 11, "y": 3.25}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3.25}, + {"matrix": [8, 2], "x": 14, "y": 3.75}, + {"matrix": [8, 1], "x": 15, "y": 3.75}, + + {"matrix": [4, 4], "x": 3.5, "y": 4.45, "w": 1.25}, + {"matrix": [4, 5], "x": 4.75, "y": 4.4, "w": 1.25}, + {"matrix": [4, 6], "x": 6, "y": 4.45}, + {"matrix": [4, 7], "x": 7, "y": 4.8}, + + {"matrix": [9, 7], "x": 9, "y": 4.8}, + {"matrix": [9, 6], "x": 10, "y": 4.45}, + {"matrix": [9, 5], "x": 11, "y": 4.4, "w": 1.25}, + {"matrix": [9, 4], "x": 12.25, "y": 4.45, "w": 1.25} ] } } diff --git a/keyboards/avalanche/v1/v1.h b/keyboards/avalanche/v1/v1.h deleted file mode 100644 index dd6c921e69..0000000000 --- a/keyboards/avalanche/v1/v1.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define L__ KC_NO -#define R__ KC_NO - -#define LAYOUT( \ - L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, \ - L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, \ - L20, L21, L22, L23, L24, L25, L26, L27, R27, R26, R25, R24, R23, R22, R21, R20, \ - L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, \ - L44, L45, L46, L47, R47, R46, R45, R44 \ -) \ -{ \ - { L__, L01, L02, L03, L04, L05, L06, L__}, \ - { L__, L11, L12, L13, L14, L15, L16, L__}, \ - { L20, L21, L22, L23, L24, L25, L26, L27}, \ - { L__, L31, L32, L33, L34, L35, L36, L37}, \ - { L__, L__, L__, L__, L44, L45, L46, L47}, \ - { R__, R01, R02, R03, R04, R05, R06, R__}, \ - { R__, R11, R12, R13, R14, R15, R16, R__}, \ - { R20, R21, R22, R23, R24, R25, R26, R27}, \ - { R__, R31, R32, R33, R34, R35, R36, R37}, \ - { R__, R__, R__, R__, R44, R45, R46, R47} \ -} diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index b7b7df5dff..92f02721de 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -29,74 +29,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":1, "y":0.75}, - {"label":"L01", "x":2, "y":0.75}, - {"label":"L02", "x":3, "y":0.25}, - {"label":"L03", "x":4, "y":0}, - {"label":"L04", "x":5, "y":0.25}, - {"label":"L05", "x":6, "y":0.35}, - {"label":"R05", "x":10, "y":0.35}, - {"label":"R04", "x":11, "y":0.25}, - {"label":"R03", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0.25}, - {"label":"R01", "x":14, "y":0.75}, - {"label":"R00", "x":15, "y":0.75}, + {"label": "L00", "matrix": [0, 0], "x": 1, "y": 0.75}, + {"label": "L01", "matrix": [0, 1], "x": 2, "y": 0.75}, + {"label": "L02", "matrix": [0, 2], "x": 3, "y": 0.25}, + {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "L04", "matrix": [0, 4], "x": 5, "y": 0.25}, + {"label": "L05", "matrix": [0, 5], "x": 6, "y": 0.35}, - {"label":"L10", "x":1, "y":1.75}, - {"label":"L11", "x":2, "y":1.75}, - {"label":"L12", "x":3, "y":1.25}, - {"label":"L13", "x":4, "y":1}, - {"label":"L14", "x":5, "y":1.25}, - {"label":"L15", "x":6, "y":1.35}, - {"label":"R15", "x":10, "y":1.35}, - {"label":"R14", "x":11, "y":1.25}, - {"label":"R13", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1.25}, - {"label":"R11", "x":14, "y":1.75}, - {"label":"R10", "x":15, "y":1.75}, + {"label": "R05", "matrix": [5, 5], "x": 10, "y": 0.35}, + {"label": "R04", "matrix": [5, 4], "x": 11, "y": 0.25}, + {"label": "R03", "matrix": [5, 3], "x": 12, "y": 0}, + {"label": "R02", "matrix": [5, 2], "x": 13, "y": 0.25}, + {"label": "R01", "matrix": [5, 1], "x": 14, "y": 0.75}, + {"label": "R00", "matrix": [5, 0], "x": 15, "y": 0.75}, - {"label":"L40", "x":0, "y":2.85}, - {"label":"L20", "x":1, "y":2.75}, - {"label":"L21", "x":2, "y":2.75}, - {"label":"L22", "x":3, "y":2.25}, - {"label":"L23", "x":4, "y":2}, - {"label":"L24", "x":5, "y":2.25}, - {"label":"L25", "x":6, "y":2.35}, - {"label":"L26", "x":7, "y":2.6}, - {"label":"R26", "x":9, "y":2.6}, - {"label":"R25", "x":10, "y":2.35}, - {"label":"R24", "x":11, "y":2.25}, - {"label":"R23", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2.25}, - {"label":"R21", "x":14, "y":2.75}, - {"label":"R20", "x":15, "y":2.75}, - {"label":"R40", "x":16, "y":2.85}, + {"label": "L10", "matrix": [1, 0], "x": 1, "y": 1.75}, + {"label": "L11", "matrix": [1, 1], "x": 2, "y": 1.75}, + {"label": "L12", "matrix": [1, 2], "x": 3, "y": 1.25}, + {"label": "L13", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "L14", "matrix": [1, 4], "x": 5, "y": 1.25}, + {"label": "L15", "matrix": [1, 5], "x": 6, "y": 1.35}, - {"label":"L30", "x":1, "y":3.75}, - {"label":"L31", "x":2, "y":3.75}, - {"label":"L32", "x":3, "y":3.25}, - {"label":"L33", "x":4, "y":3}, - {"label":"L34", "x":5, "y":3.25}, - {"label":"L35", "x":6, "y":3.35}, - {"label":"L36", "x":7, "y":3.7}, - {"label":"R36", "x":9, "y":3.7}, - {"label":"R35", "x":10, "y":3.35}, - {"label":"R34", "x":11, "y":3.25}, - {"label":"R33", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3.25}, - {"label":"R31", "x":14, "y":3.75}, - {"label":"R30", "x":15, "y":3.75}, + {"label": "R15", "matrix": [6, 5], "x": 10, "y": 1.35}, + {"label": "R14", "matrix": [6, 4], "x": 11, "y": 1.25}, + {"label": "R13", "matrix": [6, 3], "x": 12, "y": 1}, + {"label": "R12", "matrix": [6, 2], "x": 13, "y": 1.25}, + {"label": "R11", "matrix": [6, 1], "x": 14, "y": 1.75}, + {"label": "R10", "matrix": [6, 0], "x": 15, "y": 1.75}, - {"label":"L42", "x":3, "y":4.55}, - {"label":"L43", "x":4, "y":4.45}, - {"label":"L44", "x":5, "y":4.4}, - {"label":"L45", "x":6, "y":4.45}, - {"label":"L46", "x":7, "y":4.8}, - {"label":"R46", "x":9, "y":4.8}, - {"label":"R45", "x":10, "y":4.45}, - {"label":"R44", "x":11, "y":4.4}, - {"label":"R43", "x":12, "y":4.45}, - {"label":"R42", "x":13, "y":4.55} + {"label": "L40", "matrix": [4, 0], "x": 0, "y": 2.85}, + {"label": "L20", "matrix": [2, 0], "x": 1, "y": 2.75}, + {"label": "L21", "matrix": [2, 1], "x": 2, "y": 2.75}, + {"label": "L22", "matrix": [2, 2], "x": 3, "y": 2.25}, + {"label": "L23", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "L24", "matrix": [2, 4], "x": 5, "y": 2.25}, + {"label": "L25", "matrix": [2, 5], "x": 6, "y": 2.35}, + {"label": "L26", "matrix": [2, 6], "x": 7, "y": 2.6}, + + {"label": "R26", "matrix": [7, 6], "x": 9, "y": 2.6}, + {"label": "R25", "matrix": [7, 5], "x": 10, "y": 2.35}, + {"label": "R24", "matrix": [7, 4], "x": 11, "y": 2.25}, + {"label": "R23", "matrix": [7, 3], "x": 12, "y": 2}, + {"label": "R22", "matrix": [7, 2], "x": 13, "y": 2.25}, + {"label": "R21", "matrix": [7, 1], "x": 14, "y": 2.75}, + {"label": "R20", "matrix": [7, 0], "x": 15, "y": 2.75}, + {"label": "R40", "matrix": [9, 0], "x": 16, "y": 2.85}, + + {"label": "L30", "matrix": [3, 0], "x": 1, "y": 3.75}, + {"label": "L31", "matrix": [3, 1], "x": 2, "y": 3.75}, + {"label": "L32", "matrix": [3, 2], "x": 3, "y": 3.25}, + {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3}, + {"label": "L34", "matrix": [3, 4], "x": 5, "y": 3.25}, + {"label": "L35", "matrix": [3, 5], "x": 6, "y": 3.35}, + {"label": "L36", "matrix": [3, 6], "x": 7, "y": 3.7}, + + {"label": "R36", "matrix": [8, 6], "x": 9, "y": 3.7}, + {"label": "R35", "matrix": [8, 5], "x": 10, "y": 3.35}, + {"label": "R34", "matrix": [8, 4], "x": 11, "y": 3.25}, + {"label": "R33", "matrix": [8, 3], "x": 12, "y": 3}, + {"label": "R32", "matrix": [8, 2], "x": 13, "y": 3.25}, + {"label": "R31", "matrix": [8, 1], "x": 14, "y": 3.75}, + {"label": "R30", "matrix": [8, 0], "x": 15, "y": 3.75}, + + {"label": "L42", "matrix": [4, 2], "x": 3, "y": 4.55}, + {"label": "L43", "matrix": [4, 3], "x": 4, "y": 4.45}, + {"label": "L44", "matrix": [4, 4], "x": 5, "y": 4.4}, + {"label": "L45", "matrix": [4, 5], "x": 6, "y": 4.45}, + {"label": "L46", "matrix": [4, 6], "x": 7, "y": 4.8}, + + {"label": "R46", "matrix": [9, 6], "x": 9, "y": 4.8}, + {"label": "R45", "matrix": [9, 5], "x": 10, "y": 4.45}, + {"label": "R44", "matrix": [9, 4], "x": 11, "y": 4.4}, + {"label": "R43", "matrix": [9, 3], "x": 12, "y": 4.45}, + {"label": "R42", "matrix": [9, 2], "x": 13, "y": 4.55} ] } } diff --git a/keyboards/avalanche/v2/v2.h b/keyboards/avalanche/v2/v2.h deleted file mode 100644 index f8319c3ef4..0000000000 --- a/keyboards/avalanche/v2/v2.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define L__ KC_NO -#define R__ KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L40, L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, R40, \ - L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30, \ - L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L__}, \ - { L10, L11, L12, L13, L14, L15, L__}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L__, L42, L43, L44, L45, L46}, \ - { R00, R01, R02, R03, R04, R05, R__}, \ - { R10, R11, R12, R13, R14, R15, R__}, \ - { R20, R21, R22, R23, R24, R25, R26}, \ - { R30, R31, R32, R33, R34, R35, R36}, \ - { R40, R__, R42, R43, R44, R45, R46} \ -} diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 20337f25c1..ed507485f5 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -29,74 +29,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":1, "y":0.75}, - {"label":"L01", "x":2, "y":0.75}, - {"label":"L02", "x":3, "y":0.25}, - {"label":"L03", "x":4, "y":0}, - {"label":"L04", "x":5, "y":0.25}, - {"label":"L05", "x":6, "y":0.35}, - {"label":"R05", "x":12, "y":0.35}, - {"label":"R04", "x":13, "y":0.25}, - {"label":"R03", "x":14, "y":0}, - {"label":"R02", "x":15, "y":0.25}, - {"label":"R01", "x":16, "y":0.75}, - {"label":"R00", "x":17, "y":0.75}, + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.75}, + {"matrix": [0, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.35}, - {"label":"L10", "x":1, "y":1.75}, - {"label":"L11", "x":2, "y":1.75}, - {"label":"L12", "x":3, "y":1.25}, - {"label":"L13", "x":4, "y":1}, - {"label":"L14", "x":5, "y":1.25}, - {"label":"L15", "x":6, "y":1.35}, - {"label":"R15", "x":12, "y":1.35}, - {"label":"R14", "x":13, "y":1.25}, - {"label":"R13", "x":14, "y":1}, - {"label":"R12", "x":15, "y":1.25}, - {"label":"R11", "x":16, "y":1.75}, - {"label":"R10", "x":17, "y":1.75}, + {"matrix": [5, 5], "x": 12, "y": 0.35}, + {"matrix": [5, 4], "x": 13, "y": 0.25}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 2], "x": 15, "y": 0.25}, + {"matrix": [5, 1], "x": 16, "y": 0.75}, + {"matrix": [5, 0], "x": 17, "y": 0.75}, - {"label":"L40", "x":0, "y":2.85}, - {"label":"L20", "x":1, "y":2.75}, - {"label":"L21", "x":2, "y":2.75}, - {"label":"L22", "x":3, "y":2.25}, - {"label":"L23", "x":4, "y":2}, - {"label":"L24", "x":5, "y":2.25}, - {"label":"L25", "x":6, "y":2.35}, - {"label":"R25", "x":12, "y":2.35}, - {"label":"R24", "x":13, "y":2.25}, - {"label":"R23", "x":14, "y":2}, - {"label":"R22", "x":15, "y":2.25}, - {"label":"R21", "x":16, "y":2.75}, - {"label":"R20", "x":17, "y":2.75}, - {"label":"R40", "x":18, "y":2.85}, + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.75}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.35}, - {"label":"L30", "x":1, "y":3.75}, - {"label":"L31", "x":2, "y":3.75}, - {"label":"L32", "x":3, "y":3.25}, - {"label":"L33", "x":4, "y":3}, - {"label":"L34", "x":5, "y":3.25}, - {"label":"L35", "x":6, "y":3.35}, - {"label":"L36", "x":7, "y":3.7}, - {"label":"L26", "x":8, "y":4.05}, - {"label":"R26", "x":10, "y":4.05}, - {"label":"R36", "x":11, "y":3.7}, - {"label":"R35", "x":12, "y":3.35}, - {"label":"R34", "x":13, "y":3.25}, - {"label":"R33", "x":14, "y":3}, - {"label":"R32", "x":15, "y":3.25}, - {"label":"R31", "x":16, "y":3.75}, - {"label":"R30", "x":17, "y":3.75}, + {"matrix": [6, 5], "x": 12, "y": 1.35}, + {"matrix": [6, 4], "x": 13, "y": 1.25}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 2], "x": 15, "y": 1.25}, + {"matrix": [6, 1], "x": 16, "y": 1.75}, + {"matrix": [6, 0], "x": 17, "y": 1.75}, - {"label":"L42", "x":3.4, "y":4.55}, - {"label":"L43", "x":4.6, "y":4.45}, - {"label":"L44", "x":5.8, "y":4.4}, - {"label":"L45", "x":7, "y":4.7}, - {"label":"L46", "x":8, "y":5.05}, - {"label":"R46", "x":10, "y":5.05}, - {"label":"R45", "x":11, "y":4.7}, - {"label":"R44", "x":12.2, "y":4.4}, - {"label":"R43", "x":13.4, "y":4.45}, - {"label":"R42", "x":14.6, "y":4.55} + {"matrix": [4, 0], "x": 0, "y": 2.85}, + {"matrix": [2, 0], "x": 1, "y": 2.75}, + {"matrix": [2, 1], "x": 2, "y": 2.75}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.35}, + + {"matrix": [7, 5], "x": 12, "y": 2.35}, + {"matrix": [7, 4], "x": 13, "y": 2.25}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 2], "x": 15, "y": 2.25}, + {"matrix": [7, 1], "x": 16, "y": 2.75}, + {"matrix": [7, 0], "x": 17, "y": 2.75}, + {"matrix": [9, 0], "x": 18, "y": 2.85}, + + {"matrix": [3, 0], "x": 1, "y": 3.75}, + {"matrix": [3, 1], "x": 2, "y": 3.75}, + {"matrix": [3, 2], "x": 3, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.35}, + {"matrix": [3, 6], "x": 7, "y": 3.7}, + {"matrix": [2, 6], "x": 8, "y": 4.05}, + + {"matrix": [7, 6], "x": 10, "y": 4.05}, + {"matrix": [8, 6], "x": 11, "y": 3.7}, + {"matrix": [8, 5], "x": 12, "y": 3.35}, + {"matrix": [8, 4], "x": 13, "y": 3.25}, + {"matrix": [8, 3], "x": 14, "y": 3}, + {"matrix": [8, 2], "x": 15, "y": 3.25}, + {"matrix": [8, 1], "x": 16, "y": 3.75}, + {"matrix": [8, 0], "x": 17, "y": 3.75}, + + {"matrix": [4, 2], "x": 3.4, "y": 4.55}, + {"matrix": [4, 3], "x": 4.6, "y": 4.45}, + {"matrix": [4, 4], "x": 5.8, "y": 4.4}, + {"matrix": [4, 5], "x": 7, "y": 4.7}, + {"matrix": [4, 6], "x": 8, "y": 5.05}, + + {"matrix": [9, 6], "x": 10, "y": 5.05}, + {"matrix": [9, 5], "x": 11, "y": 4.7}, + {"matrix": [9, 4], "x": 12.2, "y": 4.4}, + {"matrix": [9, 3], "x": 13.4, "y": 4.45}, + {"matrix": [9, 2], "x": 14.6, "y": 4.55} ] } } diff --git a/keyboards/avalanche/v3/v3.h b/keyboards/avalanche/v3/v3.h deleted file mode 100644 index 426f979e9b..0000000000 --- a/keyboards/avalanche/v3/v3.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define L__ KC_NO -#define R__ KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L40, L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, R40, \ - L30, L31, L32, L33, L34, L35, L36, L26, R26, R36, R35, R34, R33, R32, R31, R30, \ - L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L__}, \ - { L10, L11, L12, L13, L14, L15, L__}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L__, L42, L43, L44, L45, L46}, \ - { R00, R01, R02, R03, R04, R05, R__}, \ - { R10, R11, R12, R13, R14, R15, R__}, \ - { R20, R21, R22, R23, R24, R25, R26}, \ - { R30, R31, R32, R33, R34, R35, R36}, \ - { R40, R__, R42, R43, R44, R45, R46} \ -} diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index 786d11588a..85ff0c16fe 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -29,74 +29,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":1, "y":0.75}, - {"label":"L01", "x":2, "y":0.75}, - {"label":"L02", "x":3, "y":0.25}, - {"label":"L03", "x":4, "y":0}, - {"label":"L04", "x":5, "y":0.25}, - {"label":"L05", "x":6, "y":0.35}, - {"label":"R05", "x":12, "y":0.35}, - {"label":"R04", "x":13, "y":0.25}, - {"label":"R03", "x":14, "y":0}, - {"label":"R02", "x":15, "y":0.25}, - {"label":"R01", "x":16, "y":0.75}, - {"label":"R00", "x":17, "y":0.75}, + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.75}, + {"matrix": [0, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.35}, - {"label":"L10", "x":1, "y":1.75}, - {"label":"L11", "x":2, "y":1.75}, - {"label":"L12", "x":3, "y":1.25}, - {"label":"L13", "x":4, "y":1}, - {"label":"L14", "x":5, "y":1.25}, - {"label":"L15", "x":6, "y":1.35}, - {"label":"R15", "x":12, "y":1.35}, - {"label":"R14", "x":13, "y":1.25}, - {"label":"R13", "x":14, "y":1}, - {"label":"R12", "x":15, "y":1.25}, - {"label":"R11", "x":16, "y":1.75}, - {"label":"R10", "x":17, "y":1.75}, + {"matrix": [5, 5], "x": 12, "y": 0.35}, + {"matrix": [5, 4], "x": 13, "y": 0.25}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 2], "x": 15, "y": 0.25}, + {"matrix": [5, 1], "x": 16, "y": 0.75}, + {"matrix": [5, 0], "x": 17, "y": 0.75}, - {"label":"L40", "x":0, "y":2.85}, - {"label":"L20", "x":1, "y":2.75}, - {"label":"L21", "x":2, "y":2.75}, - {"label":"L22", "x":3, "y":2.25}, - {"label":"L23", "x":4, "y":2}, - {"label":"L24", "x":5, "y":2.25}, - {"label":"L25", "x":6, "y":2.35}, - {"label":"R25", "x":12, "y":2.35}, - {"label":"R24", "x":13, "y":2.25}, - {"label":"R23", "x":14, "y":2}, - {"label":"R22", "x":15, "y":2.25}, - {"label":"R21", "x":16, "y":2.75}, - {"label":"R20", "x":17, "y":2.75}, - {"label":"R40", "x":18, "y":2.85}, + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.75}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.35}, - {"label":"L30", "x":1, "y":3.75}, - {"label":"L31", "x":2, "y":3.75}, - {"label":"L32", "x":3, "y":3.25}, - {"label":"L33", "x":4, "y":3}, - {"label":"L34", "x":5, "y":3.25}, - {"label":"L35", "x":6, "y":3.35}, - {"label":"L36", "x":7, "y":3.7}, - {"label":"L26", "x":8, "y":4.05}, - {"label":"R26", "x":10, "y":4.05}, - {"label":"R36", "x":11, "y":3.7}, - {"label":"R35", "x":12, "y":3.35}, - {"label":"R34", "x":13, "y":3.25}, - {"label":"R33", "x":14, "y":3}, - {"label":"R32", "x":15, "y":3.25}, - {"label":"R31", "x":16, "y":3.75}, - {"label":"R30", "x":17, "y":3.75}, + {"matrix": [6, 5], "x": 12, "y": 1.35}, + {"matrix": [6, 4], "x": 13, "y": 1.25}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 2], "x": 15, "y": 1.25}, + {"matrix": [6, 1], "x": 16, "y": 1.75}, + {"matrix": [6, 0], "x": 17, "y": 1.75}, - {"label":"L42", "x":3.4, "y":4.55}, - {"label":"L43", "x":4.6, "y":4.45}, - {"label":"L44", "x":5.8, "y":4.4}, - {"label":"L45", "x":7, "y":4.7}, - {"label":"L46", "x":8, "y":5.05}, - {"label":"R46", "x":10, "y":5.05}, - {"label":"R45", "x":11, "y":4.7}, - {"label":"R44", "x":12.2, "y":4.4}, - {"label":"R43", "x":13.4, "y":4.45}, - {"label":"R42", "x":14.6, "y":4.55} + {"matrix": [4, 0], "x": 0, "y": 2.85}, + {"matrix": [2, 0], "x": 1, "y": 2.75}, + {"matrix": [2, 1], "x": 2, "y": 2.75}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.35}, + + {"matrix": [7, 5], "x": 12, "y": 2.35}, + {"matrix": [7, 4], "x": 13, "y": 2.25}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 2], "x": 15, "y": 2.25}, + {"matrix": [7, 1], "x": 16, "y": 2.75}, + {"matrix": [7, 0], "x": 17, "y": 2.75}, + {"matrix": [9, 0], "x": 18, "y": 2.85}, + + {"matrix": [3, 0], "x": 1, "y": 3.75}, + {"matrix": [3, 1], "x": 2, "y": 3.75}, + {"matrix": [3, 2], "x": 3, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.35}, + {"matrix": [3, 6], "x": 7, "y": 3.7}, + {"matrix": [2, 6], "x": 8, "y": 4.05}, + + {"matrix": [7, 6], "x": 10, "y": 4.05}, + {"matrix": [8, 6], "x": 11, "y": 3.7}, + {"matrix": [8, 5], "x": 12, "y": 3.35}, + {"matrix": [8, 4], "x": 13, "y": 3.25}, + {"matrix": [8, 3], "x": 14, "y": 3}, + {"matrix": [8, 2], "x": 15, "y": 3.25}, + {"matrix": [8, 1], "x": 16, "y": 3.75}, + {"matrix": [8, 0], "x": 17, "y": 3.75}, + + {"matrix": [4, 2], "x": 3.4, "y": 4.55}, + {"matrix": [4, 3], "x": 4.6, "y": 4.45}, + {"matrix": [4, 4], "x": 5.8, "y": 4.4}, + {"matrix": [4, 5], "x": 7, "y": 4.7}, + {"matrix": [4, 6], "x": 8, "y": 5.05}, + + {"matrix": [9, 6], "x": 10, "y": 5.05}, + {"matrix": [9, 5], "x": 11, "y": 4.7}, + {"matrix": [9, 4], "x": 12.2, "y": 4.4}, + {"matrix": [9, 3], "x": 13.4, "y": 4.45}, + {"matrix": [9, 2], "x": 14.6, "y": 4.55} ] } } diff --git a/keyboards/avalanche/v4/v4.c b/keyboards/avalanche/v4/v4.c index e5a651ce4a..5b27385729 100644 --- a/keyboards/avalanche/v4/v4.c +++ b/keyboards/avalanche/v4/v4.c @@ -1,7 +1,7 @@ // Copyright 2022 Vitaly Volkov (@vlkv) // SPDX-License-Identifier: GPL-2.0-or-later -#include "v4.h" +#include "quantum.h" #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { diff --git a/keyboards/avalanche/v4/v4.h b/keyboards/avalanche/v4/v4.h deleted file mode 100644 index 426f979e9b..0000000000 --- a/keyboards/avalanche/v4/v4.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define L__ KC_NO -#define R__ KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L40, L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, R40, \ - L30, L31, L32, L33, L34, L35, L36, L26, R26, R36, R35, R34, R33, R32, R31, R30, \ - L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L__}, \ - { L10, L11, L12, L13, L14, L15, L__}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L__, L42, L43, L44, L45, L46}, \ - { R00, R01, R02, R03, R04, R05, R__}, \ - { R10, R11, R12, R13, R14, R15, R__}, \ - { R20, R21, R22, R23, R24, R25, R26}, \ - { R30, R31, R32, R33, R34, R35, R36}, \ - { R40, R__, R42, R43, R44, R45, R46} \ -} -- cgit v1.2.3