diff options
Diffstat (limited to 'keyboards/mode')
29 files changed, 49 insertions, 199 deletions
diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index da995299e4..52f0c6784d 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B10, B12, C8 , C4 , C5 , B0 , C10, B13, B14, B15, A15, C6 , C7 , A8 , C9} -#define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } -#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/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json index 4d27f46223..33e953ba25 100644 --- a/keyboards/mode/m65ha_alpha/info.json +++ b/keyboards/mode/m65ha_alpha/info.json @@ -8,6 +8,11 @@ "pid": "0x6566", "device_version": "0.6.5" }, + "matrix_pins": { + "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], + "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A6" }, diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index 62faefd168..52f0c6784d 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B10, B12, C8 , C4 , C5 , B0 , C10, B13, B14, B15, A15, C6 , C7 , A8 , C9 } -#define MATRIX_ROW_PINS { A7 , A10, D2 , C12, B1 , C11 } -#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/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json index c6ea41bee0..ea042a2df6 100644 --- a/keyboards/mode/m65hi_alpha/info.json +++ b/keyboards/mode/m65hi_alpha/info.json @@ -8,6 +8,11 @@ "pid": "0x6574", "device_version": "0.6.5" }, + "matrix_pins": { + "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], + "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A6" }, diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index 173c679f1f..ed3faacae0 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { C7 , A8 , A10, A4 , A5 , A6 , C10, A7, C4 , C5 , A15, B0 , B1 , B12, B10, B13 } -#define MATRIX_ROW_PINS { A3 , B14, B15, C9 , C6 , C11 } -#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/mode/m65s/info.json b/keyboards/mode/m65s/info.json index 53c7ccace4..c744b3512d 100644 --- a/keyboards/mode/m65s/info.json +++ b/keyboards/mode/m65s/info.json @@ -8,6 +8,11 @@ "pid": "0x6583", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "A8", "A10", "A4", "A5", "A6", "C10", "A7", "C4", "C5", "A15", "B0", "B1", "B12", "B10", "B13"], + "rows": ["A3", "B14", "B15", "C9", "C6", "C11"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C8" }, diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h index 2b0b122a6b..640cc43a5a 100644 --- a/keyboards/mode/m75h/config.h +++ b/keyboards/mode/m75h/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - //C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15 -#define MATRIX_COL_PINS { C8, C7, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3, B4, B5, B8, B9 } - //R0, R1, R2, R3, R4, R5 , R6 -#define MATRIX_ROW_PINS { C5, B0, B14, B15, A8 , C9 , A15} -#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/mode/m75h/info.json b/keyboards/mode/m75h/info.json index f7d265707e..e481cc09e7 100644 --- a/keyboards/mode/m75h/info.json +++ b/keyboards/mode/m75h/info.json @@ -8,6 +8,11 @@ "pid": "0x7572", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C8", "C7", "A10", "B13", "B12", "B10", "B1", "C10", "C11", "D2", "C12", "B3", "B4", "B5", "B8", "B9"], + "rows": ["C5", "B0", "B14", "B15", "A8", "C9", "A15"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index 6c90b66be5..b8307f4396 100644 --- a/keyboards/mode/m75s/config.h +++ b/keyboards/mode/m75s/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - // C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15 -#define MATRIX_COL_PINS { C8, A8, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3, B4, B5, B8, B9 } - // R0, R1, R2, R3, R4, R5 , R6 -#define MATRIX_ROW_PINS { C5, B0, B14, B15, C7 , C9 , A15} -#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/mode/m75s/info.json b/keyboards/mode/m75s/info.json index f046a8dffd..a3f2fd77ec 100644 --- a/keyboards/mode/m75s/info.json +++ b/keyboards/mode/m75s/info.json @@ -8,6 +8,11 @@ "pid": "0x7583", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C8", "A8", "A10", "B13", "B12", "B10", "B1", "C10", "C11", "D2", "C12", "B3", "B4", "B5", "B8", "B9"], + "rows": ["C5", "B0", "B14", "B15", "C7", "C9", "A15"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 20, diff --git a/keyboards/mode/m75s/m75s.c b/keyboards/mode/m75s/m75s.c deleted file mode 100644 index 87e643653c..0000000000 --- a/keyboards/mode/m75s/m75s.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - Copyright 2022 Gondolindrim <gondolindrim@acheronproject.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/>. -*/ - -#include "m75s.h" diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index 6b59fc9872..72ad307905 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/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 { A10, A15, B3, B9, A3, A4 } -#define MATRIX_COL_PINS { B8, B7, B6, B5, B4, A2, A1, A0, F1, F0, C15, C14, C13, A7, A6, A5 } - -/* 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/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json index e7558244ce..05fa106877 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/info.json @@ -8,6 +8,11 @@ "pid": "0x0081", "device_version": "0.7.2" }, + "matrix_pins": { + "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], + "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "community_layouts": [ "tkl_ansi" ], diff --git a/keyboards/mode/m80v1/m80h/m80h.c b/keyboards/mode/m80v1/m80h/m80h.c deleted file mode 100644 index 6213a91363..0000000000 --- a/keyboards/mode/m80v1/m80h/m80h.c +++ /dev/null @@ -1,14 +0,0 @@ - /* Copyright 2020 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.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. - */ - -#include "m80h.h" diff --git a/keyboards/mode/m80v1/m80h/m80h.h b/keyboards/mode/m80v1/m80h/m80h.h index 49f115fdc6..87867de6b4 100644 --- a/keyboards/mode/m80v1/m80h/m80h.h +++ b/keyboards/mode/m80v1/m80h/m80h.h @@ -13,7 +13,7 @@ #pragma once -#include "m80v1.h" +#include "quantum.h" #define LAYOUT_tkl_ansi( \ K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K415, K114, K115, K116, \ diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json index a94585c926..48f5444fc2 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/info.json @@ -8,6 +8,11 @@ "pid": "0x0080", "device_version": "0.8.3" }, + "matrix_pins": { + "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], + "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/mode/m80v1/m80s/m80s.c b/keyboards/mode/m80v1/m80s/m80s.c deleted file mode 100644 index 1f532d0ce4..0000000000 --- a/keyboards/mode/m80v1/m80s/m80s.c +++ /dev/null @@ -1,14 +0,0 @@ - /* Copyright 2020 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.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. - */ - -#include "m80s.h" diff --git a/keyboards/mode/m80v1/m80s/m80s.h b/keyboards/mode/m80v1/m80s/m80s.h index b5d1e4dd06..e1a5f990ba 100644 --- a/keyboards/mode/m80v1/m80s/m80s.h +++ b/keyboards/mode/m80v1/m80s/m80s.h @@ -13,7 +13,7 @@ #pragma once -#include "m80v1.h" +#include "quantum.h" #define LAYOUT_eighty_m80s( \ K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K415, K114, K115, K116, \ diff --git a/keyboards/mode/m80v1/m80v1.c b/keyboards/mode/m80v1/m80v1.c deleted file mode 100644 index 225ed9cc8d..0000000000 --- a/keyboards/mode/m80v1/m80v1.c +++ /dev/null @@ -1,14 +0,0 @@ - /* Copyright 2020 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.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. - */ - -#include "m80v1.h" diff --git a/keyboards/mode/m80v1/m80v1.h b/keyboards/mode/m80v1/m80v1.h deleted file mode 100644 index 704ea28439..0000000000 --- a/keyboards/mode/m80v1/m80v1.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_mode_m80v1_m80h) - #include "m80h.h" -#elif defined(KEYBOARD_mode_m80v1_m80s) - #include "m80s.h" -#endif // Mode80 solderable "S" and hotswap "H" revisions diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index dcfd8d1614..d553d5d894 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { B12, B13, B14, B3, B4, B9 } -#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B10, A8, A10, B15, A15, B5, B8, C13 } - -#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/mode/m80v2/m80v2.c b/keyboards/mode/m80v2/m80v2.c deleted file mode 100644 index faad98b7a7..0000000000 --- a/keyboards/mode/m80v2/m80v2.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br> - -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 "m80v2.h" diff --git a/keyboards/mode/m80v2/m80v2.h b/keyboards/mode/m80v2/m80v2.h deleted file mode 100644 index c00f148e62..0000000000 --- a/keyboards/mode/m80v2/m80v2.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br> - -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 "quantum.h" - -#if defined(KEYBOARD_mode_m80v2_m80v2h) - #include "m80v2h.h" -#elif defined(KEYBOARD_mode_m80v2_m80v2s) - #include "m80v2s.h" -#endif diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index 51788340ca..3c948f5eb4 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -8,6 +8,11 @@ "pid": "0x0083", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], + "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A0", "on_state": 0 diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.c b/keyboards/mode/m80v2/m80v2h/m80v2h.c deleted file mode 100644 index 0d4e533c30..0000000000 --- a/keyboards/mode/m80v2/m80v2h/m80v2h.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br> - -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 "m80v2h.h" diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.h b/keyboards/mode/m80v2/m80v2h/m80v2h.h index 28d1d2784c..cacf25b114 100644 --- a/keyboards/mode/m80v2/m80v2h/m80v2h.h +++ b/keyboards/mode/m80v2/m80v2h/m80v2h.h @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "m80v2.h" +#include "quantum.h" #define ___ KC_NO diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index d7f5dd663b..5793fa00a7 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -8,6 +8,11 @@ "pid": "0x0082", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], + "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A0", "on_state": 0 diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.c b/keyboards/mode/m80v2/m80v2s/m80v2s.c deleted file mode 100644 index 7be89b1288..0000000000 --- a/keyboards/mode/m80v2/m80v2s/m80v2s.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br> - -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 "m80v2s.h" diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.h b/keyboards/mode/m80v2/m80v2s/m80v2s.h index 440b54583a..88f38d8b05 100644 --- a/keyboards/mode/m80v2/m80v2s/m80v2s.h +++ b/keyboards/mode/m80v2/m80v2s/m80v2s.h @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "m80v2.h" +#include "quantum.h" #define ___ KC_NO |