From 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 29 Mar 2023 15:54:34 +1100 Subject: Move ortho & numpad layouts to data driven (#20183) Co-authored-by: Nick Brassel --- keyboards/cybergear/macro25/info.json | 13 +++++++++++-- keyboards/cybergear/macro25/macro25.h | 27 --------------------------- 2 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 keyboards/cybergear/macro25/macro25.h (limited to 'keyboards/cybergear/macro25') diff --git a/keyboards/cybergear/macro25/info.json b/keyboards/cybergear/macro25/info.json index 8d0701104c..1737c5f8fd 100644 --- a/keyboards/cybergear/macro25/info.json +++ b/keyboards/cybergear/macro25/info.json @@ -14,8 +14,17 @@ "layouts": { "LAYOUT_ortho_2x5": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1} ] } }, diff --git a/keyboards/cybergear/macro25/macro25.h b/keyboards/cybergear/macro25/macro25.h deleted file mode 100644 index 22b814a97b..0000000000 --- a/keyboards/cybergear/macro25/macro25.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 CyberGear Marius Kavoliunas - * - * 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_ortho_2x5( \ - K00, K01, K02, K03, K04, \ - K05, K06, K07, K08, K09 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K05, K06, K07, K08, K09 }, \ -} -- cgit v1.2.3