summaryrefslogtreecommitdiff
path: root/keyboards/handwired/dactyl_manuform/dmote
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/dactyl_manuform/dmote')
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/62key.c1
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/62key.h44
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/config.h35
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/info.json134
4 files changed, 72 insertions, 142 deletions
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c
deleted file mode 100644
index 8d0d95e166..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "62key.h"
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
deleted file mode 100644
index 673164b424..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This uses the same coordinate system as the program that defines
-// the case model, but not the same coordinates.
-// Numbers increase going to the right and away from the user on the
-// right-hand side of the keyboard. This is mirrored for the
-// left-hand side.
-// The matrix is constructed for ease of soldering, with the columns
-// of the thumb cluster extending along the sides of the finger
-// cluster so that everything can be contained in a 6x6 pattern.
-
-#define LAYOUT_62key( \
- LA_20, LA_10, LF_35, LF_25, LF_15, LF_05, \
- LF_55, LF_45, LF_34, LF_24, LF_14, LF_04, \
- LF_54, LF_44, LF_33, LF_23, LF_13, LF_03, \
- LF_53, LF_43, LF_32, LF_22, LF_12, \
- LF_21, LT_21, LT_22, \
- LT_10, LT_11, LT_12, \
- LT_01, LT_02, \
-\
- RF_05, RF_15, RF_25, RF_35, RA_10, RA_20, \
- RF_04, RF_14, RF_24, RF_34, RF_45, RF_55, \
- RF_03, RF_13, RF_23, RF_33, RF_44, RF_54, \
- RF_12, RF_22, RF_32, RF_43, RF_53, \
- RT_22, RT_21, RF_21, \
- RT_12, RT_11, RT_10, \
- RT_02, RT_01 \
-) { \
- { LA_20, LA_10, LF_35, LF_25, LF_15, LF_05 }, \
- { LF_55, LF_45, LF_34, LF_24, LF_14, LF_04 }, \
- { LF_54, LF_44, LF_33, LF_23, LF_13, LF_03 }, \
- { LF_53, LF_43, LF_32, LF_22, LF_12, LT_22 }, \
- { KC_NO, KC_NO, LT_21, LF_21, LT_11, LT_12 }, \
- { KC_NO, KC_NO, LT_10, KC_NO, LT_01, LT_02 }, \
-\
- { RA_20, RA_10, RF_35, RF_25, RF_15, RF_05 }, \
- { RF_55, RF_45, RF_34, RF_24, RF_14, RF_04 }, \
- { RF_54, RF_44, RF_33, RF_23, RF_13, RF_03 }, \
- { RF_53, RF_43, RF_32, RF_22, RF_12, RT_22 }, \
- { KC_NO, KC_NO, RT_21, RF_21, RT_11, RT_12 }, \
- { KC_NO, KC_NO, RT_10, KC_NO, RT_01, RT_02 } \
-}
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
index dd38c6af7d..41af664c25 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -1,44 +1,9 @@
#pragma once
-
-// MCUs are flipped on each side, relative to the shape of the case,
-// but for ease of mounting, the pinout is not flipped with the controller.
-// The same finger on each hand uses a column connected to the pin with the
-// same silk-screen label on each Pro Micro.
-
-// Pin use:
-//
-// MCU | Silk | DMOTE
-// -----+------+----------
-// D3 | TX0 |
-// D2 | RX1 |
-// D1 | 2 | LED strip input (dominant half only)
-// D0 | 3 | Serial interface between halves
-// D4 | 4 | Outermost pinky-finger column
-// C6 | 5 | Column
-// D7 | 6 | Column
-// E6 | 7 | Column
-// B4 | 8 | Column
-// B5 | 9 | Outermost index-finger column
-// -----+------+----------
-// F4 | A3 |
-// F5 | A2 |
-// F6 | A1 | Top row (furthest from user)
-// F7 | A0 | Row
-// B1 | 15 | Row
-// B3 | 14 | Row
-// B2 | 16 | Row
-// B6 | 10 | Bottom row (closest to user)
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
// WS2812 RGB LED, normally used to indicate keyboard state:
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGB_DI_PIN D1
#define RGBLED_NUM 6 // Used when chaining strips
#define RGBLED_SPLIT { 3, 3 } // Used when not chaining strips
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index d26f06c45b..c2a818bde2 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -10,6 +10,14 @@
"pid": "0x3632",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D1"
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"enabled": true,
"soft_serial_pin": "D0"
@@ -17,81 +25,83 @@
"layouts": {
"LAYOUT_62key": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "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},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"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},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"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},
+ {"matrix": [2, 5], "x": 5, "y": 2},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
+ {"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},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
+ {"matrix": [4, 3], "x": 3, "y": 4},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2, "y": 3},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3},
+ {"matrix": [4, 2], "x": 4.5, "y": 4.5},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.5},
- {"x": 3, "y": 4},
- {"x": 4.5, "y": 4.5},
- {"x": 5.5, "y": 4.5},
+ {"matrix": [5, 2], "x": 4, "y": 5.5},
+ {"matrix": [4, 4], "x": 5, "y": 5.5},
+ {"matrix": [4, 5], "x": 6, "y": 5.5},
- {"x": 4, "y": 5.5},
- {"x": 5, "y": 5.5},
- {"x": 6, "y": 5.5},
+ {"matrix": [5, 4], "x": 4.5, "y": 6.5},
+ {"matrix": [5, 5], "x": 5.5, "y": 6.5},
- {"x": 4.5, "y": 6.5},
- {"x": 5.5, "y": 6.5},
+ {"matrix": [6, 5], "x": 9, "y": 0},
+ {"matrix": [6, 4], "x": 10, "y": 0},
+ {"matrix": [6, 3], "x": 11, "y": 0},
+ {"matrix": [6, 2], "x": 12, "y": 0},
+ {"matrix": [6, 1], "x": 13, "y": 0},
+ {"matrix": [6, 0], "x": 14, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0},
- {"x": 13, "y": 0},
- {"x": 14, "y": 0},
+ {"matrix": [7, 5], "x": 9, "y": 1},
+ {"matrix": [7, 4], "x": 10, "y": 1},
+ {"matrix": [7, 3], "x": 11, "y": 1},
+ {"matrix": [7, 2], "x": 12, "y": 1},
+ {"matrix": [7, 1], "x": 13, "y": 1},
+ {"matrix": [7, 0], "x": 14, "y": 1},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
+ {"matrix": [8, 5], "x": 9, "y": 2},
+ {"matrix": [8, 4], "x": 10, "y": 2},
+ {"matrix": [8, 3], "x": 11, "y": 2},
+ {"matrix": [8, 2], "x": 12, "y": 2},
+ {"matrix": [8, 1], "x": 13, "y": 2},
+ {"matrix": [8, 0], "x": 14, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
+ {"matrix": [9, 4], "x": 10, "y": 3},
+ {"matrix": [9, 3], "x": 11, "y": 3},
+ {"matrix": [9, 2], "x": 12, "y": 3},
+ {"matrix": [9, 1], "x": 13, "y": 3},
+ {"matrix": [9, 0], "x": 14, "y": 3},
- {"x": 10, "y": 3},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
+ {"matrix": [9, 5], "x": 8.5, "y": 4.5},
+ {"matrix": [10, 2], "x": 9.5, "y": 4.5},
- {"x": 8.5, "y": 4.5},
- {"x": 9.5, "y": 4.5},
- {"x": 11, "y": 4},
+ {"matrix": [10, 3], "x": 11, "y": 4},
- {"x": 8, "y": 5.5},
- {"x": 9, "y": 5.5},
- {"x": 10, "y": 5.5},
+ {"matrix": [10, 5], "x": 8, "y": 5.5},
+ {"matrix": [10, 4], "x": 9, "y": 5.5},
+ {"matrix": [11, 2], "x": 10, "y": 5.5},
- {"x": 8.5, "y": 6.5},
- {"x": 9.5, "y": 6.5}
+ {"matrix": [11, 5], "x": 8.5, "y": 6.5},
+ {"matrix": [11, 4], "x": 9.5, "y": 6.5}
]
}
}