diff options
Diffstat (limited to 'keyboards/kin80')
-rw-r--r-- | keyboards/kin80/blackpill103/blackpill103.c | 2 | ||||
-rw-r--r-- | keyboards/kin80/blackpill103/blackpill103.h | 19 | ||||
-rw-r--r-- | keyboards/kin80/blackpill103/config.h | 9 | ||||
-rw-r--r-- | keyboards/kin80/blackpill103/info.json | 5 | ||||
-rw-r--r-- | keyboards/kin80/blackpill401/blackpill401.c | 2 | ||||
-rw-r--r-- | keyboards/kin80/blackpill401/blackpill401.h | 19 | ||||
-rw-r--r-- | keyboards/kin80/blackpill401/config.h | 6 | ||||
-rw-r--r-- | keyboards/kin80/blackpill401/info.json | 5 | ||||
-rw-r--r-- | keyboards/kin80/blackpill411/blackpill411.c | 2 | ||||
-rw-r--r-- | keyboards/kin80/blackpill411/blackpill411.h | 19 | ||||
-rw-r--r-- | keyboards/kin80/blackpill411/config.h | 6 | ||||
-rw-r--r-- | keyboards/kin80/blackpill411/info.json | 5 | ||||
-rw-r--r-- | keyboards/kin80/info.json | 1 | ||||
-rw-r--r-- | keyboards/kin80/kin80.c | 17 | ||||
-rw-r--r-- | keyboards/kin80/micro/config.h | 3 | ||||
-rw-r--r-- | keyboards/kin80/micro/info.json | 5 | ||||
-rw-r--r-- | keyboards/kin80/micro/micro.c | 2 | ||||
-rw-r--r-- | keyboards/kin80/micro/micro.h | 20 |
18 files changed, 24 insertions, 123 deletions
diff --git a/keyboards/kin80/blackpill103/blackpill103.c b/keyboards/kin80/blackpill103/blackpill103.c index c8fd4e5822..e06ad44748 100644 --- a/keyboards/kin80/blackpill103/blackpill103.c +++ b/keyboards/kin80/blackpill103/blackpill103.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "blackpill103.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/kin80/blackpill103/blackpill103.h b/keyboards/kin80/blackpill103/blackpill103.h deleted file mode 100644 index 06cc42ba83..0000000000 --- a/keyboards/kin80/blackpill103/blackpill103.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 DmNosachev - * - * 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 "kin80.h" diff --git a/keyboards/kin80/blackpill103/config.h b/keyboards/kin80/blackpill103/config.h index 4dd744162d..80b10df085 100644 --- a/keyboards/kin80/blackpill103/config.h +++ b/keyboards/kin80/blackpill103/config.h @@ -17,13 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -//v.1.0 -//#define MATRIX_ROW_PINS { B8, B9, C13, B7, B6, B4, B3 } -//v.1.1 -#define MATRIX_ROW_PINS { B8, B9, C13, B7, B6, B5, B4 } -#define MATRIX_COL_PINS { A6, A7, B0, B1, B10, B11, A0, A1, A2, A3, A4, A5 } - #define LED4_PIN A8 diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/info.json index c1df5ed549..79dd6fa7f6 100644 --- a/keyboards/kin80/blackpill103/info.json +++ b/keyboards/kin80/blackpill103/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B1", "B10", "B11", "A0", "A1", "A2", "A3", "A4", "A5"], + "rows": ["B8", "B9", "C13", "B7", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B13", "num_lock": "B14", diff --git a/keyboards/kin80/blackpill401/blackpill401.c b/keyboards/kin80/blackpill401/blackpill401.c index 26f32d85e0..e06ad44748 100644 --- a/keyboards/kin80/blackpill401/blackpill401.c +++ b/keyboards/kin80/blackpill401/blackpill401.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "blackpill401.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/kin80/blackpill401/blackpill401.h b/keyboards/kin80/blackpill401/blackpill401.h deleted file mode 100644 index 06cc42ba83..0000000000 --- a/keyboards/kin80/blackpill401/blackpill401.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 DmNosachev - * - * 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 "kin80.h" diff --git a/keyboards/kin80/blackpill401/config.h b/keyboards/kin80/blackpill401/config.h index f1b9307f24..efacfc10d4 100644 --- a/keyboards/kin80/blackpill401/config.h +++ b/keyboards/kin80/blackpill401/config.h @@ -17,10 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 } - #define LED4_PIN A15 diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/info.json index 8098ac1a2f..7591d3f39c 100644 --- a/keyboards/kin80/blackpill401/info.json +++ b/keyboards/kin80/blackpill401/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"], + "rows": ["A4", "B12", "B13", "B14", "B15", "A8", "B5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C13", "num_lock": "B4", diff --git a/keyboards/kin80/blackpill411/blackpill411.c b/keyboards/kin80/blackpill411/blackpill411.c index 1b68dfc2d3..012a434e41 100644 --- a/keyboards/kin80/blackpill411/blackpill411.c +++ b/keyboards/kin80/blackpill411/blackpill411.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "blackpill411.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/kin80/blackpill411/blackpill411.h b/keyboards/kin80/blackpill411/blackpill411.h deleted file mode 100644 index 06cc42ba83..0000000000 --- a/keyboards/kin80/blackpill411/blackpill411.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 DmNosachev - * - * 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 "kin80.h" diff --git a/keyboards/kin80/blackpill411/config.h b/keyboards/kin80/blackpill411/config.h index f1b9307f24..efacfc10d4 100644 --- a/keyboards/kin80/blackpill411/config.h +++ b/keyboards/kin80/blackpill411/config.h @@ -17,10 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS - -#define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A8, B5 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A5, A6, A7, B0, B1, B10 } - #define LED4_PIN A15 diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/info.json index 3ad449e464..a1486351ed 100644 --- a/keyboards/kin80/blackpill411/info.json +++ b/keyboards/kin80/blackpill411/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"], + "rows": ["A4", "B12", "B13", "B14", "B15", "A8", "B5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C13", "num_lock": "B4", diff --git a/keyboards/kin80/info.json b/keyboards/kin80/info.json index a8d846340e..86a805519e 100644 --- a/keyboards/kin80/info.json +++ b/keyboards/kin80/info.json @@ -7,7 +7,6 @@ "pid": "0x4B4E" }, "manufacturer": "Quartz64", - "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kin80/kin80.c b/keyboards/kin80/kin80.c deleted file mode 100644 index 89b46c340e..0000000000 --- a/keyboards/kin80/kin80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 DmNosachev - * - * 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 "kin80.h" diff --git a/keyboards/kin80/micro/config.h b/keyboards/kin80/micro/config.h index c55fffe1e0..7d514bd3c3 100644 --- a/keyboards/kin80/micro/config.h +++ b/keyboards/kin80/micro/config.h @@ -17,7 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_ROW_PINS { B6, B3, B1, D6, B7, B5, D1 } -#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0, F7, F6, F5, F4, F1, F0 } - #define LED4_PIN B2 diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/info.json index 173b5eff4d..1f711fa8cb 100644 --- a/keyboards/kin80/micro/info.json +++ b/keyboards/kin80/micro/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "E6", "D7", "C6", "D4", "D0", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B6", "B3", "B1", "D6", "B7", "B5", "D1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "num_lock": "D2", diff --git a/keyboards/kin80/micro/micro.c b/keyboards/kin80/micro/micro.c index 264d1a8577..e06ad44748 100644 --- a/keyboards/kin80/micro/micro.c +++ b/keyboards/kin80/micro/micro.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "micro.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/kin80/micro/micro.h b/keyboards/kin80/micro/micro.h deleted file mode 100644 index 6efe88e663..0000000000 --- a/keyboards/kin80/micro/micro.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 DmNosachev - * - * 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 "kin80.h" - |