summaryrefslogtreecommitdiff
path: root/keyboards/weirdo/naiping
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/weirdo/naiping')
-rw-r--r--keyboards/weirdo/naiping/np64/config.h4
-rw-r--r--keyboards/weirdo/naiping/np64/info.json5
-rw-r--r--keyboards/weirdo/naiping/np64/np64.c16
-rw-r--r--keyboards/weirdo/naiping/nphhkb/config.h4
-rw-r--r--keyboards/weirdo/naiping/nphhkb/info.json5
-rw-r--r--keyboards/weirdo/naiping/nphhkb/nphhkb.c16
-rw-r--r--keyboards/weirdo/naiping/npminila/config.h4
-rw-r--r--keyboards/weirdo/naiping/npminila/info.json5
-rw-r--r--keyboards/weirdo/naiping/npminila/npminila.c16
9 files changed, 15 insertions, 60 deletions
diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h
index 8fa16298e2..2b4073cbd6 100644
--- a/keyboards/weirdo/naiping/np64/config.h
+++ b/keyboards/weirdo/naiping/np64/config.h
@@ -15,10 +15,6 @@
*/
#pragma once
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-#define DIODE_DIRECTION ROW2COL
-
#define RGB_DI_PIN B1
#define RGBLED_NUM 80
//#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json
index c188d4bb11..0c1bf74f3c 100644
--- a/keyboards/weirdo/naiping/np64/info.json
+++ b/keyboards/weirdo/naiping/np64/info.json
@@ -8,6 +8,11 @@
"pid": "0x7064",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+ "rows": ["E6", "B7", "F7", "F4", "F5"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/np64/np64.c b/keyboards/weirdo/naiping/np64/np64.c
deleted file mode 100644
index ee4c08cd34..0000000000
--- a/keyboards/weirdo/naiping/np64/np64.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 Weirdo
- *
- * 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 "np64.h"
diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h
index 43b8d1c32e..683ba29edc 100644
--- a/keyboards/weirdo/naiping/nphhkb/config.h
+++ b/keyboards/weirdo/naiping/nphhkb/config.h
@@ -15,10 +15,6 @@
*/
#pragma once
-#define MATRIX_COL_PINS { A4, C15, C14, A5, A6, A15, B1, B10, B12, B13, B14, B15, B6, A8, B5}
-#define MATRIX_ROW_PINS { B7, B8, B9, C13, B4}
-#define DIODE_DIRECTION ROW2COL
-
#define RGB_DI_PIN A7
#define RGBLED_NUM 78
//#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json
index b1b1c1f23d..c0df6fb453 100644
--- a/keyboards/weirdo/naiping/nphhkb/info.json
+++ b/keyboards/weirdo/naiping/nphhkb/info.json
@@ -8,6 +8,11 @@
"pid": "0x7068",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A4", "C15", "C14", "A5", "A6", "A15", "B1", "B10", "B12", "B13", "B14", "B15", "B6", "A8", "B5"],
+ "rows": ["B7", "B8", "B9", "C13", "B4"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/nphhkb/nphhkb.c b/keyboards/weirdo/naiping/nphhkb/nphhkb.c
deleted file mode 100644
index 881522c0b3..0000000000
--- a/keyboards/weirdo/naiping/nphhkb/nphhkb.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 Weirdo
- *
- * 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 "nphhkb.h"
diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h
index 265ae2e207..fd2dcbdde1 100644
--- a/keyboards/weirdo/naiping/npminila/config.h
+++ b/keyboards/weirdo/naiping/npminila/config.h
@@ -15,10 +15,6 @@
*/
#pragma once
-#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
-#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define DIODE_DIRECTION ROW2COL
-
#define RGB_DI_PIN D1
#define RGBLED_NUM 82
//#define RGBLIGHT_DISABLE_KEYCODES
diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json
index 9904ca28fc..7c489e378c 100644
--- a/keyboards/weirdo/naiping/npminila/info.json
+++ b/keyboards/weirdo/naiping/npminila/info.json
@@ -8,6 +8,11 @@
"pid": "0x706D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+ "rows": ["E6", "B7", "F7", "F4", "F5"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
diff --git a/keyboards/weirdo/naiping/npminila/npminila.c b/keyboards/weirdo/naiping/npminila/npminila.c
deleted file mode 100644
index ab9ebb45d7..0000000000
--- a/keyboards/weirdo/naiping/npminila/npminila.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 Weirdo
- *
- * 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 "npminila.h"