summaryrefslogtreecommitdiff
path: root/keyboards/dumbpad/v1x_dualencoder
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dumbpad/v1x_dualencoder')
-rw-r--r--keyboards/dumbpad/v1x_dualencoder/config.h5
-rw-r--r--keyboards/dumbpad/v1x_dualencoder/info.json29
-rw-r--r--keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c2
-rw-r--r--keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h30
4 files changed, 26 insertions, 40 deletions
diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h
index dce94fd8d4..8ce24667ae 100644
--- a/keyboards/dumbpad/v1x_dualencoder/config.h
+++ b/keyboards/dumbpad/v1x_dualencoder/config.h
@@ -16,11 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-/* Column/Row IO definitions */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
/* Onboard LEDs */
#define LED_00 B6
#define LED_01 B1
diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json
index e51452897a..ad16fa4417 100644
--- a/keyboards/dumbpad/v1x_dualencoder/info.json
+++ b/keyboards/dumbpad/v1x_dualencoder/info.json
@@ -2,6 +2,11 @@
"usb": {
"device_version": "0.1.0"
},
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B2", "pin_b": "D4"},
@@ -16,10 +21,26 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
- {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
- {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
- {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3}
]
}
}
diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
index 33a8679985..f1b1d66c7f 100644
--- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
+++ b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
@@ -13,7 +13,7 @@
* 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 "v1x_dualencoder.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Set LED IO as outputs
diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h
deleted file mode 100644
index b8bb84fe5f..0000000000
--- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 imchipwood
- *
- * 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( \
- k01, k02, k03, k04, \
- k11, k12, k13, k14, \
- k21, k22, k23, k24, \
- k30, k31, k32, k33, k34 \
-) \
-{ \
- { KC_NO, k01, k02, k03, k04 }, \
- { KC_NO, k11, k12, k13, k14 }, \
- { KC_NO, k21, k22, k23, k24 }, \
- { k30, k31, k32, k33, k34 }, \
-}