Skip to content

Commit 29ffe80

Browse files
dunk2kfauxpark
dunk2k
and
fauxpark
authored
Modernize dactyl_manuform/dmote keyboard (qmk#20427)
Co-authored-by: Ryan <fauxpark@gmail.com>
1 parent b6a881b commit 29ffe80

File tree

10 files changed

+148
-120
lines changed

10 files changed

+148
-120
lines changed

‎data/mappings/keyboard_aliases.hjson

+3
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,9 @@
202202
"handwired/dactyl_manuform/6x6_kinesis": {
203203
"target": "handwired/dactyl_kinesis"
204204
},
205+
"handwired/dactyl_manuform/dmote/62key": {
206+
"target": "handwired/dmote"
207+
},
205208
"handwired/ferris": {
206209
"target": "ferris/0_1"
207210
},

‎keyboards/handwired/dactyl_manuform/dmote/62key/config.h

-5
This file was deleted.

‎keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h

-3
This file was deleted.

‎keyboards/handwired/dactyl_manuform/dmote/62key/rules.mk

-5
This file was deleted.

‎keyboards/handwired/dactyl_manuform/dmote/readme.md

-16
This file was deleted.

‎keyboards/handwired/dmote/config.h

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
Copyright 2012 Jun Wako <wakojun@gmail.com>
3+
Copyright 2015 Jack Humbert
4+
5+
This program is free software: you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License as published by
7+
the Free Software Foundation, either version 2 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
14+
15+
You should have received a copy of the GNU General Public License
16+
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
#pragma once
20+
21+
// WS2812 RGB LED, normally used to indicate keyboard state:
22+
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
23+
#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1

‎keyboards/handwired/dactyl_manuform/dmote/62key/info.json ‎keyboards/handwired/dmote/info.json

+49-41
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
11
{
2-
"keyboard_name": "DMOTE (62-key)",
3-
"manufacturer": "tshort",
4-
"url": "",
2+
"keyboard_name": "DMOTE",
3+
"manufacturer": "veikman",
4+
"url": "https://github.com/veikman/dactyl-keyboard",
55
"maintainer": "veikman",
6-
"processor": "atmega32u4",
7-
"bootloader": "atmel-dfu",
6+
"development_board": "promicro",
87
"usb": {
98
"vid": "0x444D",
109
"pid": "0x3632",
11-
"device_version": "0.0.1"
10+
"device_version": "1.0.0"
11+
},
12+
"features": {
13+
"bootmagic": true,
14+
"console": false,
15+
"command": false,
16+
"extrakey": true,
17+
"mousekey": true,
18+
"nkro": true,
19+
"rgblight": true
1220
},
1321
"rgblight": {
1422
"led_count": 6,
1523
"split_count": [3, 3],
1624
"animations": {
17-
"knight": true,
18-
"christmas": true
25+
"christmas": true,
26+
"knight": true
1927
}
2028
},
2129
"ws2812": {
@@ -31,7 +39,7 @@
3139
"soft_serial_pin": "D0"
3240
},
3341
"layouts": {
34-
"LAYOUT_62key": {
42+
"LAYOUT": {
3543
"layout": [
3644
{"matrix": [0, 0], "x": 0, "y": 0},
3745
{"matrix": [0, 1], "x": 1, "y": 0},
@@ -40,74 +48,74 @@
4048
{"matrix": [0, 4], "x": 4, "y": 0},
4149
{"matrix": [0, 5], "x": 5, "y": 0},
4250

43-
{"matrix": [1, 0], "x": 0, "y": 1},
44-
{"matrix": [1, 1], "x": 1, "y": 1},
45-
{"matrix": [1, 2], "x": 2, "y": 1},
46-
{"matrix": [1, 3], "x": 3, "y": 1},
47-
{"matrix": [1, 4], "x": 4, "y": 1},
48-
{"matrix": [1, 5], "x": 5, "y": 1},
49-
50-
{"matrix": [2, 0], "x": 0, "y": 2},
51-
{"matrix": [2, 1], "x": 1, "y": 2},
52-
{"matrix": [2, 2], "x": 2, "y": 2},
53-
{"matrix": [2, 3], "x": 3, "y": 2},
54-
{"matrix": [2, 4], "x": 4, "y": 2},
55-
{"matrix": [2, 5], "x": 5, "y": 2},
56-
57-
{"matrix": [3, 0], "x": 0, "y": 3},
58-
{"matrix": [3, 1], "x": 1, "y": 3},
59-
{"matrix": [3, 2], "x": 2, "y": 3},
60-
{"matrix": [3, 3], "x": 3, "y": 3},
61-
{"matrix": [3, 4], "x": 4, "y": 3},
62-
63-
{"matrix": [4, 3], "x": 3, "y": 4},
64-
65-
{"matrix": [4, 2], "x": 4.5, "y": 4.5},
66-
{"matrix": [3, 5], "x": 5.5, "y": 4.5},
67-
68-
{"matrix": [5, 2], "x": 4, "y": 5.5},
69-
{"matrix": [4, 4], "x": 5, "y": 5.5},
70-
{"matrix": [4, 5], "x": 6, "y": 5.5},
71-
72-
{"matrix": [5, 4], "x": 4.5, "y": 6.5},
73-
{"matrix": [5, 5], "x": 5.5, "y": 6.5},
74-
7551
{"matrix": [6, 5], "x": 9, "y": 0},
7652
{"matrix": [6, 4], "x": 10, "y": 0},
7753
{"matrix": [6, 3], "x": 11, "y": 0},
7854
{"matrix": [6, 2], "x": 12, "y": 0},
7955
{"matrix": [6, 1], "x": 13, "y": 0},
8056
{"matrix": [6, 0], "x": 14, "y": 0},
8157

58+
{"matrix": [1, 0], "x": 0, "y": 1},
59+
{"matrix": [1, 1], "x": 1, "y": 1},
60+
{"matrix": [1, 2], "x": 2, "y": 1},
61+
{"matrix": [1, 3], "x": 3, "y": 1},
62+
{"matrix": [1, 4], "x": 4, "y": 1},
63+
{"matrix": [1, 5], "x": 5, "y": 1},
64+
8265
{"matrix": [7, 5], "x": 9, "y": 1},
8366
{"matrix": [7, 4], "x": 10, "y": 1},
8467
{"matrix": [7, 3], "x": 11, "y": 1},
8568
{"matrix": [7, 2], "x": 12, "y": 1},
8669
{"matrix": [7, 1], "x": 13, "y": 1},
8770
{"matrix": [7, 0], "x": 14, "y": 1},
8871

72+
{"matrix": [2, 0], "x": 0, "y": 2},
73+
{"matrix": [2, 1], "x": 1, "y": 2},
74+
{"matrix": [2, 2], "x": 2, "y": 2},
75+
{"matrix": [2, 3], "x": 3, "y": 2},
76+
{"matrix": [2, 4], "x": 4, "y": 2},
77+
{"matrix": [2, 5], "x": 5, "y": 2},
78+
8979
{"matrix": [8, 5], "x": 9, "y": 2},
9080
{"matrix": [8, 4], "x": 10, "y": 2},
9181
{"matrix": [8, 3], "x": 11, "y": 2},
9282
{"matrix": [8, 2], "x": 12, "y": 2},
9383
{"matrix": [8, 1], "x": 13, "y": 2},
9484
{"matrix": [8, 0], "x": 14, "y": 2},
9585

86+
{"matrix": [3, 0], "x": 0, "y": 3},
87+
{"matrix": [3, 1], "x": 1, "y": 3},
88+
{"matrix": [3, 2], "x": 2, "y": 3},
89+
{"matrix": [3, 3], "x": 3, "y": 3},
90+
{"matrix": [3, 4], "x": 4, "y": 3},
91+
9692
{"matrix": [9, 4], "x": 10, "y": 3},
9793
{"matrix": [9, 3], "x": 11, "y": 3},
9894
{"matrix": [9, 2], "x": 12, "y": 3},
9995
{"matrix": [9, 1], "x": 13, "y": 3},
10096
{"matrix": [9, 0], "x": 14, "y": 3},
10197

98+
{"matrix": [4, 3], "x": 3, "y": 4},
99+
100+
{"matrix": [4, 2], "x": 4.5, "y": 4.5},
101+
{"matrix": [3, 5], "x": 5.5, "y": 4.5},
102+
102103
{"matrix": [9, 5], "x": 8.5, "y": 4.5},
103104
{"matrix": [10, 2], "x": 9.5, "y": 4.5},
104105

105106
{"matrix": [10, 3], "x": 11, "y": 4},
106107

108+
{"matrix": [5, 2], "x": 4, "y": 5.5},
109+
{"matrix": [4, 4], "x": 5, "y": 5.5},
110+
{"matrix": [4, 5], "x": 6, "y": 5.5},
111+
107112
{"matrix": [10, 5], "x": 8, "y": 5.5},
108113
{"matrix": [10, 4], "x": 9, "y": 5.5},
109114
{"matrix": [11, 2], "x": 10, "y": 5.5},
110115

116+
{"matrix": [5, 4], "x": 4.5, "y": 6.5},
117+
{"matrix": [5, 5], "x": 5.5, "y": 6.5},
118+
111119
{"matrix": [11, 5], "x": 8.5, "y": 6.5},
112120
{"matrix": [11, 4], "x": 9.5, "y": 6.5}
113121
]

‎keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c ‎keyboards/handwired/dmote/keymaps/default/keymap.c

+43-50
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
Copyright 2012 Jun Wako <wakojun@gmail.com>
3+
Copyright 2015 Jack Humbert
4+
5+
This program is free software: you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License as published by
7+
the Free Software Foundation, either version 2 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
14+
15+
You should have received a copy of the GNU General Public License
16+
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
#include QMK_KEYBOARD_H
220

321
#include "keymap_colemak.h"
@@ -7,7 +25,7 @@
725
enum layer_names {
826
_QWERTY, // OS-side Colemak. Default.
927
_COLEMAK, // Keyboard-side Colemak. Portability, emergency.
10-
_NUMERIC
28+
_NUMERIC,
1129
};
1230

1331
// Shorthand:
@@ -23,66 +41,41 @@ enum layer_names {
2341
// https://github.com/qmk/qmk_firmware/pull/2055
2442

2543
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26-
[_QWERTY] = LAYOUT_62key(
27-
KC_VOLD, KC_VOLU, CM_W, CM_F, CM_P, CM_G,
28-
KC_TAB, CM_Q, CM_R, CM_S, CM_T, CM_D,
29-
KC_BSPC, CM_A, CM_X, CM_C, CM_V, CM_B,
30-
SLQ, CM_Z, KC_HOME, KC_PGUP, KC_END,
31-
KC_PGDN, KC_ENT, KC_SPC,
32-
SC_LSPO, KC_LGUI, KC_MINS,
33-
BK_LCTL, KC_LALT,
34-
35-
CM_J, CM_L, CM_U, CM_Y, KC_MPLY, KC_MUTE,
36-
CM_H, CM_N, CM_E, CM_I, CM_SCLN, KC_BSLS,
37-
CM_K, CM_M, KC_COMM, KC_DOT, CM_O, KC_QUOT,
38-
KC_LEFT, KC_UP, KC_RGHT, KC_SLSH, SRQ,
39-
KC_DEL, KC_ESC, KC_DOWN,
40-
KC_EQL, LAYER_N, SC_RSPC,
41-
KC_RALT, BK_RCTL
44+
[_QWERTY] = LAYOUT(
45+
KC_VOLD, KC_VOLU, CM_W, CM_F, CM_P, CM_G, CM_J, CM_L, CM_U, CM_Y, KC_MPLY, KC_MUTE,
46+
KC_TAB, CM_Q, CM_R, CM_S, CM_T, CM_D, CM_H, CM_N, CM_E, CM_I, CM_SCLN, KC_BSLS,
47+
KC_BSPC, CM_A, CM_X, CM_C, CM_V, CM_B, CM_K, CM_M, KC_COMM, KC_DOT, CM_O, KC_QUOT,
48+
SLQ, CM_Z, KC_HOME, KC_PGUP, KC_END, KC_LEFT, KC_UP, KC_RGHT, KC_SLSH, SRQ,
49+
KC_PGDN, KC_ENT, KC_SPC, KC_DEL, KC_ESC, KC_DOWN,
50+
SC_LSPO, KC_LGUI, KC_MINS, KC_EQL, LAYER_N, SC_RSPC,
51+
BK_LCTL, KC_LALT, KC_RALT, BK_RCTL
4252
),
4353

44-
[_COLEMAK] = LAYOUT_62key(
45-
_______, _______, KC_W, KC_F, KC_P, KC_G,
46-
_______, KC_Q, KC_R, KC_S, KC_T, KC_D,
47-
_______, KC_A, KC_X, KC_C, KC_V, KC_B,
48-
_______, KC_Z, _______, _______, _______,
49-
_______, _______, _______,
50-
_______, _______, _______,
51-
_______, _______,
52-
53-
KC_J, KC_L, KC_U, KC_Y, _______, _______,
54-
KC_H, KC_N, KC_E, KC_I, KC_SCLN, _______,
55-
KC_K, KC_M, _______, _______, KC_O, _______,
56-
_______, _______, _______, _______, _______,
57-
_______, _______, _______,
58-
_______, _______, _______,
59-
_______, _______
54+
[_COLEMAK] = LAYOUT(
55+
_______, _______, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, _______, _______,
56+
_______, KC_Q, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_SCLN, _______,
57+
_______, KC_A, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, _______, _______, KC_O, _______,
58+
_______, KC_Z, _______, _______, _______, _______, _______, _______, _______, _______,
59+
_______, _______, _______, _______, _______, _______,
60+
_______, _______, _______, _______, _______, _______,
61+
_______, _______, _______, _______
6062
),
6163

62-
[_NUMERIC] = LAYOUT_62key(
63-
LAYER_C, KC_INS, KC_F2, KC_F3, KC_F4, KC_F5,
64-
KC_F12, KC_F1, KC_2, KC_3, KC_4, KC_5,
65-
_______, KC_1, KC_AT, KC_HASH, KC_DLR, KC_PERC,
66-
KC_GRV, KC_EXLM, KC_BTN1, KC_WH_U, KC_BTN2,
67-
KC_WH_D, RGB_MOD, _______,
68-
_______, _______, EMDASH,
69-
_______, _______,
70-
71-
KC_F6, KC_F7, KC_F8, KC_F9, QK_BOOT, KC_WAKE, // *
72-
KC_6, KC_7, KC_8, KC_9, KC_F10, KC_F11,
73-
KC_CIRC, KC_AMPR, KC_ASTR, KC_APP, KC_0, PASTE,
74-
KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, RGB_TOG,
75-
KC_ACL1, KC_ACL2, KC_MS_D,
76-
KC_ACL0, _______, _______,
77-
_______, _______
64+
[_NUMERIC] = LAYOUT(
65+
LAYER_C, KC_INS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, QK_BOOT, KC_WAKE, // *
66+
KC_F12, KC_F1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_F10, KC_F11,
67+
_______, KC_1, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_APP, KC_0, PASTE,
68+
KC_GRV, KC_EXLM, KC_BTN1, KC_WH_U, KC_BTN2, KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, RGB_TOG,
69+
KC_WH_D, RGB_MOD, _______, KC_ACL1, KC_ACL2, KC_MS_D,
70+
_______, _______, EMDASH, KC_ACL0, _______, _______,
71+
_______, _______, _______, _______
7872
)
7973
};
8074

8175
// *KC_WAKE: Used in place of KC_SLEP because X11 with i3 on prerelease
8276
// Debian 10 was seeing duplicate keypress and release events for sleep
8377
// (regardless of i3 binding), which ruined the function.
8478

85-
8679
/*
8780
The rest is all about lighting control.
8881
The logic here represents a pretty poor compromise solution between the

‎keyboards/handwired/dmote/readme.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# DMOTE
2+
3+
![DMOTE](https://i.imgur.com/JYkB6LBh.jpg)
4+
5+
The “**D**actyl-**M**anuForm: **O**pposable **T**humb **E**dition” is made from a Clojure
6+
application maintained [here](https://github.com/veikman/dactyl-keyboard).
7+
The application supports varied physical layouts and therefore matrices.
8+
This physical variability is its main feature; its QMK firmware is ordinary.
9+
10+
* Keyboard Maintainer: [Viktor Eikman](https://github.com/veikman/)
11+
* Hardware Supported: Pro Micro and clones
12+
13+
Make example for this keyboard (after setting up your build environment):
14+
15+
make handwired/dmote:default
16+
17+
Flashing example for this keyboard:
18+
19+
make handwired/dmote:default:flash
20+
21+
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
22+
23+
## Bootloader
24+
25+
Enter the bootloader in 3 ways:
26+
27+
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
28+
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
29+
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

‎keyboards/handwired/dmote/rules.mk

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# File is intentionally blank

0 commit comments

Comments
 (0)