diff options
Diffstat (limited to 'keyboards/wuque')
24 files changed, 67 insertions, 181 deletions
diff --git a/keyboards/wuque/creek70/creek70.c b/keyboards/wuque/creek70/creek70.c deleted file mode 100644 index f6ea64ee33..0000000000 --- a/keyboards/wuque/creek70/creek70.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 wuque - * - * 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 "creek70.h" diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h index 45f7843698..53b2870640 100644 --- a/keyboards/wuque/ikki68/config.h +++ b/keyboards/wuque/ikki68/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 } -#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6,F7 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json index 4cdf46a99a..fd1cb7f9ba 100644 --- a/keyboards/wuque/ikki68/info.json +++ b/keyboards/wuque/ikki68/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"], + "rows": ["B0", "B1", "B2", "B3", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["68_ansi"], diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h index 85a6ecf974..496e22c07a 100644 --- a/keyboards/wuque/ikki68_aurora/config.h +++ b/keyboards/wuque/ikki68_aurora/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, F0, F1, E6, B5, B4, D7, D6, D4, F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wuque/ikki68_aurora/ikki68_aurora.c b/keyboards/wuque/ikki68_aurora/ikki68_aurora.c deleted file mode 100644 index 8e4e4e5889..0000000000 --- a/keyboards/wuque/ikki68_aurora/ikki68_aurora.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 wuquestudio - * - * 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 "ikki68_aurora.h" diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json index bf47f85a75..d9157dc5d6 100644 --- a/keyboards/wuque/ikki68_aurora/info.json +++ b/keyboards/wuque/ikki68_aurora/info.json @@ -8,6 +8,11 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"], + "rows": ["B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F7", "on_state": 0 diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h index 8d9a74f5aa..c35fac65d6 100644 --- a/keyboards/wuque/mammoth20x/config.h +++ b/keyboards/wuque/mammoth20x/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { D5, F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { B0, B1, E6, F7 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wuque/mammoth20x/info.json b/keyboards/wuque/mammoth20x/info.json index b251951bec..e348f8af5a 100644 --- a/keyboards/wuque/mammoth20x/info.json +++ b/keyboards/wuque/mammoth20x/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "E6", "F7"], + "rows": ["D5", "F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2", "resolution": 2} diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h index 55702e3352..6b0d17be5c 100644 --- a/keyboards/wuque/mammoth75x/config.h +++ b/keyboards/wuque/mammoth75x/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B0, C7, D2, F7, D1, D0 } -#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, E6, F0, F1, F4, F5, F6, C6, B7, B3 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/info.json index b668948f46..bacdeef0e4 100644 --- a/keyboards/wuque/mammoth75x/info.json +++ b/keyboards/wuque/mammoth75x/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "E6", "F0", "F1", "F4", "F5", "F6", "C6", "B7", "B3"], + "rows": ["B0", "C7", "D2", "F7", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1", "resolution": 2} diff --git a/keyboards/wuque/promise87/ansi/ansi.c b/keyboards/wuque/promise87/ansi/ansi.c deleted file mode 100644 index 8e20dfb751..0000000000 --- a/keyboards/wuque/promise87/ansi/ansi.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 wuque - * - * 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 "ansi.h" diff --git a/keyboards/wuque/promise87/ansi/config.h b/keyboards/wuque/promise87/ansi/config.h index e609117661..814dbd2d02 100644 --- a/keyboards/wuque/promise87/ansi/config.h +++ b/keyboards/wuque/promise87/ansi/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 } -#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 1 diff --git a/keyboards/wuque/promise87/ansi/info.json b/keyboards/wuque/promise87/ansi/info.json index cd9b8b4d63..d6cfb88bb2 100644 --- a/keyboards/wuque/promise87/ansi/info.json +++ b/keyboards/wuque/promise87/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], + "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6", "on_state": 0 @@ -115,13 +120,13 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 3 }, - { "label": "Space", "x": 7, "y": 5.25, "w": 1 }, + { "label": "Space", "x": 7, "y": 5.25 }, { "label": "Space", "x": 8, "y": 5.25, "w": 3 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -213,11 +218,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -291,7 +296,7 @@ { "label": "L", "x": 9.75, "y": 3.25 }, { "label": ";", "x": 10.75, "y": 3.25 }, { "label": "'", "x": 11.75, "y": 3.25 }, - { "label": "\\", "x": 12.75, "y": 3.25, "w": 1 }, + { "label": "\\", "x": 12.75, "y": 3.25 }, { "label": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 }, { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 }, @@ -310,11 +315,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -406,13 +411,13 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 3 }, - { "label": "Space", "x": 7, "y": 5.25, "w": 1 }, + { "label": "Space", "x": 7, "y": 5.25 }, { "label": "Space", "x": 8, "y": 5.25, "w": 3 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -505,11 +510,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -602,11 +607,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -699,11 +704,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, @@ -797,11 +802,11 @@ { "label": "\u2191", "x": 16.25, "y": 4.25 }, { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "Win", "x": 1.5, "y": 5.25, "w": 1 }, + { "label": "Win", "x": 1.5, "y": 5.25 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 7 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "Fn", "x": 12.5, "y": 5.25, "w": 1 }, + { "label": "Fn", "x": 12.5, "y": 5.25 }, { "label": "Ctrl", "x": 13.5, "y": 5.25, "w": 1.5 }, { "label": "\u2190", "x": 15.25, "y": 5.25 }, { "label": "\u2193", "x": 16.25, "y": 5.25 }, diff --git a/keyboards/wuque/promise87/wkl/config.h b/keyboards/wuque/promise87/wkl/config.h index e609117661..814dbd2d02 100644 --- a/keyboards/wuque/promise87/wkl/config.h +++ b/keyboards/wuque/promise87/wkl/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 } -#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 1 diff --git a/keyboards/wuque/promise87/wkl/info.json b/keyboards/wuque/promise87/wkl/info.json index 0a0e3b0bc5..1b8876686b 100644 --- a/keyboards/wuque/promise87/wkl/info.json +++ b/keyboards/wuque/promise87/wkl/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], + "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6", "on_state": 0 @@ -114,7 +119,7 @@ { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 3 }, - { "label": "Space", "x": 7, "y": 5.25, "w": 1 }, + { "label": "Space", "x": 7, "y": 5.25 }, { "label": "Space", "x": 8, "y": 5.25, "w": 3 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 }, @@ -284,7 +289,7 @@ { "label": "L", "x": 9.75, "y": 3.25 }, { "label": ";", "x": 10.75, "y": 3.25 }, { "label": "'", "x": 11.75, "y": 3.25 }, - { "label": "\\", "x": 12.75, "y": 3.25, "w": 1 }, + { "label": "\\", "x": 12.75, "y": 3.25 }, { "label": "ISO", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 }, { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 }, @@ -399,7 +404,7 @@ { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, { "label": "Space", "x": 4, "y": 5.25, "w": 3 }, - { "label": "Space", "x": 7, "y": 5.25, "w": 1 }, + { "label": "Space", "x": 7, "y": 5.25 }, { "label": "Space", "x": 8, "y": 5.25, "w": 3 }, { "label": "Alt", "x": 11, "y": 5.25, "w": 1.5 }, { "label": "Menu", "x": 13.5, "y": 5.25, "w": 1.5 }, diff --git a/keyboards/wuque/promise87/wkl/wkl.c b/keyboards/wuque/promise87/wkl/wkl.c deleted file mode 100644 index 6264f7b1d6..0000000000 --- a/keyboards/wuque/promise87/wkl/wkl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 wuque - * - * 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 "wkl.h" diff --git a/keyboards/wuque/serneity65/config.h b/keyboards/wuque/serneity65/config.h index 036181772b..134605fcab 100644 --- a/keyboards/wuque/serneity65/config.h +++ b/keyboards/wuque/serneity65/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B0, F0, B1, D2, D3 } -#define MATRIX_COL_PINS { B6, B5, D5, D4, D6, B4, D7, F1, F4, F5, F6, F7, C7, E6, B7 } - -#define DIODE_DIRECTION COL2ROW - // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 3, 4 } } #define ENCODERS_CCW_KEY { { 5, 4 } } diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json index 744b112f70..4d295b0f75 100644 --- a/keyboards/wuque/serneity65/info.json +++ b/keyboards/wuque/serneity65/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"], + "rows": ["B0", "F0", "B1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3"} diff --git a/keyboards/wuque/tata80/wk/config.h b/keyboards/wuque/tata80/wk/config.h index c4890ec9b1..bbde3a6157 100644 --- a/keyboards/wuque/tata80/wk/config.h +++ b/keyboards/wuque/tata80/wk/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 } - -/* 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/wuque/tata80/wk/info.json b/keyboards/wuque/tata80/wk/info.json index f1b5acf12d..23146206c4 100644 --- a/keyboards/wuque/tata80/wk/info.json +++ b/keyboards/wuque/tata80/wk/info.json @@ -8,6 +8,11 @@ "pid": "0x0168", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "indicators": { diff --git a/keyboards/wuque/tata80/wk/wk.c b/keyboards/wuque/tata80/wk/wk.c deleted file mode 100644 index 1846559718..0000000000 --- a/keyboards/wuque/tata80/wk/wk.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 wuque - * - * 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 "wk.h" diff --git a/keyboards/wuque/tata80/wkl/config.h b/keyboards/wuque/tata80/wkl/config.h index c4890ec9b1..bbde3a6157 100644 --- a/keyboards/wuque/tata80/wkl/config.h +++ b/keyboards/wuque/tata80/wkl/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 } - -/* 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/wuque/tata80/wkl/info.json b/keyboards/wuque/tata80/wkl/info.json index 868448e0f1..166511380c 100644 --- a/keyboards/wuque/tata80/wkl/info.json +++ b/keyboards/wuque/tata80/wkl/info.json @@ -8,6 +8,11 @@ "pid": "0x0169", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "indicators": { diff --git a/keyboards/wuque/tata80/wkl/wkl.c b/keyboards/wuque/tata80/wkl/wkl.c deleted file mode 100644 index 23811762d1..0000000000 --- a/keyboards/wuque/tata80/wkl/wkl.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 wuque - * - * 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 "wkl.h" - |