summaryrefslogtreecommitdiff
path: root/keyboards/np12
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/np12')
-rw-r--r--keyboards/np12/config.h24
-rw-r--r--keyboards/np12/info.json36
-rw-r--r--keyboards/np12/np12.c17
-rw-r--r--keyboards/np12/np12.h31
4 files changed, 22 insertions, 86 deletions
diff --git a/keyboards/np12/config.h b/keyboards/np12/config.h
deleted file mode 100644
index 3a09f4060d..0000000000
--- a/keyboards/np12/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
- /* Copyright 2021 nut1414
- *
- * 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
-
-#define MATRIX_ROW_PINS { D7, E6, B4, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, F6 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/np12/info.json b/keyboards/np12/info.json
index 7ae6325768..834c51f577 100644
--- a/keyboards/np12/info.json
+++ b/keyboards/np12/info.json
@@ -8,6 +8,11 @@
"pid": "0x4401",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "F6"],
+ "rows": ["D7", "E6", "B4", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5"}
@@ -17,20 +22,23 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [
- { "label": "k34", "x": 3, "y": 0 },
- { "label": "k00", "x": 0, "y": 1 },
- { "label": "k01", "x": 1, "y": 1 },
- { "label": "k02", "x": 2, "y": 1 },
- { "label": "k03", "x": 3, "y": 1 },
- { "label": "k10", "x": 0, "y": 2 },
- { "label": "k11", "x": 1, "y": 2 },
- { "label": "k12", "x": 2, "y": 2 },
- { "label": "k13", "x": 3, "y": 2 },
- { "label": "k20", "x": 0, "y": 3 },
- { "label": "k21", "x": 1, "y": 3 },
- { "label": "k22", "x": 2, "y": 3 },
- { "label": "k23", "x": 3, "y": 3 }
+ "layout": [
+ {"matrix": [3, 4], "x": 3, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3}
]
}
}
diff --git a/keyboards/np12/np12.c b/keyboards/np12/np12.c
deleted file mode 100644
index 062bd9a833..0000000000
--- a/keyboards/np12/np12.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 nut1414
- *
- * 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 "np12.h"
diff --git a/keyboards/np12/np12.h b/keyboards/np12/np12.h
deleted file mode 100644
index ee82786d83..0000000000
--- a/keyboards/np12/np12.h
+++ /dev/null
@@ -1,31 +0,0 @@
- /* Copyright 2021 nut1414
- *
- * 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"
-
-#define LAYOUT( \
- k34, \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23 \
-) { \
- { k00, k01, k02, k03, KC_NO}, \
- { k10, k11, k12, k13, KC_NO}, \
- { k20, k21, k22, k23, KC_NO}, \
- { KC_NO, KC_NO, KC_NO, KC_NO, k34 } \
-}