From ace372d90de13dafc815df5d8049497cb351b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:34:34 +1100 Subject: Move matrix config to info.json, part 3 (#19991) Co-authored-by: Nick Brassel --- keyboards/tender/macrowo_pad/config.h | 24 ------------------------ keyboards/tender/macrowo_pad/info.json | 5 +++++ 2 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 keyboards/tender/macrowo_pad/config.h (limited to 'keyboards/tender/macrowo_pad') diff --git a/keyboards/tender/macrowo_pad/config.h b/keyboards/tender/macrowo_pad/config.h deleted file mode 100644 index bd578550fd..0000000000 --- a/keyboards/tender/macrowo_pad/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 swiftrax - * - * 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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, D7 } -#define MATRIX_COL_PINS { E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json index 5d9184a87e..e6677abc7b 100644 --- a/keyboards/tender/macrowo_pad/info.json +++ b/keyboards/tender/macrowo_pad/info.json @@ -8,6 +8,11 @@ "pid": "0xE936", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/tender/macrowo_pad/macrowo_pad.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/tender/macrowo_pad/macrowo_pad.c (limited to 'keyboards/tender/macrowo_pad') diff --git a/keyboards/tender/macrowo_pad/macrowo_pad.c b/keyboards/tender/macrowo_pad/macrowo_pad.c deleted file mode 100644 index 4dd6441e58..0000000000 --- a/keyboards/tender/macrowo_pad/macrowo_pad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 swiftrax - * - * 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 . - */ -#include "macrowo_pad.h" - \ No newline at end of file -- cgit v1.2.3 From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:46:59 +1000 Subject: Move small macropad-ish layouts to data driven (#20341) --- keyboards/tender/macrowo_pad/info.json | 27 ++++++++++++++++++++++++++- keyboards/tender/macrowo_pad/macrowo_pad.h | 27 --------------------------- 2 files changed, 26 insertions(+), 28 deletions(-) delete mode 100644 keyboards/tender/macrowo_pad/macrowo_pad.h (limited to 'keyboards/tender/macrowo_pad') diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json index e6677abc7b..869d4f16a1 100644 --- a/keyboards/tender/macrowo_pad/info.json +++ b/keyboards/tender/macrowo_pad/info.json @@ -17,7 +17,32 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"0,1", "x":1, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,0", "x":0, "y":0.5}, {"label":"0,2", "x":2, "y":0.5}, {"label":"0,7", "x":8.5, "y":0.5}, {"label":"0,9", "x":10.5, "y":0.5}, {"label":"0,4", "x":3.75, "y":1}, {"label":"0,5", "x":6.75, "y":1}, {"label":"1,4", "x":5.25, "y":1.25}, {"label":"1,0", "x":0, "y":1.5}, {"label":"1,2", "x":2, "y":1.5}, {"label":"1,7", "x":8.5, "y":1.5}, {"label":"1,9", "x":10.5, "y":1.5}, {"label":"1,1", "x":1, "y":2}, {"label":"1,3", "x":4.25, "y":2}, {"label":"1,5", "x":6.25, "y":2}, {"label":"1,8", "x":9.5, "y":2}] + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 3.25, "y": 0}, + {"matrix": [0, 2], "x": 7.25, "y": 0}, + {"matrix": [0, 3], "x": 9.5, "y": 0}, + + {"matrix": [0, 4], "x": 0, "y": 0.5}, + {"matrix": [0, 5], "x": 2, "y": 0.5}, + {"matrix": [0, 6], "x": 8.5, "y": 0.5}, + {"matrix": [0, 7], "x": 10.5, "y": 0.5}, + + {"matrix": [0, 8], "x": 3.75, "y": 1}, + {"matrix": [0, 9], "x": 6.75, "y": 1}, + + {"matrix": [1, 0], "x": 5.25, "y": 1.25}, + + {"matrix": [1, 1], "x": 0, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 8.5, "y": 1.5}, + {"matrix": [1, 4], "x": 10.5, "y": 1.5}, + + {"matrix": [1, 5], "x": 1, "y": 2}, + {"matrix": [1, 7], "x": 4.25, "y": 2}, + {"matrix": [1, 8], "x": 6.25, "y": 2}, + {"matrix": [1, 9], "x": 9.5, "y": 2} + ] } } } diff --git a/keyboards/tender/macrowo_pad/macrowo_pad.h b/keyboards/tender/macrowo_pad/macrowo_pad.h deleted file mode 100644 index b095c037a7..0000000000 --- a/keyboards/tender/macrowo_pad/macrowo_pad.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 swiftrax - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K17, K18, K19 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, KC_NO, K17, K18, K19 } \ -} -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/tender/macrowo_pad/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/tender/macrowo_pad') diff --git a/keyboards/tender/macrowo_pad/info.json b/keyboards/tender/macrowo_pad/info.json index 869d4f16a1..39a2e87ca1 100644 --- a/keyboards/tender/macrowo_pad/info.json +++ b/keyboards/tender/macrowo_pad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Macrowo Pad", + "keyboard_name": "Macrowo Pad", "manufacturer": "Tender", - "url": "https//www.github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https//www.github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xE936", -- cgit v1.2.3