diff options
author | Ryan <fauxpark@gmail.com> | 2023-03-11 00:34:34 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-11 00:34:34 +1100 |
commit | ace372d90de13dafc815df5d8049497cb351b69b (patch) | |
tree | 0eb4793443956fbc60a1cfca5c1f1e556422ce66 /keyboards/eco | |
parent | 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 (diff) |
Move matrix config to info.json, part 3 (#19991)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/eco')
-rw-r--r-- | keyboards/eco/config.h | 4 | ||||
-rw-r--r-- | keyboards/eco/rev1/config.h | 24 | ||||
-rw-r--r-- | keyboards/eco/rev1/info.json | 7 | ||||
-rw-r--r-- | keyboards/eco/rev2/config.h | 24 | ||||
-rw-r--r-- | keyboards/eco/rev2/info.json | 7 |
5 files changed, 12 insertions, 54 deletions
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 <http://www.gnu.org/licenses/>. #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 <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#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 <wakojun@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -#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" } |