diff options
Diffstat (limited to 'keyboards/evyd13')
70 files changed, 120 insertions, 746 deletions
diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h index 1098e61379..bb61a6c852 100644 --- a/keyboards/evyd13/atom47/rev2/config.h +++ b/keyboards/evyd13/atom47/rev2/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B1,B2,B3,B7} -#define MATRIX_COL_PINS {D7,D5,F0,F1,F4,F6,F7,D4,C7,C6,D6,B5,B4} - - -/* 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/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json index 9a7ac37f30..8ac2fa2f2e 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x8E66", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "D5", "F0", "F1", "F4", "F6", "F7", "D4", "C7", "C6", "D6", "B5", "B4"], + "rows": ["B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4, diff --git a/keyboards/evyd13/atom47/rev2/rev2.c b/keyboards/evyd13/atom47/rev2/rev2.c deleted file mode 100644 index adb21be368..0000000000 --- a/keyboards/evyd13/atom47/rev2/rev2.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Evelien Dekkers - -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/>. -*/ - -#include "rev2.h" diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h index 5cee6379ff..27a5e7ca66 100644 --- a/keyboards/evyd13/atom47/rev3/config.h +++ b/keyboards/evyd13/atom47/rev3/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B3,B2,B1,B0} -#define MATRIX_COL_PINS {B7,F0,F1,F4,F6,D4,D6,D7,B4,B5,C6,C7,F7} - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F5 // The pin the LED strip is connected to #define RGBLED_NUM 6 // Number of LEDs in your strip #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json index 644a095eca..fd0f4fa3a8 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/info.json @@ -8,6 +8,11 @@ "pid": "0x0E6D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "F0", "F1", "F4", "F6", "D4", "D6", "D7", "B4", "B5", "C6", "C7", "F7"], + "rows": ["B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5, diff --git a/keyboards/evyd13/atom47/rev3/rev3.c b/keyboards/evyd13/atom47/rev3/rev3.c deleted file mode 100644 index 52fa91fbc4..0000000000 --- a/keyboards/evyd13/atom47/rev3/rev3.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Evelien Dekkers - -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/>. -*/ - -#include "rev3.h" diff --git a/keyboards/evyd13/atom47/rev4/config.h b/keyboards/evyd13/atom47/rev4/config.h deleted file mode 100644 index 52a4bf2ff9..0000000000 --- a/keyboards/evyd13/atom47/rev4/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Evelien Dekkers - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {D0,C2,C5,C6} -#define MATRIX_COL_PINS {C4,C7,B7,B6,B5,B2,B1,B0,D6,D5,D4,D3,D2} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json index 42b8abda54..bf2e6b69ac 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/info.json @@ -8,6 +8,11 @@ "pid": "0x8446", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C7", "B7", "B6", "B5", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2"], + "rows": ["D0", "C2", "C5", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B4"} diff --git a/keyboards/evyd13/atom47/rev4/rev4.c b/keyboards/evyd13/atom47/rev4/rev4.c deleted file mode 100644 index 0ac2a41acc..0000000000 --- a/keyboards/evyd13/atom47/rev4/rev4.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Evelien Dekkers - -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/>. -*/ - -#include "rev4.h" diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h index e79d7e8a87..ae0151d512 100644 --- a/keyboards/evyd13/atom47/rev5/config.h +++ b/keyboards/evyd13/atom47/rev5/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS {B1,B2,B3,D4} -#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,E6,D7,B4,B5,B6,C6,C7} - -/* COL2ROW, 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/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json index 847cac0b73..a71ee1e241 100644 --- a/keyboards/evyd13/atom47/rev5/info.json +++ b/keyboards/evyd13/atom47/rev5/info.json @@ -8,6 +8,11 @@ "pid": "0x92EA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B1", "B2", "B3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h index 2f1708d532..230ff5e311 100644 --- a/keyboards/evyd13/eon40/config.h +++ b/keyboards/evyd13/eon40/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {B7,D5,F5,F6} -#define MATRIX_COL_PINS {F0,F1,F4,D3,D4,D6,D7,B4,B5,B6,C6,C7} - -/* COL2ROW, 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/evyd13/eon40/eon40.c b/keyboards/evyd13/eon40/eon40.c deleted file mode 100644 index 014fca9d40..0000000000 --- a/keyboards/evyd13/eon40/eon40.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "eon40.h" diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json index cda0c495a4..efed477015 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/info.json @@ -8,6 +8,11 @@ "pid": "0x0140", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B7", "D5", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "F7"}, diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h index 2660c3ddf2..5b471d6d5e 100644 --- a/keyboards/evyd13/eon65/config.h +++ b/keyboards/evyd13/eon65/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {D3,D5,B1,B2,B3} -#define MATRIX_COL_PINS {B0,D2,D4,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,F1,F0} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E6 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/evyd13/eon65/eon65.c b/keyboards/evyd13/eon65/eon65.c deleted file mode 100644 index cdbe987ebb..0000000000 --- a/keyboards/evyd13/eon65/eon65.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "eon65.h" diff --git a/keyboards/evyd13/eon65/info.json b/keyboards/evyd13/eon65/info.json index 9f1a67689f..48f202a4fb 100644 --- a/keyboards/evyd13/eon65/info.json +++ b/keyboards/evyd13/eon65/info.json @@ -8,6 +8,11 @@ "pid": "0xAEB4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D2", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D3", "D5", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_ansi_blocker", "65_iso", "65_iso_blocker"], diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h index e820ff9ab9..230ff5e311 100644 --- a/keyboards/evyd13/eon75/config.h +++ b/keyboards/evyd13/eon75/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {D1,D0,D3,D2,D6,D4,D7,B4,B5,B6,C6,C7} -#define MATRIX_COL_PINS {E6,F0,F1,F4,F5,F6,F7,B3} - -/* COL2ROW, 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/evyd13/eon75/eon75.c b/keyboards/evyd13/eon75/eon75.c deleted file mode 100644 index 38620a6362..0000000000 --- a/keyboards/evyd13/eon75/eon75.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "eon75.h" diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/info.json index 55d92273b8..b9af34edb6 100644 --- a/keyboards/evyd13/eon75/info.json +++ b/keyboards/evyd13/eon75/info.json @@ -8,6 +8,11 @@ "pid": "0x5C62", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3"], + "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D5", "num_lock": "B7", diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h index 0007e510c5..a5b74985e8 100644 --- a/keyboards/evyd13/eon87/config.h +++ b/keyboards/evyd13/eon87/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {B1,B2,B3,D4,D1,D5} -#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,E6,B7,D3,D2} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D0 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/evyd13/eon87/eon87.c b/keyboards/evyd13/eon87/eon87.c deleted file mode 100644 index 83a005225d..0000000000 --- a/keyboards/evyd13/eon87/eon87.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "eon87.h" diff --git a/keyboards/evyd13/eon87/info.json b/keyboards/evyd13/eon87/info.json index 2dcdea0dd8..59de0b3585 100644 --- a/keyboards/evyd13/eon87/info.json +++ b/keyboards/evyd13/eon87/info.json @@ -8,6 +8,11 @@ "pid": "0xAA6B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "E6", "B7", "D3", "D2"], + "rows": ["B1", "B2", "B3", "D4", "D1", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h index 70d07b9855..dcf77ef1ac 100644 --- a/keyboards/evyd13/eon95/config.h +++ b/keyboards/evyd13/eon95/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {D1,D0,D3,D2,D6,D4,D7,B4,B5,B6,C6,C7} -#define MATRIX_COL_PINS {E6,F0,F1,F4,F5,F6,F7,B3,B2,B1} - -/* COL2ROW, 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/evyd13/eon95/eon95.c b/keyboards/evyd13/eon95/eon95.c deleted file mode 100644 index 603d84a139..0000000000 --- a/keyboards/evyd13/eon95/eon95.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "eon95.h" diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json index e0d2736341..1ec5fd89ed 100644 --- a/keyboards/evyd13/eon95/info.json +++ b/keyboards/evyd13/eon95/info.json @@ -8,6 +8,11 @@ "pid": "0x8A18", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1"], + "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D5", "num_lock": "B7", diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h index f60d43a498..4183c7db05 100644 --- a/keyboards/evyd13/gh80_1800/config.h +++ b/keyboards/evyd13/gh80_1800/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {D5,B4,B5,B6,C6,C7,B0,B2,B1,B3} -#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,D3,D2,D1,D0,B7} - -/* COL2ROW, 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/evyd13/gh80_1800/gh80_1800.c b/keyboards/evyd13/gh80_1800/gh80_1800.c deleted file mode 100644 index 1691b3949e..0000000000 --- a/keyboards/evyd13/gh80_1800/gh80_1800.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Evy Dekkers - * - * 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/>. - */ -#include "gh80_1800.h" diff --git a/keyboards/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/info.json index 9bc3349db9..ed843e6d12 100644 --- a/keyboards/evyd13/gh80_1800/info.json +++ b/keyboards/evyd13/gh80_1800/info.json @@ -8,6 +8,11 @@ "pid": "0x8B23", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D3", "D2", "D1", "D0", "B7"], + "rows": ["D5", "B4", "B5", "B6", "C6", "C7", "B0", "B2", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D7", "num_lock": "D6", diff --git a/keyboards/evyd13/gh80_3700/config.h b/keyboards/evyd13/gh80_3700/config.h index 003131ceae..4183c7db05 100644 --- a/keyboards/evyd13/gh80_3700/config.h +++ b/keyboards/evyd13/gh80_3700/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {B3,C7,C6,B6,B5,B4} -#define MATRIX_COL_PINS {B0,D7,D6,D4} - -/* COL2ROW, 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/evyd13/gh80_3700/info.json b/keyboards/evyd13/gh80_3700/info.json index 7ab1267ed9..91b8b5ee59 100644 --- a/keyboards/evyd13/gh80_3700/info.json +++ b/keyboards/evyd13/gh80_3700/info.json @@ -8,6 +8,11 @@ "pid": "0x633A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "D4"], + "rows": ["B3", "C7", "C6", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F1", "pin_b": "F4"} diff --git a/keyboards/evyd13/gud70/config.h b/keyboards/evyd13/gud70/config.h deleted file mode 100644 index 8482880611..0000000000 --- a/keyboards/evyd13/gud70/config.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2020 Evelien Dekkers - * - * 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 - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {D7,D6,D4,E6,B7} -#define MATRIX_COL_PINS {D5,D3,D2,D1,D0,B4,B5,B6,C6,C7,F0,F1,F4,F5,F6,F7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/info.json index 2ce63fa082..a48ec2e097 100644 --- a/keyboards/evyd13/gud70/info.json +++ b/keyboards/evyd13/gud70/info.json @@ -8,6 +8,11 @@ "pid": "0x198B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0", "B4", "B5", "B6", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["D7", "D6", "D4", "E6", "B7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B1", "num_lock": "B2", diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h index 6e5b26d022..230ff5e311 100644 --- a/keyboards/evyd13/minitomic/config.h +++ b/keyboards/evyd13/minitomic/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {B1,B3,D4,D6} -#define MATRIX_COL_PINS {C6,B6,B5,B4,D7,F0,F1,F4,F5,F6,F7,B7,E6} - -/* COL2ROW, 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/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json index 1a58aa135f..45641c27d7 100644 --- a/keyboards/evyd13/minitomic/info.json +++ b/keyboards/evyd13/minitomic/info.json @@ -8,6 +8,11 @@ "pid": "0x0145", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "D7", "F0", "F1", "F4", "F5", "F6", "F7", "B7", "E6"], + "rows": ["B1", "B3", "D4", "D6"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B1", "esc_output": "C6", diff --git a/keyboards/evyd13/minitomic/minitomic.c b/keyboards/evyd13/minitomic/minitomic.c deleted file mode 100644 index 15f2829648..0000000000 --- a/keyboards/evyd13/minitomic/minitomic.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "minitomic.h" diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h index 408d12cb69..230ff5e311 100644 --- a/keyboards/evyd13/mx5160/config.h +++ b/keyboards/evyd13/mx5160/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {C6,C7,B5,B6,D7,B4,D4,D6,D5,D3} -#define MATRIX_COL_PINS {D0,D1,D2,F7,F6,F5,F4,F1,F0,E6} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json index 4436aefb8f..67345afd68 100644 --- a/keyboards/evyd13/mx5160/info.json +++ b/keyboards/evyd13/mx5160/info.json @@ -8,6 +8,11 @@ "pid": "0x5160", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], + "rows": ["C6", "C7", "B5", "B6", "D7", "B4", "D4", "D6", "D5", "D3"] + }, + "diode_direction": "ROW2COL", "qmk_lufa_bootloader": { "esc_input": "D1", "esc_output": "C6", diff --git a/keyboards/evyd13/mx5160/mx5160.c b/keyboards/evyd13/mx5160/mx5160.c deleted file mode 100644 index 298c44fd49..0000000000 --- a/keyboards/evyd13/mx5160/mx5160.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "mx5160.h" diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h index 4993142773..f64827d05f 100644 --- a/keyboards/evyd13/nt660/config.h +++ b/keyboards/evyd13/nt660/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS {B7,E6,F6,F7,C7} -#define MATRIX_COL_PINS {D6,D7,B4,B5,B6,C6,B0,B1,B2,B3,F0,F1,F4,F5,D4} - -/* 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/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json index ba2503c5ef..f9aae13680 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/info.json @@ -8,6 +8,11 @@ "pid": "0x1F02", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "B0", "B1", "B2", "B3", "F0", "F1", "F4", "F5", "D4"], + "rows": ["B7", "E6", "F6", "F7", "C7"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B7", "esc_output": "D6", diff --git a/keyboards/evyd13/nt660/nt660.c b/keyboards/evyd13/nt660/nt660.c deleted file mode 100644 index f89fa579c3..0000000000 --- a/keyboards/evyd13/nt660/nt660.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Evy Dekkers - * - * 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/>. - */ -#include "nt660.h" diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h index ee44ae05ef..f64827d05f 100644 --- a/keyboards/evyd13/nt750/config.h +++ b/keyboards/evyd13/nt750/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS {B2,B3,B7,D0,D1,D2} -#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,D4,E6,B1,B0} - -/* 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/evyd13/nt750/info.json b/keyboards/evyd13/nt750/info.json index 032e31285f..24b25114f5 100644 --- a/keyboards/evyd13/nt750/info.json +++ b/keyboards/evyd13/nt750/info.json @@ -8,6 +8,11 @@ "pid": "0x3320", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B1", "B0"], + "rows": ["B2", "B3", "B7", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D5", "on_state": 0 diff --git a/keyboards/evyd13/nt750/nt750.c b/keyboards/evyd13/nt750/nt750.c deleted file mode 100644 index 6ae67cc368..0000000000 --- a/keyboards/evyd13/nt750/nt750.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Evy Dekkers - * - * 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/>. - */ -#include "nt750.h" diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h index 01bce84e50..f64827d05f 100644 --- a/keyboards/evyd13/nt980/config.h +++ b/keyboards/evyd13/nt980/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, D1, D0, C6, C7, B5, B6, B4, D7, D4, D6 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, E6, D3, D2 } - -/* COL2ROW, 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/evyd13/nt980/info.json b/keyboards/evyd13/nt980/info.json index 48c65e6f30..fd85004587 100644 --- a/keyboards/evyd13/nt980/info.json +++ b/keyboards/evyd13/nt980/info.json @@ -8,6 +8,11 @@ "pid": "0xAAF8", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D3", "D2"], + "rows": ["B0", "B1", "D1", "D0", "C6", "C7", "B5", "B6", "B4", "D7", "D4", "D6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "num_lock": "B2", diff --git a/keyboards/evyd13/nt980/nt980.c b/keyboards/evyd13/nt980/nt980.c deleted file mode 100644 index e0113f1249..0000000000 --- a/keyboards/evyd13/nt980/nt980.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Evy Dekkers - * - * 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/>. - */ - -#include "nt980.h" diff --git a/keyboards/evyd13/omrontkl/config.h b/keyboards/evyd13/omrontkl/config.h index 9246127a30..230ff5e311 100644 --- a/keyboards/evyd13/omrontkl/config.h +++ b/keyboards/evyd13/omrontkl/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {D0,D1,D2,D3,D4,B7} -#define MATRIX_COL_PINS {F0,C7,F1,C6,F4,B6,F5,B5,F6,B4,F7,D7,D6,D5,B3,B1,B2} - -/* COL2ROW, 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/evyd13/omrontkl/info.json b/keyboards/evyd13/omrontkl/info.json index b76faa7952..78bf0e3133 100644 --- a/keyboards/evyd13/omrontkl/info.json +++ b/keyboards/evyd13/omrontkl/info.json @@ -8,6 +8,11 @@ "pid": "0xEA78", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "C7", "F1", "C6", "F4", "B6", "F5", "B5", "F6", "B4", "F7", "D7", "D6", "D5", "B3", "B1", "B2"], + "rows": ["D0", "D1", "D2", "D3", "D4", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/evyd13/omrontkl/omrontkl.c b/keyboards/evyd13/omrontkl/omrontkl.c deleted file mode 100644 index 26d0344d33..0000000000 --- a/keyboards/evyd13/omrontkl/omrontkl.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "omrontkl.h" diff --git a/keyboards/evyd13/plain60/config.h b/keyboards/evyd13/plain60/config.h deleted file mode 100644 index d3c3722e9e..0000000000 --- a/keyboards/evyd13/plain60/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2019 Evy Dekkers - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B4,D7,D6,D4,E6} -#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,B5,F0,B6,C6,C7,F1,F4,F5,F6,F7} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/evyd13/plain60/info.json b/keyboards/evyd13/plain60/info.json index d6a930e9ea..f2e3a55bce 100644 --- a/keyboards/evyd13/plain60/info.json +++ b/keyboards/evyd13/plain60/info.json @@ -8,6 +8,11 @@ "pid": "0x0160", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "D3", "D5", "B5", "F0", "B6", "C6", "C7", "F1", "F4", "F5", "F6", "F7"], + "rows": ["B4", "D7", "D6", "D4", "E6"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B4", "esc_output": "D2" diff --git a/keyboards/evyd13/plain60/plain60.c b/keyboards/evyd13/plain60/plain60.c deleted file mode 100644 index d816064104..0000000000 --- a/keyboards/evyd13/plain60/plain60.c +++ /dev/null @@ -1 +0,0 @@ -#include "plain60.h" diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h index cda625870f..230ff5e311 100644 --- a/keyboards/evyd13/pockettype/config.h +++ b/keyboards/evyd13/pockettype/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {D3,D1,D7,B5} -#define MATRIX_COL_PINS {F6,F7,B1,B3,B2,B6,B4,E6,C6,D4,D0,D2} - -/* COL2ROW, 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/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json index e515b82b56..0ea40b5ea2 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/info.json @@ -8,6 +8,11 @@ "pid": "0xFA7D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "B4", "E6", "C6", "D4", "D0", "D2"], + "rows": ["D3", "D1", "D7", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h index 8ab3d62a1e..78bb3b6f80 100644 --- a/keyboards/evyd13/quackfire/config.h +++ b/keyboards/evyd13/quackfire/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {D3,F5,F4,F0,B7,B2,E6,B0} -#define MATRIX_COL_PINS {B3,F1,B1,D5,D2,D1,D0,D4,D6,D7,B4,B5,B6,C6,C7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json index b64616a588..b6ec7756b0 100644 --- a/keyboards/evyd13/quackfire/info.json +++ b/keyboards/evyd13/quackfire/info.json @@ -8,6 +8,11 @@ "pid": "0x87C9", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "F1", "B1", "D5", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "F7", "scroll_lock": "F6", diff --git a/keyboards/evyd13/quackfire/quackfire.c b/keyboards/evyd13/quackfire/quackfire.c deleted file mode 100644 index 634d4187c6..0000000000 --- a/keyboards/evyd13/quackfire/quackfire.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Evy Dekkers - * - * 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/>. - */ -#include "quackfire.h" diff --git a/keyboards/evyd13/solheim68/config.h b/keyboards/evyd13/solheim68/config.h index 29398263f8..82eff7341c 100644 --- a/keyboards/evyd13/solheim68/config.h +++ b/keyboards/evyd13/solheim68/config.h @@ -16,23 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS {E6,B0,B1,B2,B3} -#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3} - -/* COL2ROW, 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/evyd13/solheim68/info.json b/keyboards/evyd13/solheim68/info.json index b2f831c9ee..049a931242 100644 --- a/keyboards/evyd13/solheim68/info.json +++ b/keyboards/evyd13/solheim68/info.json @@ -8,6 +8,11 @@ "pid": "0x7BFF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["E6", "B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/evyd13/solheim68/solheim68.c b/keyboards/evyd13/solheim68/solheim68.c deleted file mode 100644 index 27f90f4e87..0000000000 --- a/keyboards/evyd13/solheim68/solheim68.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Dekkers - * - * 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/>. - */ -#include "solheim68.h" diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h index ef8948786b..77d5e5bd4e 100644 --- a/keyboards/evyd13/ta65/config.h +++ b/keyboards/evyd13/ta65/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B4,D7,D6,D4,B3} -#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0} - -/* 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/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json index da501c6756..694894c511 100644 --- a/keyboards/evyd13/ta65/info.json +++ b/keyboards/evyd13/ta65/info.json @@ -8,6 +8,11 @@ "pid": "0x7465", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"], + "rows": ["B4", "D7", "D6", "D4", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1"} diff --git a/keyboards/evyd13/ta65/ta65.c b/keyboards/evyd13/ta65/ta65.c deleted file mode 100644 index ca9aafb1b7..0000000000 --- a/keyboards/evyd13/ta65/ta65.c +++ /dev/null @@ -1 +0,0 @@ -#include "ta65.h" diff --git a/keyboards/evyd13/wasdat/wasdat.c b/keyboards/evyd13/wasdat/wasdat.c deleted file mode 100644 index 6aaa1b8427..0000000000 --- a/keyboards/evyd13/wasdat/wasdat.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "wasdat.h" diff --git a/keyboards/evyd13/wasdat_code/wasdat_code.c b/keyboards/evyd13/wasdat_code/wasdat_code.c deleted file mode 100644 index c1cdadea9e..0000000000 --- a/keyboards/evyd13/wasdat_code/wasdat_code.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/>. - */ -#include "wasdat_code.h" diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h index 8d41a6a924..2c33be09c6 100644 --- a/keyboards/evyd13/wonderland/config.h +++ b/keyboards/evyd13/wonderland/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS {B0,D1,D2,D3,D5} -#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,E6,C7,C6,B6,B5,B4,D7,D6,D4} - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Backlight configuration */ #define RGB_DI_PIN B7 diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json index 9a84e03c0e..bc7aa9113c 100644 --- a/keyboards/evyd13/wonderland/info.json +++ b/keyboards/evyd13/wonderland/info.json @@ -8,6 +8,11 @@ "pid": "0xA71C", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B0", "esc_output": "F0", diff --git a/keyboards/evyd13/wonderland/wonderland.c b/keyboards/evyd13/wonderland/wonderland.c deleted file mode 100644 index f2a53a17a4..0000000000 --- a/keyboards/evyd13/wonderland/wonderland.c +++ /dev/null @@ -1 +0,0 @@ -#include "wonderland.h" |