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) --- .../afternoonlabs/southern_breeze/rev1/info.json | 141 +++++++++++---------- .../afternoonlabs/southern_breeze/rev1/rev1.h | 39 ------ 2 files changed, 75 insertions(+), 105 deletions(-) delete mode 100644 keyboards/afternoonlabs/southern_breeze/rev1/rev1.h (limited to 'keyboards/afternoonlabs/southern_breeze') diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json index c9a7ecc3ca..c71feef8ba 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/southern_breeze/rev1/info.json @@ -24,76 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.375}, - {"x":3.25, "y":0.375}, - {"x":4.25, "y":0.375}, - {"x":5.25, "y":0.125}, - {"x":6.25, "y":0}, - {"x":7.25, "y":0.125}, - {"x":8.25, "y":0.25}, - {"x":13, "y":0.25}, - {"x":14, "y":0.125}, - {"x":15, "y":0}, - {"x":16, "y":0.125}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 8], "x": 0, "y": 0.375}, + {"matrix": [0, 7], "x": 1, "y": 0.375}, + {"matrix": [0, 6], "x": 2, "y": 0.375}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.375}, - {"x":3.25, "y":1.375}, - {"x":4.25, "y":1.375}, - {"x":5.25, "y":1.125}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1.125}, - {"x":8.25, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.125}, - {"x":15, "y":1}, - {"x":16, "y":1.125}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [0, 5], "x": 3.25, "y": 0.375}, + {"matrix": [0, 4], "x": 4.25, "y": 0.375}, + {"matrix": [0, 3], "x": 5.25, "y": 0.125}, + {"matrix": [0, 2], "x": 6.25, "y": 0}, + {"matrix": [0, 1], "x": 7.25, "y": 0.125}, + {"matrix": [0, 0], "x": 8.25, "y": 0.25}, - {"x":1, "y":2.375}, - {"x":3.25, "y":2.375}, - {"x":4.25, "y":2.375}, - {"x":5.25, "y":2.125}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2.125}, - {"x":8.25, "y":2.25}, - {"x":13, "y":2.25}, - {"x":14, "y":2.125}, - {"x":15, "y":2}, - {"x":16, "y":2.125}, - {"x":17, "y":2.375}, - {"x":18, "y":2.375}, + {"matrix": [5, 0], "x": 13, "y": 0.25}, + {"matrix": [5, 1], "x": 14, "y": 0.125}, + {"matrix": [5, 2], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0.125}, + {"matrix": [5, 4], "x": 17, "y": 0.375}, + {"matrix": [5, 5], "x": 18, "y": 0.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.375}, - {"x":3.25, "y":3.375}, - {"x":4.25, "y":3.375}, - {"x":5.25, "y":3.125}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3.125}, - {"x":8.25, "y":3.25}, - {"x":13, "y":3.25}, - {"x":14, "y":3.125}, - {"x":15, "y":3}, - {"x":16, "y":3.125}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [1, 8], "x": 0, "y": 1.375}, + {"matrix": [1, 7], "x": 1, "y": 1.375}, + {"matrix": [1, 6], "x": 2, "y": 1.375}, - {"x":5.75, "y":4.25}, - {"x":6.75, "y":4.25}, - {"x":7.75, "y":4.5}, - {"x":9.5, "y":3.75, "h":2, "r":30}, - {"x":11.75, "y":3.75, "h":2, "r":-30}, - {"x":13.5, "y":4.5}, - {"x":14.5, "y":4.25}, - {"x":15.5, "y":4.25} + {"matrix": [1, 5], "x": 3.25, "y": 1.375}, + {"matrix": [1, 4], "x": 4.25, "y": 1.375}, + {"matrix": [1, 3], "x": 5.25, "y": 1.125}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 1], "x": 7.25, "y": 1.125}, + {"matrix": [1, 0], "x": 8.25, "y": 1.25}, + + {"matrix": [6, 0], "x": 13, "y": 1.25}, + {"matrix": [6, 1], "x": 14, "y": 1.125}, + {"matrix": [6, 2], "x": 15, "y": 1}, + {"matrix": [6, 3], "x": 16, "y": 1.125}, + {"matrix": [6, 4], "x": 17, "y": 1.375}, + {"matrix": [6, 5], "x": 18, "y": 1.375}, + + {"matrix": [2, 7], "x": 1, "y": 2.375}, + + {"matrix": [2, 5], "x": 3.25, "y": 2.375}, + {"matrix": [2, 4], "x": 4.25, "y": 2.375}, + {"matrix": [2, 3], "x": 5.25, "y": 2.125}, + {"matrix": [2, 2], "x": 6.25, "y": 2}, + {"matrix": [2, 1], "x": 7.25, "y": 2.125}, + {"matrix": [2, 0], "x": 8.25, "y": 2.25}, + + {"matrix": [7, 0], "x": 13, "y": 2.25}, + {"matrix": [7, 1], "x": 14, "y": 2.125}, + {"matrix": [7, 2], "x": 15, "y": 2}, + {"matrix": [7, 3], "x": 16, "y": 2.125}, + {"matrix": [7, 4], "x": 17, "y": 2.375}, + {"matrix": [7, 5], "x": 18, "y": 2.375}, + + {"matrix": [3, 8], "x": 0, "y": 3.375}, + {"matrix": [3, 7], "x": 1, "y": 3.375}, + {"matrix": [3, 6], "x": 2, "y": 3.375}, + + {"matrix": [3, 5], "x": 3.25, "y": 3.375}, + {"matrix": [3, 4], "x": 4.25, "y": 3.375}, + {"matrix": [3, 3], "x": 5.25, "y": 3.125}, + {"matrix": [3, 2], "x": 6.25, "y": 3}, + {"matrix": [3, 1], "x": 7.25, "y": 3.125}, + {"matrix": [3, 0], "x": 8.25, "y": 3.25}, + + {"matrix": [8, 0], "x": 13, "y": 3.25}, + {"matrix": [8, 1], "x": 14, "y": 3.125}, + {"matrix": [8, 2], "x": 15, "y": 3}, + {"matrix": [8, 3], "x": 16, "y": 3.125}, + {"matrix": [8, 4], "x": 17, "y": 3.375}, + {"matrix": [8, 5], "x": 18, "y": 3.375}, + + {"matrix": [4, 3], "x": 5.75, "y": 4.25}, + {"matrix": [4, 2], "x": 6.75, "y": 4.25}, + {"matrix": [4, 1], "x": 7.75, "y": 4.5}, + {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30}, + + {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 13.5, "y": 4.5}, + {"matrix": [9, 2], "x": 14.5, "y": 4.25}, + {"matrix": [9, 3], "x": 15.5, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h deleted file mode 100644 index b8a83f6aad..0000000000 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * 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 LAYOUT( \ - LW00, LW01, LW02, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - LW10, LW11, LW12, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - LWUP, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - LWLT, LWDN, LWRT, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, LW02, LW01, LW00 }, \ - { L15, L14, L13, L12, L11, L10, LW12, LW11, LW10 }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, LWUP, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, LWRT, LWDN, LWLT }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO, KC_NO }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} -- cgit v1.2.3