Modernize `dactyl_manuform/dmote` keyboard (#20427)

Co-authored-by: Ryan <fauxpark@gmail.com>

10 files changed, 148 insertions, 120 deletions

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 0d1f65d8b9..294e7ba094 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -202,6 +202,9 @@
     "handwired/dactyl_manuform/6x6_kinesis": {
         "target": "handwired/dactyl_kinesis"
     },
+    "handwired/dactyl_manuform/dmote/62key": {
+        "target": "handwired/dmote"
+    },
     "handwired/ferris": {
         "target": "ferris/0_1"
     },
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
deleted file mode 100644
index e8bbf91d08..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-// WS2812 RGB LED, normally used to indicate keyboard state:
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h
deleted file mode 100644
index 1809262044..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/rules.mk b/keyboards/handwired/dactyl_manuform/dmote/62key/rules.mk
deleted file mode 100644
index a6a97a5c8e..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Build-process overrides for the DMOTE.
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-RGBLIGHT_ENABLE = yes       # Needed for the C linker with lighting control.
-COMMAND_ENABLE = no         # Not a good combo with Space Cadet shift.
diff --git a/keyboards/handwired/dactyl_manuform/dmote/readme.md b/keyboards/handwired/dactyl_manuform/dmote/readme.md
deleted file mode 100644
index 7aff2df524..0000000000
--- a/keyboards/handwired/dactyl_manuform/dmote/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-DMOTE
-======
-
-The “Dactyl-ManuForm: Opposable Thumb Edition” is made from a Clojure
-application maintained [here](https://github.com/veikman/dactyl-keyboard).
-The application supports varied physical layouts and therefore matrices.
-This physical variability is its main feature; its QMK firmware is ordinary.
-
-Consult the general [Dactyl-ManuForm readme](../readme.md).
-
-## The `62key` layout
-
-This folder represents the default build target of the Clojure application
-as of its version 0.4.0. The default keymap for this layout has a QWERTY base
-layer but is intended for running Colemak on the OS side with the i3 tiling
-window manager. It’s also got a layer that forces Colemak from the QMK side.
diff --git a/keyboards/handwired/dmote/config.h b/keyboards/handwired/dmote/config.h
new file mode 100644
index 0000000000..4a2d46abe5
--- /dev/null
+++ b/keyboards/handwired/dmote/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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
+
+// WS2812 RGB LED, normally used to indicate keyboard state:
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dmote/info.json
index 8e27a68f16..fc52fee11e 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dmote/info.json
@@ -1,21 +1,29 @@
 {
-    "keyboard_name": "DMOTE (62-key)",
-    "manufacturer": "tshort",
-    "url": "",
+    "keyboard_name": "DMOTE",
+    "manufacturer": "veikman",
+    "url": "https://github.com/veikman/dactyl-keyboard",
     "maintainer": "veikman",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "development_board": "promicro",
     "usb": {
         "vid": "0x444D",
         "pid": "0x3632",
-        "device_version": "0.0.1"
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
     },
     "rgblight": {
         "led_count": 6,
         "split_count": [3, 3],
         "animations": {
-            "knight": true,
-            "christmas": true
+            "christmas": true,
+            "knight": true
         }
     },
     "ws2812": {
@@ -31,7 +39,7 @@
         "soft_serial_pin": "D0"
     },
     "layouts": {
-        "LAYOUT_62key": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -40,38 +48,6 @@
                 {"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},
-
-                {"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},
-
-                {"matrix": [4, 3], "x": 3, "y": 4},
-
-                {"matrix": [4, 2], "x": 4.5, "y": 4.5},
-                {"matrix": [3, 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},
-
-                {"matrix": [5, 4], "x": 4.5, "y": 6.5},
-                {"matrix": [5, 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},
@@ -79,6 +55,13 @@
                 {"matrix": [6, 1], "x": 13, "y": 0},
                 {"matrix": [6, 0], "x": 14, "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": [7, 5], "x": 9, "y": 1},
                 {"matrix": [7, 4], "x": 10, "y": 1},
                 {"matrix": [7, 3], "x": 11, "y": 1},
@@ -86,6 +69,13 @@
                 {"matrix": [7, 1], "x": 13, "y": 1},
                 {"matrix": [7, 0], "x": 14, "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},
+
                 {"matrix": [8, 5], "x": 9, "y": 2},
                 {"matrix": [8, 4], "x": 10, "y": 2},
                 {"matrix": [8, 3], "x": 11, "y": 2},
@@ -93,21 +83,39 @@
                 {"matrix": [8, 1], "x": 13, "y": 2},
                 {"matrix": [8, 0], "x": 14, "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},
+
                 {"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},
 
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [4, 2], "x": 4.5, "y": 4.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.5},
+
                 {"matrix": [9, 5], "x": 8.5, "y": 4.5},
                 {"matrix": [10, 2], "x": 9.5, "y": 4.5},
 
                 {"matrix": [10, 3], "x": 11, "y": 4},
 
+                {"matrix": [5, 2], "x": 4, "y": 5.5},
+                {"matrix": [4, 4], "x": 5, "y": 5.5},
+                {"matrix": [4, 5], "x": 6, "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},
 
+                {"matrix": [5, 4], "x": 4.5, "y": 6.5},
+                {"matrix": [5, 5], "x": 5.5, "y": 6.5},
+
                 {"matrix": [11, 5], "x": 8.5, "y": 6.5},
                 {"matrix": [11, 4], "x": 9.5, "y": 6.5}
             ]
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c b/keyboards/handwired/dmote/keymaps/default/keymap.c
index ce2c8a3702..59a5b51f1b 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
+++ b/keyboards/handwired/dmote/keymaps/default/keymap.c
@@ -1,3 +1,21 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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 QMK_KEYBOARD_H
 
 #include "keymap_colemak.h"
@@ -7,7 +25,7 @@
 enum layer_names {
     _QWERTY,   // OS-side Colemak. Default.
     _COLEMAK,  // Keyboard-side Colemak. Portability, emergency.
-    _NUMERIC
+    _NUMERIC,
 };
 
 // Shorthand:
@@ -23,58 +41,34 @@ enum layer_names {
 // https://github.com/qmk/qmk_firmware/pull/2055
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_62key(
-        KC_VOLD, KC_VOLU, CM_W,    CM_F,    CM_P,    CM_G,
-        KC_TAB,  CM_Q,    CM_R,    CM_S,    CM_T,    CM_D,
-        KC_BSPC, CM_A,    CM_X,    CM_C,    CM_V,    CM_B,
-        SLQ,     CM_Z,    KC_HOME, KC_PGUP, KC_END,
-                                   KC_PGDN,          KC_ENT,  KC_SPC,
-                                                 SC_LSPO, KC_LGUI, KC_MINS,
-                                                     BK_LCTL, KC_LALT,
-
-                     CM_J,    CM_L,    CM_U,    CM_Y,    KC_MPLY, KC_MUTE,
-                     CM_H,    CM_N,    CM_E,    CM_I,    CM_SCLN, KC_BSLS,
-                     CM_K,    CM_M,    KC_COMM, KC_DOT,  CM_O,    KC_QUOT,
-                              KC_LEFT, KC_UP,   KC_RGHT, KC_SLSH, SRQ,
-            KC_DEL,  KC_ESC,           KC_DOWN,
-        KC_EQL,  LAYER_N, SC_RSPC,
-            KC_RALT, BK_RCTL
+    [_QWERTY] = LAYOUT(
+        KC_VOLD, KC_VOLU, CM_W,    CM_F,    CM_P,    CM_G,                                     CM_J,    CM_L,    CM_U,    CM_Y,    KC_MPLY, KC_MUTE,
+        KC_TAB,  CM_Q,    CM_R,    CM_S,    CM_T,    CM_D,                                     CM_H,    CM_N,    CM_E,    CM_I,    CM_SCLN, KC_BSLS,
+        KC_BSPC, CM_A,    CM_X,    CM_C,    CM_V,    CM_B,                                     CM_K,    CM_M,    KC_COMM, KC_DOT,  CM_O,    KC_QUOT,
+        SLQ,     CM_Z,    KC_HOME, KC_PGUP, KC_END,                                                     KC_LEFT, KC_UP,   KC_RGHT, KC_SLSH, SRQ,
+                                   KC_PGDN,          KC_ENT,  KC_SPC,                 KC_DEL,  KC_ESC,           KC_DOWN,
+                                                 SC_LSPO, KC_LGUI, KC_MINS,       KC_EQL,  LAYER_N, SC_RSPC,
+                                                     BK_LCTL, KC_LALT,                KC_RALT, BK_RCTL        
     ),
 
-    [_COLEMAK] = LAYOUT_62key(
-        _______, _______, KC_W,    KC_F,    KC_P,    KC_G,
-        _______, KC_Q,    KC_R,    KC_S,    KC_T,    KC_D,
-        _______, KC_A,    KC_X,    KC_C,    KC_V,    KC_B,
-        _______, KC_Z,    _______, _______, _______,
-                                   _______,          _______, _______,
-                                                 _______, _______, _______,
-                                                     _______, _______,
-
-                     KC_J,    KC_L,    KC_U,    KC_Y,    _______, _______,
-                     KC_H,    KC_N,    KC_E,    KC_I,    KC_SCLN, _______,
-                     KC_K,    KC_M,    _______, _______, KC_O,    _______,
-                              _______, _______, _______, _______, _______,
-            _______, _______,          _______,
-        _______, _______, _______,
-            _______, _______
+    [_COLEMAK] = LAYOUT(
+        _______, _______, KC_W,    KC_F,    KC_P,    KC_G,                                     KC_J,    KC_L,    KC_U,    KC_Y,    _______, _______,
+        _______, KC_Q,    KC_R,    KC_S,    KC_T,    KC_D,                                     KC_H,    KC_N,    KC_E,    KC_I,    KC_SCLN, _______,
+        _______, KC_A,    KC_X,    KC_C,    KC_V,    KC_B,                                     KC_K,    KC_M,    _______, _______, KC_O,    _______,
+        _______, KC_Z,    _______, _______, _______,                                                    _______, _______, _______, _______, _______,
+                                   _______,          _______, _______,                _______, _______,          _______,
+                                                 _______, _______, _______,       _______, _______, _______,
+                                                     _______, _______,                _______, _______
     ),
 
-    [_NUMERIC] = LAYOUT_62key(
-        LAYER_C, KC_INS,  KC_F2,   KC_F3,   KC_F4,   KC_F5,
-        KC_F12,  KC_F1,   KC_2,    KC_3,    KC_4,    KC_5,
-        _______, KC_1,    KC_AT,   KC_HASH, KC_DLR,  KC_PERC,
-        KC_GRV,  KC_EXLM, KC_BTN1, KC_WH_U, KC_BTN2,
-                                   KC_WH_D,          RGB_MOD, _______,
-                                                 _______, _______, EMDASH,
-                                                     _______, _______,
-
-                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   QK_BOOT,   KC_WAKE, // *
-                     KC_6,    KC_7,    KC_8,    KC_9,    KC_F10,  KC_F11,
-                     KC_CIRC, KC_AMPR, KC_ASTR, KC_APP,  KC_0,    PASTE,
-                              KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, RGB_TOG,
-            KC_ACL1, KC_ACL2,          KC_MS_D,
-        KC_ACL0, _______, _______,
-            _______, _______
+    [_NUMERIC] = LAYOUT(
+        LAYER_C, KC_INS,  KC_F2,   KC_F3,   KC_F4,   KC_F5,                                   KC_F6,   KC_F7,   KC_F8,   KC_F9,   QK_BOOT,   KC_WAKE, // *
+        KC_F12,  KC_F1,   KC_2,    KC_3,    KC_4,    KC_5,                                    KC_6,    KC_7,    KC_8,    KC_9,    KC_F10,  KC_F11,
+        _______, KC_1,    KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                 KC_CIRC, KC_AMPR, KC_ASTR, KC_APP,  KC_0,    PASTE,
+        KC_GRV,  KC_EXLM, KC_BTN1, KC_WH_U, KC_BTN2,                                                   KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, RGB_TOG,
+                                   KC_WH_D,          RGB_MOD, _______,               KC_ACL1, KC_ACL2,          KC_MS_D,
+                                                 _______, _______, EMDASH,       KC_ACL0, _______, _______,
+                                                     _______, _______,               _______, _______
     )
 };
 
@@ -82,7 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //  Debian 10 was seeing duplicate keypress and release events for sleep
 //  (regardless of i3 binding), which ruined the function.
 
-
 /*
 The rest is all about lighting control.
 The logic here represents a pretty poor compromise solution between the
diff --git a/keyboards/handwired/dmote/readme.md b/keyboards/handwired/dmote/readme.md
new file mode 100644
index 0000000000..9b6ff3a9f4
--- /dev/null
+++ b/keyboards/handwired/dmote/readme.md
@@ -0,0 +1,29 @@
+# DMOTE
+
+![DMOTE](https://i.imgur.com/JYkB6LBh.jpg)
+
+The “**D**actyl-**M**anuForm: **O**pposable **T**humb **E**dition” is made from a Clojure
+application maintained [here](https://github.com/veikman/dactyl-keyboard).
+The application supports varied physical layouts and therefore matrices.
+This physical variability is its main feature; its QMK firmware is ordinary.
+
+* Keyboard Maintainer: [Viktor Eikman](https://github.com/veikman/)
+* Hardware Supported: Pro Micro and clones
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/dmote:default
+
+Flashing example for this keyboard:
+
+    make handwired/dmote:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/dmote/rules.mk b/keyboards/handwired/dmote/rules.mk
new file mode 100644
index 0000000000..876618b9d1
--- /dev/null
+++ b/keyboards/handwired/dmote/rules.mk
@@ -0,0 +1 @@
+# File is intentionally blank