summaryrefslogtreecommitdiff
path: root/keyboards/handwired/dactyl_manuform/4x5_5
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/dactyl_manuform/4x5_5')
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h29
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/config.h7
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/info.json93
3 files changed, 49 insertions, 80 deletions
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h b/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h
deleted file mode 100644
index d2790473b5..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 Shem Sedrick (@ssedrick)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-#define LAYOUT( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L31, L32, R32, R33, \
- L33, R31, \
- L34, L44, R40, R30, \
- L42, L43, R41, R42 \
-) { \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { XXX, L31, L32, L33, L34 }, \
- { XXX, XXX, L42, L43, L44 }, \
-\
- { R00, R01, R02, R03, R04 }, \
- { R10, R11, R12, R13, R14 }, \
- { R20, R21, R22, R23, R24 }, \
- { R30, R31, R32, R33, XXX }, \
- { R40, R41, R42, XXX, XXX }, \
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/config.h b/keyboards/handwired/dactyl_manuform/4x5_5/config.h
index d0580b7c21..8904c34114 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/config.h
@@ -3,12 +3,5 @@
#pragma once
-
-// Wiring pins
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B4 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define EE_HANDS
#define SPLIT_USB_DETECT
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
index b762c15cf8..00bcdff990 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
@@ -8,6 +8,11 @@
"pid": "0x3435",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "F6"],
+ "rows": ["F7", "B1", "B3", "B2", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
@@ -16,63 +21,63 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"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},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
+ {"matrix": [5, 0], "x": 6, "y": 0},
+ {"matrix": [5, 1], "x": 7, "y": 0},
+ {"matrix": [5, 2], "x": 8, "y": 0},
+ {"matrix": [5, 3], "x": 9, "y": 0},
+ {"matrix": [5, 4], "x": 10, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"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},
- {"x": 6, "y": 1},
- {"x": 7, "y": 1},
- {"x": 8, "y": 1},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
+ {"matrix": [6, 0], "x": 6, "y": 1},
+ {"matrix": [6, 1], "x": 7, "y": 1},
+ {"matrix": [6, 2], "x": 8, "y": 1},
+ {"matrix": [6, 3], "x": 9, "y": 1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"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},
- {"x": 6, "y": 2},
- {"x": 7, "y": 2},
- {"x": 8, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
+ {"matrix": [7, 0], "x": 6, "y": 2},
+ {"matrix": [7, 1], "x": 7, "y": 2},
+ {"matrix": [7, 2], "x": 8, "y": 2},
+ {"matrix": [7, 3], "x": 9, "y": 2},
+ {"matrix": [7, 4], "x": 10, "y": 2},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
- {"x": 8, "y": 3},
- {"x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 8, "y": 3},
+ {"matrix": [8, 3], "x": 9, "y": 3},
- {"x": 3, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
- {"x": 7, "y": 4},
+ {"matrix": [8, 1], "x": 7, "y": 4},
- {"x": 3, "y": 5},
- {"x": 4, "y": 5},
+ {"matrix": [3, 4], "x": 3, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5},
- {"x": 6, "y": 5},
- {"x": 7, "y": 5},
+ {"matrix": [9, 0], "x": 6, "y": 5},
+ {"matrix": [8, 0], "x": 7, "y": 5},
- {"x": 3, "y": 6},
- {"x": 4, "y": 6},
+ {"matrix": [4, 2], "x": 3, "y": 6},
+ {"matrix": [4, 3], "x": 4, "y": 6},
- {"x": 6, "y": 6},
- {"x": 7, "y": 6}
+ {"matrix": [9, 1], "x": 6, "y": 6},
+ {"matrix": [9, 2], "x": 7, "y": 6}
]
}
}