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/halfcliff/halfcliff.c | 2 +- keyboards/halfcliff/halfcliff.h | 58 --------------- keyboards/halfcliff/info.json | 161 +++++++++++++++++++++------------------- 3 files changed, 86 insertions(+), 135 deletions(-) delete mode 100644 keyboards/halfcliff/halfcliff.h (limited to 'keyboards/halfcliff') diff --git a/keyboards/halfcliff/halfcliff.c b/keyboards/halfcliff/halfcliff.c index 9e3f64d284..de636f22fe 100644 --- a/keyboards/halfcliff/halfcliff.c +++ b/keyboards/halfcliff/halfcliff.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "halfcliff.h" +#include "quantum.h" #ifdef OLED_ENABLE diff --git a/keyboards/halfcliff/halfcliff.h b/keyboards/halfcliff/halfcliff.h deleted file mode 100644 index 6e4c808641..0000000000 --- a/keyboards/halfcliff/halfcliff.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2021 n2 - * - * 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 is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - l51,l50,l00,l01,l02,l03,l04,r04,r03,r02,r01,r00,r50,r51,r52,\ - l61,l60,l10,l11,l12,l13,l14,r14,r13,r12,r11,r10,r60,r61,r62,\ - l71,l70,l20,l21,l22,l23,l24,r24,r23,r22,r21,r20,r70,r71,r72,\ - l81,l80,l30,l31,l32,l33,l34,r34,r33,r32,r31,r30,r80,r81,r82,\ - l91,l90,l40,l41,l42,l43,l44,r44,r43,r42,r41,r40,r90,r91,r92\ -) \ -{ \ - {l00, l01, l02, l03, l04 }, \ - {l10, l11, l12, l13, l14 }, \ - {l20, l21, l22, l23, l24 }, \ - {l30, l31, l32, l33, l34 }, \ - {l40, l41, l42, l43, l44 }, \ - {l50, l51, KC_NO,KC_NO,KC_NO}, \ - {l60, l61, KC_NO,KC_NO,KC_NO}, \ - {l70, l71, KC_NO,KC_NO,KC_NO}, \ - {l80, l81, KC_NO,KC_NO,KC_NO}, \ - {l90, l91, KC_NO,KC_NO,KC_NO}, \ - {r00, r01, r02, r03, r04 }, \ - {r10, r11, r12, r13, r14 }, \ - {r20, r21, r22, r23, r24 }, \ - {r30, r31, r32, r33, r34 }, \ - {r40, r41, r42, r43, r44 }, \ - {r50, r51, r52, KC_NO,KC_NO}, \ - {r60, r61, r62, KC_NO,KC_NO}, \ - {r70, r71, r72, KC_NO,KC_NO}, \ - {r80, r81, r82, KC_NO,KC_NO}, \ - {r90, r91, r92, KC_NO,KC_NO}, \ -} diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json index 6b86e69a1f..820babd432 100644 --- a/keyboards/halfcliff/info.json +++ b/keyboards/halfcliff/info.json @@ -24,82 +24,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0.75,"y":0}, - {"x":1.75,"y":0}, - {"x":2.75,"y":0}, - {"x":3.75,"y":0}, - {"x":4.75,"y":0}, - {"x":5.75,"y":0}, - {"x":6.75,"y":0}, - {"x":8.25,"y":0}, - {"x":9.25,"y":0}, - {"x":10.25,"y":0}, - {"x":11.25,"y":0}, - {"x":12.25,"y":0}, - {"x":13.25,"y":0}, - {"x":14.25,"y":0}, - {"x":15.25,"y":0}, - {"x":0.25,"y":1,"w":1.5}, - {"x":1.75,"y":1}, - {"x":2.75,"y":1}, - {"x":3.75,"y":1}, - {"x":4.75,"y":1}, - {"x":5.75,"y":1}, - {"x":6.75,"y":1}, - {"x":8.25,"y":1}, - {"x":9.25,"y":1}, - {"x":10.25,"y":1}, - {"x":11.25,"y":1}, - {"x":12.25,"y":1}, - {"x":13.25,"y":1}, - {"x":14.25,"y":1}, - {"x":16.25,"y":0}, - {"x":0,"y":2,"w":1.75}, - {"x":1.75,"y":2}, - {"x":2.75,"y":2}, - {"x":3.75,"y":2}, - {"x":4.75,"y":2}, - {"x":5.75,"y":2}, - {"x":6.75,"y":2}, - {"x":8.25,"y":2}, - {"x":9.25,"y":2}, - {"x":10.25,"y":2}, - {"x":11.25,"y":2}, - {"x":12.25,"y":2}, - {"x":13.25,"y":2}, - {"x":14.25,"y":2}, - {"x":15.5,"y":1,"w":1.25,"h":2}, - {"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":8.25,"y":3}, - {"x":9.25,"y":3}, - {"x":10.25,"y":3}, - {"x":11.25,"y":3}, - {"x":12.25,"y":3}, - {"x":13.25,"y":3}, - {"x":14.25,"y":3}, - {"x":15.25,"y":3,"w":2}, - {"x":0.5,"y":4,"w":1.25}, - {"x":1.75,"y":4}, - {"x":2.75,"y":4}, - {"x":3.75,"y":4}, - {"x":4.75,"y":4}, - {"x":5.75,"y":4}, - {"x":6.75,"y":4}, - {"x":8.25,"y":4}, - {"x":9.25,"y":4}, - {"x":10.25,"y":4}, - {"x":11.25,"y":4}, - {"x":12.25,"y":4}, - {"x":13.25,"y":4}, - {"x":14.25,"y":4}, - {"x":15.25,"y":4} - ] + {"matrix": [5, 1], "x": 0.75, "y": 0}, + {"matrix": [5, 0], "x": 1.75, "y": 0}, + {"matrix": [0, 0], "x": 2.75, "y": 0}, + {"matrix": [0, 1], "x": 3.75, "y": 0}, + {"matrix": [0, 2], "x": 4.75, "y": 0}, + {"matrix": [0, 3], "x": 5.75, "y": 0}, + {"matrix": [0, 4], "x": 6.75, "y": 0}, + + {"matrix": [10, 4], "x": 8.25, "y": 0}, + {"matrix": [10, 3], "x": 9.25, "y": 0}, + {"matrix": [10, 2], "x": 10.25, "y": 0}, + {"matrix": [10, 1], "x": 11.25, "y": 0}, + {"matrix": [10, 0], "x": 12.25, "y": 0}, + {"matrix": [15, 0], "x": 13.25, "y": 0}, + {"matrix": [15, 1], "x": 14.25, "y": 0}, + {"matrix": [15, 2], "x": 15.25, "y": 0}, + + {"matrix": [6, 1], "x": 0.25, "y": 1, "w": 1.5}, + {"matrix": [6, 0], "x": 1.75, "y": 1}, + {"matrix": [1, 0], "x": 2.75, "y": 1}, + {"matrix": [1, 1], "x": 3.75, "y": 1}, + {"matrix": [1, 2], "x": 4.75, "y": 1}, + {"matrix": [1, 3], "x": 5.75, "y": 1}, + {"matrix": [1, 4], "x": 6.75, "y": 1}, + + {"matrix": [11, 4], "x": 8.25, "y": 1}, + {"matrix": [11, 3], "x": 9.25, "y": 1}, + {"matrix": [11, 2], "x": 10.25, "y": 1}, + {"matrix": [11, 1], "x": 11.25, "y": 1}, + {"matrix": [11, 0], "x": 12.25, "y": 1}, + {"matrix": [16, 0], "x": 13.25, "y": 1}, + {"matrix": [16, 1], "x": 14.25, "y": 1}, + {"matrix": [16, 2], "x": 16.25, "y": 0}, + + {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 2}, + {"matrix": [2, 0], "x": 2.75, "y": 2}, + {"matrix": [2, 1], "x": 3.75, "y": 2}, + {"matrix": [2, 2], "x": 4.75, "y": 2}, + {"matrix": [2, 3], "x": 5.75, "y": 2}, + {"matrix": [2, 4], "x": 6.75, "y": 2}, + + {"matrix": [12, 4], "x": 8.25, "y": 2}, + {"matrix": [12, 3], "x": 9.25, "y": 2}, + {"matrix": [12, 2], "x": 10.25, "y": 2}, + {"matrix": [12, 1], "x": 11.25, "y": 2}, + {"matrix": [12, 0], "x": 12.25, "y": 2}, + {"matrix": [17, 0], "x": 13.25, "y": 2}, + {"matrix": [17, 1], "x": 14.25, "y": 2}, + {"matrix": [17, 2], "x": 15.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [8, 1], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [8, 0], "x": 1.75, "y": 3}, + {"matrix": [3, 0], "x": 2.75, "y": 3}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + + {"matrix": [13, 4], "x": 8.25, "y": 3}, + {"matrix": [13, 3], "x": 9.25, "y": 3}, + {"matrix": [13, 2], "x": 10.25, "y": 3}, + {"matrix": [13, 1], "x": 11.25, "y": 3}, + {"matrix": [13, 0], "x": 12.25, "y": 3}, + {"matrix": [18, 0], "x": 13.25, "y": 3}, + {"matrix": [18, 1], "x": 14.25, "y": 3}, + {"matrix": [18, 2], "x": 15.25, "y": 3, "w": 2}, + + {"matrix": [9, 1], "x": 0.5, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 1.75, "y": 4}, + {"matrix": [4, 0], "x": 2.75, "y": 4}, + {"matrix": [4, 1], "x": 3.75, "y": 4}, + {"matrix": [4, 2], "x": 4.75, "y": 4}, + {"matrix": [4, 3], "x": 5.75, "y": 4}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [14, 4], "x": 8.25, "y": 4}, + {"matrix": [14, 3], "x": 9.25, "y": 4}, + {"matrix": [14, 2], "x": 10.25, "y": 4}, + {"matrix": [14, 1], "x": 11.25, "y": 4}, + {"matrix": [14, 0], "x": 12.25, "y": 4}, + {"matrix": [19, 0], "x": 13.25, "y": 4}, + {"matrix": [19, 1], "x": 14.25, "y": 4}, + {"matrix": [19, 2], "x": 15.25, "y": 4} + ] } } } -- cgit v1.2.3