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/eco/config.h | 4 ---- keyboards/eco/rev1/config.h | 24 ------------------------ keyboards/eco/rev1/info.json | 7 ++++++- keyboards/eco/rev2/config.h | 24 ------------------------ keyboards/eco/rev2/info.json | 7 ++++++- 5 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 keyboards/eco/rev1/config.h delete mode 100644 keyboards/eco/rev2/config.h (limited to 'keyboards/eco') diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index 95c6a44399..ce0e92216f 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h deleted file mode 100644 index 1dc94e79b5..0000000000 --- a/keyboards/eco/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 "../config.h" - -/* ECO V1 pin-out */ -#define MATRIX_ROW_PINS { B1, B6, B2, B3 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 } diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/info.json index 90ac25f360..c2c42442dd 100644 --- a/keyboards/eco/rev1/info.json +++ b/keyboards/eco/rev1/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "0.0.1" - } + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["B1", "B6", "B2", "B3"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h deleted file mode 100644 index 35a2334fc9..0000000000 --- a/keyboards/eco/rev2/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 "../config.h" - -/* ECO V2.1 pin-out */ -#define MATRIX_ROW_PINS { D7, B5, B4, E6 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 } diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/info.json index e557e4d307..4cc5e0311f 100644 --- a/keyboards/eco/rev2/info.json +++ b/keyboards/eco/rev2/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "0.0.2" - } + }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"], + "rows": ["D7", "B5", "B4", "E6"] + }, + "diode_direction": "COL2ROW" } -- cgit v1.2.3 From 9dbee3e23d28e5f61384bbb5650505a572022341 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 16 Mar 2023 20:18:33 +1100 Subject: Remove useless "ifdef KEYBOARD_*" (#20078) Co-authored-by: Nick Brassel --- keyboards/eco/config.h | 7 ------- keyboards/eco/eco.c | 1 - keyboards/eco/eco.h | 9 --------- keyboards/eco/rev1/rev1.c | 1 - keyboards/eco/rev1/rev1.h | 2 -- keyboards/eco/rev2/rev2.c | 1 - keyboards/eco/rev2/rev2.h | 2 -- 7 files changed, 23 deletions(-) delete mode 100644 keyboards/eco/eco.c delete mode 100644 keyboards/eco/eco.h delete mode 100644 keyboards/eco/rev1/rev1.c delete mode 100644 keyboards/eco/rev2/rev2.c (limited to 'keyboards/eco') diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index ce0e92216f..b9449c4714 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/config.h @@ -37,10 +37,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 - #include "rev2/config.h" -#endif diff --git a/keyboards/eco/eco.c b/keyboards/eco/eco.c deleted file mode 100644 index 84097652d8..0000000000 --- a/keyboards/eco/eco.c +++ /dev/null @@ -1 +0,0 @@ -#include "eco.h" diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h deleted file mode 100644 index 885bf982d7..0000000000 --- a/keyboards/eco/eco.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#if defined(KEYBOARD_eco_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_eco_rev2) -# include "rev2.h" -#endif - -#include "quantum.h" diff --git a/keyboards/eco/rev1/rev1.c b/keyboards/eco/rev1/rev1.c deleted file mode 100644 index 84097652d8..0000000000 --- a/keyboards/eco/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "eco.h" diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h index a6ceafb815..ea17dc6a55 100644 --- a/keyboards/eco/rev1/rev1.h +++ b/keyboards/eco/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "../eco.h" - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/eco/rev2/rev2.c b/keyboards/eco/rev2/rev2.c deleted file mode 100644 index 84097652d8..0000000000 --- a/keyboards/eco/rev2/rev2.c +++ /dev/null @@ -1 +0,0 @@ -#include "eco.h" diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h index a6ceafb815..ea17dc6a55 100644 --- a/keyboards/eco/rev2/rev2.h +++ b/keyboards/eco/rev2/rev2.h @@ -1,7 +1,5 @@ #pragma once -#include "../eco.h" - #include "quantum.h" #define LAYOUT( \ -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/eco/keymaps/bcat/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/eco') diff --git a/keyboards/eco/keymaps/bcat/config.h b/keyboards/eco/keymaps/bcat/config.h index 2a986f903b..1a3fd81199 100644 --- a/keyboards/eco/keymaps/bcat/config.h +++ b/keyboards/eco/keymaps/bcat/config.h @@ -19,7 +19,7 @@ #define BCAT_ORTHO_LAYERS /* WS2812B RGB LED strip hand wired to Elite-C. */ -#define RGB_DI_PIN B7 +#define WS2812_DI_PIN B7 #define RGBLED_NUM 15 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD -- cgit v1.2.3 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/eco/info.json | 7 +---- keyboards/eco/rev1/info.json | 67 +++++++++++++++++++++++++++++++++++++++++++- keyboards/eco/rev1/rev1.h | 15 ---------- keyboards/eco/rev2/info.json | 67 +++++++++++++++++++++++++++++++++++++++++++- keyboards/eco/rev2/rev2.h | 15 ---------- 5 files changed, 133 insertions(+), 38 deletions(-) delete mode 100644 keyboards/eco/rev1/rev1.h delete mode 100644 keyboards/eco/rev2/rev2.h (limited to 'keyboards/eco') diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json index 24c153341c..6a1b2adda1 100644 --- a/keyboards/eco/info.json +++ b/keyboards/eco/info.json @@ -8,10 +8,5 @@ "pid": "0x6006" }, "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [{"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0}, {"label":"k03", "x":2, "y":0}, {"label":"k04", "x":3, "y":0}, {"label":"k05", "x":4, "y":0}, {"label":"k06", "x":5, "y":0}, {"label":"k07", "x":6, "y":0}, {"label":"k08", "x":7, "y":0}, {"label":"k09", "x":8, "y":0}, {"label":"k010", "x":9, "y":0}, {"label":"k011", "x":10, "y":0}, {"label":"k012", "x":11, "y":0}, {"label":"k013", "x":12, "y":0}, {"label":"k014", "x":13, "y":0}, {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1}, {"label":"k13", "x":2, "y":1}, {"label":"k14", "x":3, "y":1}, {"label":"k15", "x":4, "y":1}, {"label":"k16", "x":5, "y":1}, {"label":"k17", "x":6, "y":1}, {"label":"k18", "x":7, "y":1}, {"label":"k19", "x":8, "y":1}, {"label":"k110", "x":9, "y":1}, {"label":"k111", "x":10, "y":1}, {"label":"k112", "x":11, "y":1}, {"label":"k113", "x":12, "y":1}, {"label":"k114", "x":13, "y":1}, {"label":"k21", "x":0, "y":2}, {"label":"k22", "x":1, "y":2}, {"label":"k23", "x":2, "y":2}, {"label":"k24", "x":3, "y":2}, {"label":"k25", "x":4, "y":2}, {"label":"k26", "x":5, "y":2}, {"label":"k27", "x":6, "y":2}, {"label":"k28", "x":7, "y":2}, {"label":"k29", "x":8, "y":2}, {"label":"k210", "x":9, "y":2}, {"label":"k211", "x":10, "y":2}, {"label":"k212", "x":11, "y":2}, {"label":"k213", "x":12, "y":2}, {"label":"k214", "x":13, "y":2}, {"label":"k31", "x":0, "y":3}, {"label":"k32", "x":1, "y":3}, {"label":"k33", "x":2, "y":3}, {"label":"k34", "x":3, "y":3}, {"label":"k35", "x":4, "y":3}, {"label":"k36", "x":5, "y":3}, {"label":"k37", "x":6, "y":3}, {"label":"k38", "x":7, "y":3}, {"label":"k39", "x":8, "y":3}, {"label":"k310", "x":9, "y":3}, {"label":"k311", "x":10, "y":3}, {"label":"k312", "x":11, "y":3}, {"label":"k313", "x":12, "y":3}, {"label":"k314", "x":13, "y":3}] - } - } + "bootloader": "caterina" } diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/info.json index c2c42442dd..f2a7842ce4 100644 --- a/keyboards/eco/rev1/info.json +++ b/keyboards/eco/rev1/info.json @@ -6,5 +6,70 @@ "cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["B1", "B6", "B2", "B3"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "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}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3} + ] + } + } } diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h deleted file mode 100644 index ea17dc6a55..0000000000 --- a/keyboards/eco/rev1/rev1.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \ -} diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/info.json index 4cc5e0311f..8148e78f85 100644 --- a/keyboards/eco/rev2/info.json +++ b/keyboards/eco/rev2/info.json @@ -6,5 +6,70 @@ "cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"], "rows": ["D7", "B5", "B4", "E6"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "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}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3} + ] + } + } } diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h deleted file mode 100644 index ea17dc6a55..0000000000 --- a/keyboards/eco/rev2/rev2.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \ -} -- cgit v1.2.3