From 4871f651c5328cc8c16d1ec991f3e865094b24c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 Apr 2023 07:45:43 +1000 Subject: Move remaining `LAYOUT_all`s to data driven (#20463) --- keyboards/0xcb/static/info.json | 178 +++++++++++++++++++++------------------- keyboards/0xcb/static/static.h | 66 --------------- 2 files changed, 93 insertions(+), 151 deletions(-) delete mode 100644 keyboards/0xcb/static/static.h (limited to 'keyboards/0xcb/static') diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json index 6f3b2d06f0..7a678a0194 100644 --- a/keyboards/0xcb/static/info.json +++ b/keyboards/0xcb/static/info.json @@ -26,95 +26,103 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x":11, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":0, "y":2, "w":1.25}, - {"x":1.25, "y":2}, - {"x":2.25, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "y":2}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2}, - {"x":8.25, "y":2}, - {"x":9.25, "y":2}, - {"x":10.25, "y":2, "w":1.75}, - {"x":0, "y":3, "w":1.75}, - {"x":1.75, "y":3}, - {"x":2.75, "y":3}, - {"x":3.75, "y":3}, - {"x":4.75, "y":3}, - {"x":5.75, "y":3}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3}, - {"x":8.75, "y":3}, - {"x":9.75, "y":3}, - {"x":10.75, "y":3, "w":1.25}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4, "w":2.75}, - {"x":5.75, "y":4}, - {"x":6.75, "y":4, "w":2.25}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4} + {"matrix": [1, 5], "x": 11, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [0, 1], "x": 2, "y": 1}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 1}, + {"matrix": [1, 2], "x": 5, "y": 1}, + {"matrix": [0, 3], "x": 6, "y": 1}, + {"matrix": [1, 3], "x": 7, "y": 1}, + {"matrix": [0, 4], "x": 8, "y": 1}, + {"matrix": [1, 4], "x": 9, "y": 1}, + {"matrix": [0, 5], "x": 10, "y": 1}, + {"matrix": [3, 5], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 1.25, "y": 2}, + {"matrix": [2, 1], "x": 2.25, "y": 2}, + {"matrix": [3, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [3, 2], "x": 5.25, "y": 2}, + {"matrix": [2, 3], "x": 6.25, "y": 2}, + {"matrix": [3, 3], "x": 7.25, "y": 2}, + {"matrix": [2, 4], "x": 8.25, "y": 2}, + {"matrix": [3, 4], "x": 9.25, "y": 2}, + {"matrix": [2, 5], "x": 10.25, "y": 2, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 3}, + {"matrix": [5, 1], "x": 2.75, "y": 3}, + {"matrix": [4, 2], "x": 3.75, "y": 3}, + {"matrix": [5, 2], "x": 4.75, "y": 3}, + {"matrix": [4, 3], "x": 5.75, "y": 3}, + {"matrix": [5, 3], "x": 6.75, "y": 3}, + {"matrix": [4, 4], "x": 7.75, "y": 3}, + {"matrix": [5, 4], "x": 8.75, "y": 3}, + {"matrix": [4, 5], "x": 9.75, "y": 3}, + {"matrix": [5, 5], "x": 10.75, "y": 3, "w": 1.25}, + + {"matrix": [6, 0], "x": 0, "y": 4}, + {"matrix": [7, 0], "x": 1, "y": 4}, + {"matrix": [6, 1], "x": 2, "y": 4}, + {"matrix": [7, 1], "x": 3, "y": 4, "w": 2.75}, + {"matrix": [7, 2], "x": 5.75, "y": 4}, + {"matrix": [6, 4], "x": 6.75, "y": 4, "w": 2.25}, + {"matrix": [7, 4], "x": 9, "y": 4}, + {"matrix": [6, 5], "x": 10, "y": 4}, + {"matrix": [7, 5], "x": 11, "y": 4} ] }, "LAYOUT_bigbar": { "layout": [ - {"x":11, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":0, "y":2, "w":1.25}, - {"x":1.25, "y":2}, - {"x":2.25, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "y":2}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2}, - {"x":8.25, "y":2}, - {"x":9.25, "y":2}, - {"x":10.25, "y":2, "w":1.75}, - {"x":0, "y":3, "w":1.75}, - {"x":1.75, "y":3}, - {"x":2.75, "y":3}, - {"x":3.75, "y":3}, - {"x":4.75, "y":3}, - {"x":5.75, "y":3}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3}, - {"x":8.75, "y":3}, - {"x":9.75, "y":3}, - {"x":10.75, "y":3, "w":1.25}, - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4}, - {"x":2.25, "y":4}, - {"x":3.25, "y":4, "w":6.25}, - {"x":9.5, "y":4, "w":1.25}, - {"x":10.75, "y":4, "w":1.25} + {"matrix": [1, 5], "x": 11, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [0, 1], "x": 2, "y": 1}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [0, 2], "x": 4, "y": 1}, + {"matrix": [1, 2], "x": 5, "y": 1}, + {"matrix": [0, 3], "x": 6, "y": 1}, + {"matrix": [1, 3], "x": 7, "y": 1}, + {"matrix": [0, 4], "x": 8, "y": 1}, + {"matrix": [1, 4], "x": 9, "y": 1}, + {"matrix": [0, 5], "x": 10, "y": 1}, + {"matrix": [3, 5], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [3, 0], "x": 1.25, "y": 2}, + {"matrix": [2, 1], "x": 2.25, "y": 2}, + {"matrix": [3, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [3, 2], "x": 5.25, "y": 2}, + {"matrix": [2, 3], "x": 6.25, "y": 2}, + {"matrix": [3, 3], "x": 7.25, "y": 2}, + {"matrix": [2, 4], "x": 8.25, "y": 2}, + {"matrix": [3, 4], "x": 9.25, "y": 2}, + {"matrix": [2, 5], "x": 10.25, "y": 2, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 3}, + {"matrix": [5, 1], "x": 2.75, "y": 3}, + {"matrix": [4, 2], "x": 3.75, "y": 3}, + {"matrix": [5, 2], "x": 4.75, "y": 3}, + {"matrix": [4, 3], "x": 5.75, "y": 3}, + {"matrix": [5, 3], "x": 6.75, "y": 3}, + {"matrix": [4, 4], "x": 7.75, "y": 3}, + {"matrix": [5, 4], "x": 8.75, "y": 3}, + {"matrix": [4, 5], "x": 9.75, "y": 3}, + {"matrix": [5, 5], "x": 10.75, "y": 3, "w": 1.25}, + + {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 4}, + {"matrix": [6, 1], "x": 2.25, "y": 4}, + {"matrix": [7, 2], "x": 3.25, "y": 4, "w": 6.25}, + {"matrix": [6, 5], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [7, 5], "x": 10.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/0xcb/static/static.h b/keyboards/0xcb/static/static.h deleted file mode 100644 index 19b698ef3f..0000000000 --- a/keyboards/0xcb/static/static.h +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2021 0xCB - Conor Burns - -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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -// clang-format off -#define LAYOUT_all( \ - K15, \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K35, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \ - K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \ - K60, K70, K61, K71, K72, K64, K74, K65, K75 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { KC_NO, K51, K52, K53, K54, K55 }, \ - { K60, K61, KC_NO, KC_NO, K64, K65 }, \ - { K70, K71, K72, KC_NO, K74, K75 }, \ -} - -#define LAYOUT_bigbar( \ - K15, \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K35, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \ - K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, \ - K60, K70, K61, K72, K65, K75 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { KC_NO, K51, K52, K53, K54, K55 }, \ - { K60, K61, KC_NO, KC_NO, KC_NO, K65 }, \ - { K70, KC_NO, K72, KC_NO, KC_NO, K75 }, \ -} -// clang-format on -- cgit v1.2.3