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/waterfowl/info.json | 84 +++++++++++++++++++++-------------------- keyboards/waterfowl/waterfowl.c | 2 +- keyboards/waterfowl/waterfowl.h | 44 --------------------- 3 files changed, 45 insertions(+), 85 deletions(-) delete mode 100644 keyboards/waterfowl/waterfowl.h (limited to 'keyboards/waterfowl') diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json index 0ee5b095b1..1ed35a14f2 100644 --- a/keyboards/waterfowl/info.json +++ b/keyboards/waterfowl/info.json @@ -27,49 +27,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":1}, - {"x":1, "y":0.25}, - {"x":2, "y":0}, - {"x":3, "y":0.375}, - {"x":4, "y":0.5}, - {"x":9, "y":0.5}, - {"x":10, "y":0.375}, - {"x":11, "y":0}, - {"x":12, "y":0.25}, - {"x":13, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.375}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, - {"x":0, "y":2}, - {"x":1, "y":1.25}, - {"x":2, "y":1}, - {"x":3, "y":1.375}, - {"x":4, "y":1.5}, - {"x":9, "y":1.5}, - {"x":10, "y":1.375}, - {"x":11, "y":1}, - {"x":12, "y":1.25}, - {"x":13, "y":2}, + {"matrix": [4, 4], "x": 9, "y": 0.5}, + {"matrix": [4, 3], "x": 10, "y": 0.375}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0.25}, + {"matrix": [4, 0], "x": 13, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":2.25}, - {"x":2, "y":2}, - {"x":3, "y":2.375}, - {"x":4, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.375}, - {"x":11, "y":2}, - {"x":12, "y":2.25}, - {"x":13, "y":3}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.375}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"x":2, "y":3.5}, - {"x":3.5, "y":3.5}, - {"x":4.5, "y":3.7}, - {"x":5.5, "y":4.1}, - {"x":5.5, "y":2.5}, - {"x":7.5, "y":2.5}, - {"x":7.5, "y":4.1}, - {"x":8.5, "y":3.7}, - {"x":9.5, "y":3.5}, - {"x":11, "y":3.5} + {"matrix": [5, 4], "x": 9, "y": 1.5}, + {"matrix": [5, 3], "x": 10, "y": 1.375}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1.25}, + {"matrix": [5, 0], "x": 13, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.375}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + + {"matrix": [6, 4], "x": 9, "y": 2.5}, + {"matrix": [6, 3], "x": 10, "y": 2.375}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2.25}, + {"matrix": [6, 0], "x": 13, "y": 3}, + + {"matrix": [3, 0], "x": 2, "y": 3.5}, + {"matrix": [3, 1], "x": 3.5, "y": 3.5}, + {"matrix": [3, 2], "x": 4.5, "y": 3.7}, + {"matrix": [3, 3], "x": 5.5, "y": 4.1}, + {"matrix": [3, 4], "x": 5.5, "y": 2.5}, + + {"matrix": [7, 4], "x": 7.5, "y": 2.5}, + {"matrix": [7, 3], "x": 7.5, "y": 4.1}, + {"matrix": [7, 2], "x": 8.5, "y": 3.7}, + {"matrix": [7, 1], "x": 9.5, "y": 3.5}, + {"matrix": [7, 0], "x": 11, "y": 3.5} ] } } diff --git a/keyboards/waterfowl/waterfowl.c b/keyboards/waterfowl/waterfowl.c index 55dcdf4796..fb30fd0078 100644 --- a/keyboards/waterfowl/waterfowl.c +++ b/keyboards/waterfowl/waterfowl.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "waterfowl.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/waterfowl/waterfowl.h b/keyboards/waterfowl/waterfowl.h deleted file mode 100644 index 0c7f897dbf..0000000000 --- a/keyboards/waterfowl/waterfowl.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2022 CyanDuck -* -* 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 3 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. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ - L05, L06, L07, L08, L09, R09, R08, R07, R06, R05, \ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L15, L16, L17, L18, L19, R19, R18, R17, R16, R15 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L05, L06, L07, L08, L09 }, \ - { L10, L11, L12, L13, L14 }, \ - { L15, L16, L17, L18, L19 }, \ - { R00, R01, R02, R03, R04 }, \ - { R05, R06, R07, R08, R09 }, \ - { R10, R11, R12, R13, R14 }, \ - { R15, R16, R17, R18, R19}, \ -} -- cgit v1.2.3