diff options
Diffstat (limited to 'keyboards/keychron/q4')
-rw-r--r-- | keyboards/keychron/q4/ansi_v1/ansi_v1.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/q4/ansi_v1/ansi_v1.h | 19 | ||||
-rw-r--r-- | keyboards/keychron/q4/ansi_v1/info.json | 5 | ||||
-rw-r--r-- | keyboards/keychron/q4/ansi_v2/ansi_v2.h | 19 | ||||
-rw-r--r-- | keyboards/keychron/q4/ansi_v2/info.json | 5 | ||||
-rw-r--r-- | keyboards/keychron/q4/config.h | 7 | ||||
-rw-r--r-- | keyboards/keychron/q4/iso/info.json | 5 | ||||
-rw-r--r-- | keyboards/keychron/q4/iso/iso.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/q4/iso/iso.h | 19 | ||||
-rw-r--r-- | keyboards/keychron/q4/q4.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/q4/q4.h | 27 |
11 files changed, 18 insertions, 94 deletions
diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.c b/keyboards/keychron/q4/ansi_v1/ansi_v1.c index e651744262..88599103ef 100644 --- a/keyboards/keychron/q4/ansi_v1/ansi_v1.c +++ b/keyboards/keychron/q4/ansi_v1/ansi_v1.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi_v1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.h b/keyboards/keychron/q4/ansi_v1/ansi_v1.h deleted file mode 100644 index 381c674dad..0000000000 --- a/keyboards/keychron/q4/ansi_v1/ansi_v1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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 "quantum.h"
\ No newline at end of file diff --git a/keyboards/keychron/q4/ansi_v1/info.json b/keyboards/keychron/q4/ansi_v1/info.json index f24a4acba5..cb0fc55e3f 100644 --- a/keyboards/keychron/q4/ansi_v1/info.json +++ b/keyboards/keychron/q4/ansi_v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0140", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/keychron/q4/ansi_v2/ansi_v2.h b/keyboards/keychron/q4/ansi_v2/ansi_v2.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q4/ansi_v2/ansi_v2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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 "quantum.h" diff --git a/keyboards/keychron/q4/ansi_v2/info.json b/keyboards/keychron/q4/ansi_v2/info.json index f24a4acba5..cb0fc55e3f 100644 --- a/keyboards/keychron/q4/ansi_v2/info.json +++ b/keyboards/keychron/q4/ansi_v2/info.json @@ -8,6 +8,11 @@ "pid": "0x0140", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/keychron/q4/config.h b/keyboards/keychron/q4/config.h index 08549247f3..940ee44e77 100644 --- a/keyboards/keychron/q4/config.h +++ b/keyboards/keychron/q4/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* DIP switch */ #define DIP_SWITCH_MATRIX_GRID { {4,4} } diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/info.json index 9c65fa29d1..908c5bdae1 100644 --- a/keyboards/keychron/q4/iso/info.json +++ b/keyboards/keychron/q4/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x0142", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/keychron/q4/iso/iso.c b/keyboards/keychron/q4/iso/iso.c index c1d1982b94..24cbcfd745 100644 --- a/keyboards/keychron/q4/iso/iso.c +++ b/keyboards/keychron/q4/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q4/iso/iso.h b/keyboards/keychron/q4/iso/iso.h deleted file mode 100644 index 381c674dad..0000000000 --- a/keyboards/keychron/q4/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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 "quantum.h"
\ No newline at end of file diff --git a/keyboards/keychron/q4/q4.c b/keyboards/keychron/q4/q4.c index 6d31e45607..c3cb67bcc2 100644 --- a/keyboards/keychron/q4/q4.c +++ b/keyboards/keychron/q4/q4.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q4.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b11111111111111, diff --git a/keyboards/keychron/q4/q4.h b/keyboards/keychron/q4/q4.h deleted file mode 100644 index 34aa4a8505..0000000000 --- a/keyboards/keychron/q4/q4.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.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 "quantum.h" - -#if defined(KEYBOARD_keychron_q4_ansi_v1) -# include "ansi_v1.h" -#elif defined(KEYBOARD_keychron_q4_ansi_v2) -# include "ansi_v2.h" -#elif defined(KEYBOARD_keychron_q4_iso) -# include "iso.h" -#endif |