Merge 498ab4bf23 into d9740c9de1

data/mappings/keyboard_aliases.hjson

@@ -218,6 +218,30 @@
     "handwired/dactyl_manuform/3x5_3": {
         "target": "handwired/dactyl_minidox"
     },
+    "handwired/dactyl_manuform/4x5_5": {
+        "target": "handwired/dactyl_manuform_mini/4x5"
+    },
+    "handwired/dactyl_manuform/4x6_4_3": {
+        "target": "handwired/dactyl_manuform_tight/5x6_ex"
+    },
+    "handwired/dactyl_manuform/4x6_5": {
+        "target": "handwired/dactyl_manuform_mini/4x6"
+    },
+    "handwired/dactyl_manuform/5x6_2_5": {
+        "target": "handwired/dactyl_manuform_mini/5x6_ex"
+    },
+    "handwired/dactyl_manuform/5x6_5": {
+        "target": "handwired/dactyl_manuform_mini/5x6"
+    },
+    "handwired/dactyl_manuform/5x6_68": {
+        "target": "handwired/dactyl_manuform/5x6_ex"
+    },
+    "handwired/dactyl_manuform/5x7": {
+        "target": "handwired/dactyl_manuform/5x6_exic"
+    },
+    "handwired/dactyl_manuform/6x6_4": {
+        "target": "handwired/dactyl_manuform/6x6_ex"
+    },
     "handwired/dactyl_manuform/6x6_kinesis": {
         "target": "handwired/dactyl_kinesis"
     },

keyboards/handwired/dactyl_manuform/4x5/keyboard.json

@@ -1,150 +1,155 @@
 {
-    "keyboard_name": "Dactyl Manuform 4x5",
+    "keyboard_name": "Dactyl ManuForm 4x5",
     "manufacturer": "tshort",
-    "url": "",
+    "url": "https://github.com/tshort/dactyl-keyboard",
     "maintainer": "qmk",
     "usb": {
         "vid": "0x444D",
-        "pid": "0x3435",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
+        "pid": "0x0450",
+        "device_version": "1.0.0"
     },
     "features": {
-        "bootmagic": false,
-        "command": true,
+        "bootmagic": true,
         "console": false,
+        "command": false,
         "extrakey": true,
-        "mousekey": true,
-        "nkro": false
+        "mousekey": true
     },
+    "development_board": "promicro",
     "matrix_pins": {
         "cols": ["C6", "D7", "E6", "B4", "B5"],
         "rows": ["F7", "B1", "B3", "B2", "B6"]
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "enabled": true,
+        "enabled": true,   
         "soft_serial_pin": "D0"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.1},
                 {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
 
-                {"matrix": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 0], "x": 14, "y": 0},
+                {"matrix": [5, 0], "x": 7, "y": 0.1},
+                {"matrix": [5, 1], "x": 8, "y": 0.1},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0.1},
+                {"matrix": [5, 4], "x": 11, "y": 0.6},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.1},
                 {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
 
-                {"matrix": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 1], "x": 13, "y": 1},
-                {"matrix": [6, 0], "x": 14, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1.1},
+                {"matrix": [6, 1], "x": 8, "y": 1.1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1.1},
+                {"matrix": [6, 4], "x": 11, "y": 1.6},
 
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.1},
                 {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
 
-                {"matrix": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 1], "x": 13, "y": 2},
-                {"matrix": [7, 0], "x": 14, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2.1},
+                {"matrix": [7, 1], "x": 8, "y": 2.1},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2.1},
+                {"matrix": [7, 4], "x": 11, "y": 2.6},
 
-                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3.1},
                 {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"matrix": [8, 2], "x": 12, "y": 3},
-                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3.1},
 
-                {"matrix": [3, 3], "x": 3, "y": 4},
-                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4.1},
+                {"matrix": [3, 4], "x": 4, "y": 4.3},
 
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 3], "x": 11, "y": 4},
+                {"matrix": [8, 0], "x": 7, "y": 4.3},
+                {"matrix": [8, 1], "x": 8, "y": 4.1},
 
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 3], "x": 6, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 5.3},
+                {"matrix": [4, 4], "x": 4.5, "y": 5.3},
 
-                {"matrix": [9, 3], "x": 8, "y": 5},
-                {"matrix": [9, 4], "x": 9, "y": 5},
+                {"matrix": [9, 0], "x": 6.5, "y": 5.3},
+                {"matrix": [9, 1], "x": 8, "y": 5.3},
 
-                {"matrix": [4, 2], "x": 5, "y": 6},
-                {"matrix": [4, 1], "x": 6, "y": 6},
+                {"matrix": [4, 1], "x": 3, "y": 6.3},
+                {"matrix": [4, 2], "x": 4, "y": 6.3},
 
-                {"matrix": [9, 1], "x": 8, "y": 6},
-                {"matrix": [9, 2], "x": 9, "y": 6}
+                {"matrix": [9, 2], "x": 7, "y": 6.3},
+                {"matrix": [9, 3], "x": 8, "y": 6.3}
             ]
         },
-        "LAYOUT_split_3x5_3": {
+        "LAYOUT_legacy": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.1},
                 {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
 
-                {"matrix": [5, 4], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 0], "x": 14, "y": 0},
+                {"matrix": [5, 4], "x": 7, "y": 0.1},
+                {"matrix": [5, 3], "x": 8, "y": 0.1},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0.1},
+                {"matrix": [5, 0], "x": 11, "y": 0.6},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.1},
                 {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
 
-                {"matrix": [6, 4], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 1], "x": 13, "y": 1},
-                {"matrix": [6, 0], "x": 14, "y": 1},
+                {"matrix": [6, 4], "x": 7, "y": 1.1},
+                {"matrix": [6, 3], "x": 8, "y": 1.1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1.1},
+                {"matrix": [6, 0], "x": 11, "y": 1.6},
 
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.1},
                 {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+
+                {"matrix": [7, 4], "x": 7, "y": 2.1},
+                {"matrix": [7, 3], "x": 8, "y": 2.1},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2.1},
+                {"matrix": [7, 0], "x": 11, "y": 2.6},
+
+                {"matrix": [3, 1], "x": 1, "y": 3.1},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 1], "x": 10, "y": 3.1},
+
+                {"matrix": [3, 3], "x": 3, "y": 4.1},
+                {"matrix": [3, 4], "x": 4, "y": 4.3},
 
-                {"matrix": [7, 4], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 1], "x": 13, "y": 2},
-                {"matrix": [7, 0], "x": 14, "y": 2},
+                {"matrix": [8, 4], "x": 7, "y": 4.3},
+                {"matrix": [8, 3], "x": 8, "y": 4.1},
 
-                {"matrix": [3, 3], "x": 3, "y": 4},
-                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 3, "y": 5.3},
+                {"matrix": [4, 3], "x": 4.5, "y": 5.3},
 
-                {"matrix": [8, 4], "x": 10, "y": 4},
-                {"matrix": [8, 3], "x": 11, "y": 4},
+                {"matrix": [9, 3], "x": 6.5, "y": 5.3},
+                {"matrix": [9, 4], "x": 8, "y": 5.3},
 
-                {"matrix": [4, 4], "x": 5, "y": 5},
+                {"matrix": [4, 2], "x": 3, "y": 6.3},
+                {"matrix": [4, 1], "x": 4, "y": 6.3},
 
-                {"matrix": [9, 4], "x": 9, "y": 5}
+                {"matrix": [9, 1], "x": 7, "y": 6.3},
+                {"matrix": [9, 2], "x": 8, "y": 6.3}
             ]
         }
     }

keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c

@@ -20,46 +20,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
-#define _BASE 0
-#define _RAISE 1
-#define _LOWER 2
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
 
 #define SFT_ESC  SFT_T(KC_ESC)
 #define CTL_BSPC CTL_T(KC_BSPC)
 #define ALT_SPC  ALT_T(KC_SPC)
 #define SFT_ENT  SFT_T(KC_ENT)
 
-#define KC_ML KC_MS_LEFT
-#define KC_MR KC_MS_RIGHT
-#define KC_MU KC_MS_UP
-#define KC_MD KC_MS_DOWN
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN2
-
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base (qwerty)
-     * ,----------------------------------,                             ,----------------------------------,
-     * |   q  |   w  |   e  |   r  |   t  |                             |   y  |   u  |   i  |   o  |   p  |
-     * |------+------+------+------+------|                             |-------------+------+------+------|
-     * |   a  |   s  |   d  |   f  |   g  |                             |   h  |   j  |   k  |   l  |   ;  |
-     * |------+------+------+------+------|                             |------|------+------+------+------|
-     * |   z  |   x  |   c  |   v  |   b  |                             |   n  |   m  |   ,  |   .  |   '  |
-     * |------+------+------+-------------,                             ,-------------+------+------+------,
-     *        |  [   |   ]  |                                                         |   -  |   =  |
-     *        '------+------'-------------'                             '-------------'------+------'
-     *                      | ESC  |  BS  |                             | SPACE|ENTER |
-     *                      |  +   |   +  |                             |  +   |  +   |
-     *                      | SHIFT| CTRL |                             | ALT  |SHIFT |
-     *                      '------+------'                             '------+------'
-     *                                    '------+------' '------+------'
-     *                                    | TAB  | HOME | | END  | DEL  |
-     *                                    '------+------' '------+------'
-     *                                    | Raise|  ~   | | GUI  | Lower|
-     *                                    '------+------' '------+------'
-     */
     [_BASE] = LAYOUT(
         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
         KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
@@ -70,56 +45,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      RAISE,   KC_GRV,   KC_LGUI, LOWER
     ),
 
-    /* Raise
-     * ,----------------------------------,                             ,----------------------------------,
-     * |      |      |  mup |      |      |                             | VOL+ |      |  up  |      | PgUp |
-     * |------+------+------+------+------|                             |-------------+------+------+------|
-     * |      | mleft| mdown|mright|      |                             | MUTE | left | down |right | PgDn |
-     * |------+------+------+------+------|                             |------|------+------+------+------|
-     * |      |      |      |      |      |                             | VOL- |  /   |  \   |  ?   |  |   |
-     * |------+------+------+-------------,                             ,-------------+------+------+------,
-     *        |      |      |                                                         | mbtn |mbtn2 |
-     *        '------+------'-------------'                             '-------------'------+------'
-     *                      |      |      |                             |      |      |
-     *                      |      |      |                             |      |      |
-     *                      |      |      |                             |      |      |
-     *                      '------+------'                             '------+------'
-     *                                    '------+------' '------+------'
-     *                                    |      |      | |      |      |
-     *                                    '------+------' '------+------'
-     *                                    |      |      | |      |      |
-     *                                    '------+------' '------+------'
-     */
     [_RAISE] = LAYOUT(
-        _______, _______, KC_MU,   _______, _______,                                      KC_VOLU, _______, KC_UP,   _______, KC_PGUP,
-        _______, KC_ML,   KC_MD,   KC_MR,   _______,                                      KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
+        _______, _______, KC_MS_U, _______, _______,                                      KC_VOLU, _______, KC_UP,   _______, KC_PGUP,
+        _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,                                      KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
         _______, _______, _______, _______, _______,                                      KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE,
-                 _______, _______,                                                                          KC_MB1,  KC_MB2,
+                 _______, _______,                                                                          KC_BTN1, KC_BTN2,
                                    _______, _______,                                      _______, _______,
                                                      _______, _______,  _______, _______,
                                                      _______, _______,  _______, _______
     ),
 
-    /* Lower
-     * ,----------------------------------,                             ,----------------------------------,
-     * | F1   | F2   | F3   | F4   | F5   |                             |  F6  | F7   |  F8  |  F9  |  F10 |
-     * |------+------+------+------+------|                             |-------------+------+------+------|
-     * |  1   |  2   |  3   |  4   |  5   |                             |  6   |  7   |  8   |  9   |  0   |
-     * |------+------+------+------+------|                             |------|------+------+------+------|
-     * |  !   |  @   |  #   |  $   |  %   |                             |  ^   |  &   |  *   |  (   |  )   |
-     * |------+------+------+-------------,                             ,-------------+------+------+------,
-     *        | F11  | F12  |                                                         |  -   |  =   |
-     *        '------+------'-------------'                             '-------------'------+------'
-     *                      |      |      |                             |      |      |
-     *                      |      |      |                             |      |      |
-     *                      |      |      |                             |      |      |
-     *                      '------+------'                             '------+------'
-     *                                    '------+------' '------+------'
-     *                                    |      |      | |      |      |
-     *                                    '------+------' '------+------'
-     *                                    |      |      | |      |      |
-     *                                    '------+------' '------+------'
-     */
     [_LOWER] = LAYOUT(
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,

keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h

@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-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
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS

keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c

@@ -1,121 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#define _BASE 0
-#define _RAISE 1
-#define _LOWER 2
-
-// Fillers to make layering more clear
-
-#define ____ KC_TRNS
-
-#define SFT_ESC  SFT_T(KC_ESC)
-#define CTL_BSPC CTL_T(KC_BSPC)
-#define ALT_SPC  ALT_T(KC_SPC)
-#define SFT_ENT  SFT_T(KC_ENT)
-
-#define KC_ML KC_MS_LEFT
-#define KC_MR KC_MS_RIGHT
-#define KC_MU KC_MS_UP
-#define KC_MD KC_MS_DOWN
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN1
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Base (dvorak)
- * ,----------------------------------,                             ,----------------------------------,
- * |   '  |   ,  |   .  |   p  |   y  |                             |   f  |   g  |   c  |   r  |   l  |
- * |------+------+------+------+------|                             |-------------+------+------+------|
- * |   a  |   o  |   e  |   u  |   i  |                             |   d  |   h  |   t  |   n  |   s  |
- * |------+------+------+------+------|                             |------|------+------+------+------|
- * |   ;  |   q  |   j  |   k  |   x  |                             |   b  |   m  |   w  |   v  |   z  |
- * |------+------+------+-------------,                             ,-------------+------+------+------,
- *        |  [   |   ]  |                                                         |   -  |   =  |
- *        '------+------'-------------'                             '-------------'------+------'
- *                      | ESC  |  BS  |                             | SPACE|ENTER |
- *                      |  +   |   +  |                             |  +   |  +   |
- *                      | SHIFT| CTRL |                             | ALT  |SHIFT |
- *                      '------+------'                             '------+------'
- *                                    '------+------' '------+------'
- *                                    | TAB  | HOME | | END  | DEL  |
- *                                    '------+------' '------+------'
- *                                    | Lower|  ~   | | GUI  | Raise|
- *                                    '------+------' '------+------'
- */
-
-[_BASE] = LAYOUT(
-  KC_QUOT, KC_COMM, KC_DOT,  KC_P, KC_Y,                                     KC_F, KC_G, KC_C,    KC_R,   KC_L,
-  KC_A,    KC_O,    KC_E,    KC_U, KC_I,                                     KC_D, KC_H, KC_T,    KC_N,   KC_S,
-  KC_SCLN, KC_Q,    KC_J,    KC_K, KC_X,                                     KC_B, KC_M, KC_W,    KC_V,   KC_Z,
-           KC_LBRC, KC_RBRC,                                                             KC_MINS, KC_EQL,
-                                         SFT_ESC, CTL_BSPC,  ALT_SPC, SFT_ENT,
-                                         KC_TAB,  KC_HOME,   KC_END,  KC_DEL,
-                                         RAISE,   KC_GRV,    KC_LGUI, LOWER
-),
-
-/* Raise
- * ,----------------------------------,                             ,----------------------------------,
- * |      |      |  mup |      |      |                             | VOL+ |      |  up  |      | PgUp |
- * |------+------+------+------+------|                             |-------------+------+------+------|
- * |      | mleft| mdown|mright|      |                             | MUTE | left | down |right | PgDn |
- * |------+------+------+------+------|                             |------|------+------+------+------|
- * |      |      |      |      |      |                             | VOL- |  /   |  \   |  ?   |  |   |
- * |------+------+------+-------------,                             ,-------------+------+------+------,
- *        |      |      |                                                         | mbtn |mbtn2 |
- *        '------+------'-------------'                             '-------------'------+------'
- *                      |      |      |                             |      |      |
- *                      |      |      |                             |      |      |
- *                      |      |      |                             |      |      |
- *                      '------+------'                             '------+------'
- *                                    '------+------' '------+------'
- *                                    |      |      | |      |      |
- *                                    '------+------' '------+------'
- *                                    |      |      | |      |      |
- *                                    '------+------' '------+------'
- */
-
-[_RAISE] = LAYOUT(
-  ____, ____,  KC_MU, ____,  ____,                          KC_VOLU, ____,    KC_UP,   ____,     KC_PGUP,
-  ____, KC_ML, KC_MD, KC_MR, ____,                          KC_MUTE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN,
-  ____, ____,  ____,  ____,  ____,                          KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES,  KC_PIPE,
-        ____,  ____,                                                          KC_MB1,  KC_MB2,
-                                   ____, ____,  ____, ____,
-                                   ____, ____,  ____, ____,
-                                   ____, ____,  ____, ____
-),
-/* Lower
- * ,----------------------------------,                             ,----------------------------------,
- * | F1   | F2   | F3   | F4   | F5   |                             |  F6  | F7   |  F8  |  F9  |  F10 |
- * |------+------+------+------+------|                             |-------------+------+------+------|
- * |  1   |  2   |  3   |  4   |  5   |                             |  6   |  7   |  8   |  9   |  10  |
- * |------+------+------+------+------|                             |------|------+------+------+------|
- * |  !   |  @   |  #   |  $   |  %   |                             |  ^   |  &   |  *   |  (   |  )   |
- * |------+------+------+-------------,                             ,-------------+------+------+------,
- *        | F11  | F12  |                                                         |  -   |  =   |
- *        '------+------'-------------'                             '-------------'------+------'
- *                      |      |      |                             |      |      |
- *                      |      |      |                             |      |      |
- *                      |      |      |                             |      |      |
- *                      '------+------'                             '------+------'
- *                                    '------+------' '------+------'
- *                                    |      |      | |      |      |
- *                                    '------+------' '------+------'
- *                                    |      |      | |      |      |
- *                                    '------+------' '------+------'
- */
-
-[_LOWER] = LAYOUT(
-  KC_F1,   KC_F2,  KC_F3,   KC_F4,  KC_F5,                            KC_F6,   KC_F7,    KC_F8,   KC_F9,   KC_F10,
-  KC_1,    KC_2,   KC_3,    KC_4,   KC_5,                             KC_6,    KC_7,     KC_8,    KC_9,    KC_0,
-  KC_EXLM, KC_AT,  KC_HASH, KC_DLR, KC_PERC,                          KC_CIRC, KC_AMPR,  KC_ASTR, KC_LPRN, KC_RPRN,
-           KC_F11, KC_F12,                                                               ____,    ____,
-                                             ____, ____,  ____, ____,
-                                             ____, ____,  ____, ____,
-                                             ____, ____,  ____, ____
-)
-};

keyboards/handwired/dactyl_manuform/4x5/keymaps/via/keymap.c

@@ -0,0 +1,67 @@
+/*
+This is the c configuration file for the keymap
+
+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
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+
+#define SFT_ESC  SFT_T(KC_ESC)
+#define CTL_BSPC CTL_T(KC_BSPC)
+#define ALT_SPC  ALT_T(KC_SPC)
+#define SFT_ENT  SFT_T(KC_ENT)
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_QUOT,
+                          KC_LBRC, KC_RBRC,                                                        KC_MINS, KC_EQL,
+                                                     SFT_ESC, CTL_BSPC, ALT_SPC, SFT_ENT,
+                                                     KC_TAB,  KC_HOME,  KC_END,  KC_DEL,
+                                                     RAISE,   KC_GRV,   KC_LGUI, LOWER
+    ),
+
+    [_RAISE] = LAYOUT(
+        _______, _______, KC_MS_U, _______, _______,                                      KC_VOLU, _______, KC_UP,   _______, KC_PGUP,
+        _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,                                      KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
+        _______, _______, _______, _______, _______,                                      KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE,
+                 _______, _______,                                                                          KC_BTN1,  KC_BTN2,
+                                   _______, _______,                                      _______, _______,
+                                                     _______, _______,  _______, _______,
+                                                     _______, _______,  _______, _______
+    ),
+
+    [_LOWER] = LAYOUT(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+                 KC_F11,  KC_F12,                                                                           _______, _______,
+                                   _______, _______,                                      _______, _______,
+                                                     _______, _______,  _______, _______,
+                                                     _______, _______,  _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x5/readme.md

@@ -1,6 +1,22 @@
-## QMK Layouts
+## Dactyl Generator
 
-The following layout is supported:  
-| Layout | Diagram |
-| :---: | :---: |
-| Split_3x5_3 | ![split_3x5_3](https://i.imgur.com/vxnpauX.jpg) |
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 5
+    - Number of Rows: 4
+    - Last Row Key Count: Two (Default Dactyl Manuform)
+    - Inner Index Finger's Column: Normal
+    
+## LAYOUT_legacy
+
+Pre-2023 revamp, the 4x5 variant used a corne/crkbd wiring sequence. As wiring and pin definitions have been uniformed across variants and for backward compatibility purposes, a "legacy" layout with the corne/crkbd style wiring is available.
+
+Compile example:
+
+    qmk compile -kb handwired/dactyl_manuform/4x5 -km default -e FORCE_LAYOUT=LAYOUT_legacy
+
+Flash example:
+
+    qmk flash -kb handwired/dactyl_manuform/4x5 -km default -e FORCE_LAYOUT=LAYOUT_legacy

keyboards/handwired/dactyl_manuform/4x5_5/config.h

@@ -1,7 +0,0 @@
-// Copyright 2022 Shem Sedrick (@ssedrick)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define EE_HANDS
-#define SPLIT_USB_DETECT

keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json

@@ -1,90 +0,0 @@
-{
-    "keyboard_name": "Dactyl ManuForm 4x5_5",
-    "manufacturer": "ssedrick",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
-    "maintainer": "ssedrick",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3435",
-        "device_version": "0.0.1"
-    },
-    "features": {
-        "bootmagic": false,
-        "command": true,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "F6"],
-        "rows": ["F7", "B1", "B3", "B2", "B4"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "development_board": "promicro",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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": [5, 0], "x": 8, "y": 0},
-                {"matrix": [5, 1], "x": 9, "y": 0},
-                {"matrix": [5, 2], "x": 10, "y": 0},
-                {"matrix": [5, 3], "x": 11, "y": 0},
-                {"matrix": [5, 4], "x": 12, "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": [6, 0], "x": 8, "y": 1},
-                {"matrix": [6, 1], "x": 9, "y": 1},
-                {"matrix": [6, 2], "x": 10, "y": 1},
-                {"matrix": [6, 3], "x": 11, "y": 1},
-                {"matrix": [6, 4], "x": 12, "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": [7, 0], "x": 8, "y": 2},
-                {"matrix": [7, 1], "x": 9, "y": 2},
-                {"matrix": [7, 2], "x": 10, "y": 2},
-                {"matrix": [7, 3], "x": 11, "y": 2},
-                {"matrix": [7, 4], "x": 12, "y": 2},
-
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-
-                {"matrix": [8, 2], "x": 10, "y": 3},
-                {"matrix": [8, 3], "x": 11, "y": 3},
-
-                {"matrix": [3, 3], "x": 3, "y": 4},
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4},
-
-                {"matrix": [8, 1], "x": 9, "y": 4},
-                {"matrix": [9, 0], "x": 7, "y": 4},
-                {"matrix": [8, 0], "x": 8, "y": 4},
-
-                {"matrix": [4, 2], "x": 4, "y": 5},
-                {"matrix": [4, 3], "x": 5, "y": 5},
-
-                {"matrix": [9, 1], "x": 7, "y": 5},
-                {"matrix": [9, 2], "x": 8, "y": 5}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/4x5_5/readme.md

@@ -1,6 +0,0 @@
-## QMK Layouts
-
-The following layout is supported:  
-| Layout | Diagram |
-| :---: | :---: |
-| Split_3x5_3 | ![split_3x5_3](https://i.imgur.com/BHnwCkr.jpg) |

keyboards/handwired/dactyl_manuform/4x5_eic/keyboard.json

@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "Dactyl ManuForm 4x5 EIC",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dunk2k",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x045B",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4","C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.1},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+
+                {"matrix": [5, 0], "x": 7, "y": 0.1},
+                {"matrix": [5, 1], "x": 8, "y": 0.1},
+                {"matrix": [5, 2], "x": 9, "y": 0.1},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0.1},
+                {"matrix": [5, 5], "x": 12, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+
+                {"matrix": [6, 0], "x": 7, "y": 1.1},
+                {"matrix": [6, 1], "x": 8, "y": 1.1},
+                {"matrix": [6, 2], "x": 9, "y": 1.1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1.1},
+                {"matrix": [6, 5], "x": 12, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.1},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+
+                {"matrix": [7, 1], "x": 8, "y": 2.1},
+                {"matrix": [7, 2], "x": 9, "y": 2.1},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2.1},
+                {"matrix": [7, 5], "x": 12, "y": 2.6},
+
+                {"matrix": [3, 1], "x": 1, "y": 3.1},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3.1},
+
+                {"matrix": [3, 3], "x": 3, "y": 4.1},
+                {"matrix": [3, 4], "x": 4, "y": 4.3},
+
+                {"matrix": [8, 1], "x": 8, "y": 4.3},
+                {"matrix": [8, 2], "x": 9, "y": 4.1},
+
+                {"matrix": [4, 3], "x": 3, "y": 5.3},
+                {"matrix": [4, 4], "x": 4.5, "y": 5.3},
+
+                {"matrix": [9, 1], "x": 7.5, "y": 5.3},
+                {"matrix": [9, 2], "x": 9, "y": 5.3},
+
+                {"matrix": [4, 1], "x": 3, "y": 6.3},
+                {"matrix": [4, 2], "x": 4, "y": 6.3},
+
+                {"matrix": [9, 3], "x": 8, "y": 6.3},
+                {"matrix": [9, 4], "x": 9, "y": 6.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/4x5_eic/keymaps/default/keymap.c

@@ -0,0 +1,69 @@
+/*
+This is the c configuration file for the keymap
+
+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
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+
+#define SFT_ESC  SFT_T(KC_ESC)
+#define CTL_BSPC CTL_T(KC_BSPC)
+#define ALT_SPC  ALT_T(KC_SPC)
+#define SFT_ENT  SFT_T(KC_ENT)
+#define APP_N A(KC_TAB)
+#define APP_P LSA(KC_TAB)
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, APP_P,                           APP_N,  KC_Y, KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_HOME,                         KC_END, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                          KC_N, KC_M,    KC_COMM, KC_DOT,  KC_QUOT,
+                          KC_LBRC, KC_RBRC,                                                      KC_MINS, KC_EQL,
+                                                  SFT_ESC, CTL_BSPC,      ALT_SPC, SFT_ENT,
+                                                  KC_CAPS, KC_TAB,        KC_DEL,  KC_SLSH,
+                                                  RAISE,   KC_GRV,        KC_LGUI, LOWER
+    ),
+
+    [_RAISE] = LAYOUT(
+        _______, _______, KC_MS_U, _______, _______, _______,      _______, KC_VOLU, _______, KC_UP,   _______, KC_PGUP,
+        _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,      _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
+        _______, _______, _______, _______, _______,                        KC_VOLD, KC_BSLS, KC_PIPE, _______, _______,
+                 _______, _______,                                                            KC_BTN1, KC_BTN2,
+                                            _______, _______,      _______, _______,
+                                            _______, _______,      _______, _______,
+                                            _______, _______,      _______, _______
+    ),
+
+    [_LOWER] = LAYOUT(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,      _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+                 KC_F11,  KC_F12,                                                    _______, _______,
+                                            _______, _______,      _______, _______,
+                                            _______, _______,      _______, _______,
+                                            _______, _______,      _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x5_eic/keymaps/via/keymap.c

@@ -0,0 +1,69 @@
+/*
+This is the c configuration file for the keymap
+
+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
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+
+#define SFT_ESC  SFT_T(KC_ESC)
+#define CTL_BSPC CTL_T(KC_BSPC)
+#define ALT_SPC  ALT_T(KC_SPC)
+#define SFT_ENT  SFT_T(KC_ENT)
+#define APP_N A(KC_TAB)
+#define APP_P LSA(KC_TAB)
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, APP_P,                           APP_N,  KC_Y, KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_HOME,                         KC_END, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                          KC_N, KC_M,    KC_COMM, KC_DOT,  KC_QUOT,
+                          KC_LBRC, KC_RBRC,                                                      KC_MINS, KC_EQL,
+                                                  SFT_ESC, CTL_BSPC,      ALT_SPC, SFT_ENT,
+                                                  KC_CAPS, KC_TAB,        KC_DEL,  KC_SLSH,
+                                                  RAISE,   KC_GRV,        KC_LGUI, LOWER
+    ),
+
+    [_RAISE] = LAYOUT(
+        _______, _______, KC_MS_U, _______, _______, _______,      _______, KC_VOLU, _______, KC_UP,   _______, KC_PGUP,
+        _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,      _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
+        _______, _______, _______, _______, _______,                        KC_VOLD, KC_BSLS, KC_PIPE, _______, _______,
+                 _______, _______,                                                            KC_BTN1, KC_BTN2,
+                                            _______, _______,      _______, _______,
+                                            _______, _______,      _______, _______,
+                                            _______, _______,      _______, _______
+    ),
+
+    [_LOWER] = LAYOUT(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,      _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+                 KC_F11,  KC_F12,                                                    _______, _______,
+                                            _______, _______,      _______, _______,
+                                            _______, _______,      _______, _______,
+                                            _______, _______,      _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x5_eic/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/4x5_eic/readme.md

@@ -0,0 +1,10 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 5
+    - Number of Rows: 4
+    - Last Row Key Count: Two (Default Dactyl Manuform)
+    - Inner Index Finger's Column: Use inner column

keyboards/handwired/dactyl_manuform/4x6/keyboard.json

@@ -1,106 +1,98 @@
 {
-    "keyboard_name": "Dactyl Manuform 4x6",
+    "keyboard_name": "Dactyl ManuForm 4x6",
     "manufacturer": "tshort",
-    "url": "",
+    "url": "https://github.com/tshort/dactyl-keyboard",
     "maintainer": "qmk",
     "usb": {
         "vid": "0x444D",
-        "pid": "0x3436",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
+        "pid": "0x0460",
+        "device_version": "1.0.0"
     },
     "features": {
-        "bootmagic": false,
-        "command": true,
+        "bootmagic": true,
         "console": false,
+        "command": false,
         "extrakey": true,
-        "mousekey": true,
-        "nkro": false
+        "mousekey": true
     },
+    "development_board": "promicro",
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F7", "B1", "B3", "B2", "B6"]
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "enabled": true,
+        "enabled": true,   
         "soft_serial_pin": "D0"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
                 {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
 
-                {"matrix": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "y": 0},
+                {"matrix": [5, 0], "x": 8, "y": 0.1},
+                {"matrix": [5, 1], "x": 9, "y": 0.1},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0.1},
+                {"matrix": [5, 4], "x": 12, "y": 0.6},
+                {"matrix": [5, 5], "x": 13, "y": 0.6},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
 
-                {"matrix": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "y": 1},
+                {"matrix": [6, 0], "x": 8, "y": 1.1},
+                {"matrix": [6, 1], "x": 9, "y": 1.1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1.1},
+                {"matrix": [6, 4], "x": 12, "y": 1.6},
+                {"matrix": [6, 5], "x": 13, "y": 1.6},
 
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
                 {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
 
-                {"matrix": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
-                {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
+                {"matrix": [7, 0], "x": 8, "y": 2.1},
+                {"matrix": [7, 1], "x": 9, "y": 2.1},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2.1},
+                {"matrix": [7, 4], "x": 12, "y": 2.6},
+                {"matrix": [7, 5], "x": 13, "y": 2.6},
 
-                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
                 {"matrix": [3, 3], "x": 3, "y": 3},
 
-                {"matrix": [8, 2], "x": 13, "y": 3},
-                {"matrix": [8, 3], "x": 14, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3.1},
 
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [3, 5], "x": 5, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 4.1},
+                {"matrix": [3, 5], "x": 5, "y": 4.3},
 
-                {"matrix": [8, 0], "x": 11, "y": 4},
-                {"matrix": [8, 1], "x": 12, "y": 4},
+                {"matrix": [8, 0], "x": 8, "y": 4.3},
+                {"matrix": [8, 1], "x": 9, "y": 4.1},
 
-                {"matrix": [4, 4], "x": 6, "y": 5},
-                {"matrix": [4, 5], "x": 7, "y": 5},
+                {"matrix": [4, 4], "x": 4, "y": 5.3},
+                {"matrix": [4, 5], "x": 5.5, "y": 5.3},
 
-                {"matrix": [9, 0], "x": 9, "y": 5},
-                {"matrix": [9, 1], "x": 10, "y": 5},
+                {"matrix": [9, 0], "x": 7.5, "y": 5.3},
+                {"matrix": [9, 1], "x": 9, "y": 5.3},
 
-                {"matrix": [4, 2], "x": 6, "y": 6},
-                {"matrix": [4, 3], "x": 7, "y": 6},
+                {"matrix": [4, 2], "x": 4, "y": 6.3},
+                {"matrix": [4, 3], "x": 5, "y": 6.3},
 
-                {"matrix": [9, 2], "x": 9, "y": 6},
-                {"matrix": [9, 3], "x": 10, "y": 6}
+                {"matrix": [9, 2], "x": 8, "y": 6.3},
+                {"matrix": [9, 3], "x": 9, "y": 6.3}
             ]
         }
     }

keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c

@@ -1,45 +1,18 @@
-#include QMK_KEYBOARD_H
-
-#define _BASE 0
-#define _RAISE 1
-#define _LOWER 2
+// Copyright 2015 Tom Short (@tshort)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-#define SFT_ESC  SFT_T(KC_ESC)
-#define CTL_BSPC CTL_T(KC_BSPC)
-#define ALT_SPC  ALT_T(KC_SPC)
-#define SFT_ENT  SFT_T(KC_ENT)
+#include QMK_KEYBOARD_H
 
-#define KC_ML KC_MS_LEFT
-#define KC_MR KC_MS_RIGHT
-#define KC_MU KC_MS_UP
-#define KC_MD KC_MS_DOWN
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN1
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
 
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base (qwerty)
-     * +-----------------------------------------+                             +-----------------------------------------+
-     * | ESC  |   q  |   w  |   e  |   r  |   t  |                             |   y  |   u  |   i  |   o  |   p  |      |
-     * |------+------+------+------+------+------|                             |------+------+------+------+------+------|
-     * | TAB  |   a  |   s  |   d  |   f  |   g  |                             |   h  |   j  |   k  |   l  |   ;  |      |
-     * |------+------+------+------+------+------|                             |------+------+------+------+------+------|
-     * | SHFT |   z  |   x  |   c  |   v  |   b  |                             |   n  |   m  |   ,  |   .  |   /  |      |
-     * +------+------+------+------+-------------+                             +-------------+------+------+------+------+
-     *               |  [   |   ]  |                                                         |      |      |
-     *               +-------------+-------------+                             +-------------+-------------+
-     *                             |      |      |                             |      |      |
-     *                             |------+------|                             |------+------|
-     *                             |      |      |                             |      |      |
-     *                             +-------------+                             +-------------+
-     *                                           +-------------+ +-------------+
-     *                                           |      |      | |      |      |
-     *                                           |------+------| |------+------|
-     *                                           |      |      | |      |      |
-     *                                           +-------------+ +-------------+
-     */
     [_BASE] = LAYOUT(
         KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
         KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,

keyboards/handwired/dactyl_manuform/4x6/keymaps/via/keymap.c

@@ -24,46 +24,14 @@ enum layers{
     _BASE,
     _RAISE,
     _LOWER,
-    _BLANK
+    _BLANK,
 };
 
-#define SFT_ESC SFT_T(KC_ESC)
-#define CTL_BSPC CTL_T(KC_BSPC)
-#define ALT_SPC ALT_T(KC_SPC)
-#define SFT_ENT SFT_T(KC_ENT)
-
-#define KC_ML KC_MS_LEFT
-#define KC_MR KC_MS_RIGHT
-#define KC_MU KC_MS_UP
-#define KC_MD KC_MS_DOWN
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN1
-
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base (qwerty)
-     * +-----------------------------------------+                             +-----------------------------------------+
-     * | ESC  |   q  |   w  |   e  |   r  |   t  |                             |   y  |   u  |   i  |   o  |   p  |      |
-     * |------+------+------+------+------+------|                             |------+------+------+------+------+------|
-     * | TAB  |   a  |   s  |   d  |   f  |   g  |                             |   h  |   j  |   k  |   l  |   ;  |      |
-     * |------+------+------+------+------+------|                             |------+------+------+------+------+------|
-     * | SHFT |   z  |   x  |   c  |   v  |   b  |                             |   n  |   m  |   ,  |   .  |   /  |      |
-     * +------+------+------+------+-------------+                             +-------------+------+------+------+------+
-     *               |  [   |   ]  |                                                         |      |      |
-     *               +-------------+-------------+                             +-------------+-------------+
-     *                             |      |      |                             |      |      |
-     *                             |------+------|                             |------+------|
-     *                             |      |      |                             |      |      |
-     *                             +-------------+                             +-------------+
-     *                                           +-------------+ +-------------+
-     *                                           |      |      | |      |      |
-     *                                           |------+------| |------+------|
-     *                                           |      |      | |      |      |
-     *                                           +-------------+ +-------------+
-     */
     [_BASE] = LAYOUT(
         KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
         KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
@@ -105,4 +73,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 //clang-format on
-

keyboards/handwired/dactyl_manuform/4x6/readme.md

@@ -0,0 +1,11 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 4
+    - Last Row Key Count: Two (Default Dactyl Manuform)
+    - Inner Index Finger's Column: Normal
+    

keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json

@@ -1,111 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (4x6 + 4 and 3 for thumbs)",
-    "manufacturer": "joshreve",
-    "url": "https://github.com/joshreve/dactyl-keyboard",
-    "maintainer": "rek",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.1"
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "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"
-    },
-    "development_board": "promicro",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "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, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "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": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-
-                {"matrix": [10, 2], "x": 11, "y": 4},
-                {"matrix": [10, 3], "x": 12, "y": 4},
-                {"matrix": [10, 4], "x": 13, "y": 4},
-                {"matrix": [10, 5], "x": 14, "y": 4},
-
-                {"matrix": [5, 3], "x": 3, "y": 5},
-                {"matrix": [5, 4], "x": 4, "y": 5},
-                {"matrix": [5, 5], "x": 5, "y": 5},
-
-                {"matrix": [11, 0], "x": 14, "y": 5},
-                {"matrix": [11, 1], "x": 15, "y": 5},
-                {"matrix": [11, 2], "x": 16, "y": 5}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h

@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS

keyboards/handwired/dactyl_manuform/4x6_4_3/readme.md

@@ -1,9 +0,0 @@
-# Dactyl-Manuform (4x6 + 4 and 3 for thumbs)
-
-This is a 4x6 manuform with a 4 key bottom row and 3 key thumb clusters.
-
-The result is a 62 key layout.
-
-## Description
-
-* Keyboard Maintainer: https://github.com/joshreve/dactyl-keyboard

keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json

@@ -1,204 +0,0 @@
-{
-    "keyboard_name": "Dactyl Manuform 4x6 5 thumb keys",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3436",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "features": {
-        "bootmagic": false,
-        "command": true,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "community_layouts": ["split_3x6_3", "split_3x5_3"],
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
-                {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
-
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-
-                {"matrix": [8, 2], "x": 13, "y": 3},
-                {"matrix": [8, 3], "x": 14, "y": 3},
-
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 3], "x": 6, "y": 4},
-
-                {"matrix": [9, 2], "x": 10, "y": 4},
-                {"matrix": [9, 0], "x": 11, "y": 4},
-                {"matrix": [8, 1], "x": 12, "y": 4},
-
-                {"matrix": [4, 4], "x": 5, "y": 5},
-                {"matrix": [4, 2], "x": 6, "y": 5},
-
-                {"matrix": [9, 3], "x": 10, "y": 5},
-                {"matrix": [9, 1], "x": 11, "y": 5}
-            ]
-        },
-        "LAYOUT_split_3x6_3": {
-            "layout": [
-                {"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": [5, 0], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [5, 2], "x": 13, "y": 0},
-                {"matrix": [5, 3], "x": 14, "y": 0},
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
-                {"matrix": [6, 1], "x": 12, "y": 1},
-                {"matrix": [6, 2], "x": 13, "y": 1},
-                {"matrix": [6, 3], "x": 14, "y": 1},
-                {"matrix": [6, 4], "x": 15, "y": 1},
-                {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
-                {"matrix": [7, 1], "x": 12, "y": 2},
-                {"matrix": [7, 2], "x": 13, "y": 2},
-                {"matrix": [7, 3], "x": 14, "y": 2},
-                {"matrix": [7, 4], "x": 15, "y": 2},
-                {"matrix": [7, 5], "x": 16, "y": 2},
-
-                {"matrix": [3, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 3], "x": 6, "y": 4},
-
-                {"matrix": [9, 2], "x": 10, "y": 4},
-                {"matrix": [9, 0], "x": 11, "y": 4},
-                {"matrix": [8, 1], "x": 12, "y": 4}
-            ]
-        },
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0, "y": 0},
-                {"matrix": [0, 2], "x": 1, "y": 0},
-                {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0},
-                {"matrix": [0, 5], "x": 4, "y": 0},
-
-                {"matrix": [5, 0], "x": 10, "y": 0},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 4], "x": 14, "y": 0},
-
-                {"matrix": [1, 1], "x": 0, "y": 1},
-                {"matrix": [1, 2], "x": 1, "y": 1},
-                {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 4], "x": 3, "y": 1},
-                {"matrix": [1, 5], "x": 4, "y": 1},
-
-                {"matrix": [6, 0], "x": 10, "y": 1},
-                {"matrix": [6, 1], "x": 11, "y": 1},
-                {"matrix": [6, 2], "x": 12, "y": 1},
-                {"matrix": [6, 3], "x": 13, "y": 1},
-                {"matrix": [6, 4], "x": 14, "y": 1},
-
-                {"matrix": [2, 1], "x": 0, "y": 2},
-                {"matrix": [2, 2], "x": 1, "y": 2},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 3, "y": 2},
-                {"matrix": [2, 5], "x": 4, "y": 2},
-
-                {"matrix": [7, 0], "x": 10, "y": 2},
-                {"matrix": [7, 1], "x": 11, "y": 2},
-                {"matrix": [7, 2], "x": 12, "y": 2},
-                {"matrix": [7, 3], "x": 13, "y": 2},
-                {"matrix": [7, 4], "x": 14, "y": 2},
-
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [4, 5], "x": 5, "y": 3},
-                {"matrix": [4, 3], "x": 6, "y": 3},
-
-                {"matrix": [9, 2], "x": 8, "y": 3},
-                {"matrix": [9, 0], "x": 9, "y": 3},
-                {"matrix": [8, 1], "x": 10, "y": 3}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/config.h

@@ -1,24 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-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
-
-
-#define EE_HANDS

keyboards/handwired/dactyl_manuform/4x6_5/readme.md

@@ -1,7 +0,0 @@
-## QMK Layouts
-
-The following layouts are supported:  
-| Layout | Diagram |
-| :---: | :---: |
-| Split_3x6_3 | ![split_3x6_3](https://i.imgur.com/0XmjFw9.jpg) |
-| Split_3x5_3 | ![split_3x5_3](https://i.imgur.com/DYdFDKj.jpg) |

keyboards/handwired/dactyl_manuform/4x6_eic/keyboard.json

@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Dactyl ManuForm 4x6 EIC",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dunk2k",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x046B",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.1},
+
+                {"matrix": [5, 0], "x": 8, "y": 0.1},
+                {"matrix": [5, 1], "x": 9, "y": 0.1},
+                {"matrix": [5, 2], "x": 10, "y": 0.1},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0.1},
+                {"matrix": [5, 5], "x": 13, "y": 0.6},
+                {"matrix": [5, 6], "x": 14, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.1},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.1},
+                {"matrix": [6, 1], "x": 9, "y": 1.1},
+                {"matrix": [6, 2], "x": 10, "y": 1.1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1.1},
+                {"matrix": [6, 5], "x": 13, "y": 1.6},
+                {"matrix": [6, 6], "x": 14, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+                {"matrix": [7, 1], "x": 9, "y": 2.1},
+                {"matrix": [7, 2], "x": 10, "y": 2.1},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2.1},
+                {"matrix": [7, 5], "x": 13, "y": 2.6},
+                {"matrix": [7, 6], "x": 14, "y": 2.6},
+
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3.1},
+
+                {"matrix": [3, 4], "x": 4, "y": 4.1},
+                {"matrix": [3, 5], "x": 5, "y": 4.3},
+
+                {"matrix": [8, 1], "x": 9, "y": 4.3},
+                {"matrix": [8, 2], "x": 10, "y": 4.1},
+
+                {"matrix": [4, 4], "x": 4, "y": 5.3},
+                {"matrix": [4, 5], "x": 5.5, "y": 5.3},
+
+                {"matrix": [9, 1], "x": 8.5, "y": 5.3},
+                {"matrix": [9, 2], "x": 10, "y": 5.3},
+
+                {"matrix": [4, 2], "x": 4, "y": 6.3},
+                {"matrix": [4, 3], "x": 5, "y": 6.3},
+
+                {"matrix": [9, 3], "x": 9, "y": 6.3},
+                {"matrix": [9, 4], "x": 10, "y": 6.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/4x6_eic/keymaps/default/keymap.c

@@ -0,0 +1,46 @@
+// Copyright 2023 Duncan Sutherland (@dunk2k)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+#define APP_P LSA(KC_TAB)
+#define APP_N A(KC_TAB)
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q, KC_W,    KC_E,    KC_R,    KC_T,    APP_P,        APP_N,  KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,    KC_GRV,
+        KC_TAB,  KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,      KC_END, KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z, KC_X,    KC_C,    KC_V,    KC_B,                          KC_N,    KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
+                       KC_LBRC, KC_RBRC,                                                         KC_MINS, KC_EQL,
+                                         LOWER,   KC_SPC,                        KC_ENT,  RAISE,
+                                         KC_TAB,  KC_BSPC,                       KC_DEL,  KC_LCTL,
+                                         KC_CAPS, KC_LALT,                       KC_LGUI, KC_RSFT 
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, _______, _______, _______, KC_PGUP, KC_LBRC, _______,      _______, KC_RBRC, KC_P7,   KC_P8, KC_P9, _______, KC_PLUS,
+        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN, _______,      _______, KC_RPRN, KC_P4,   KC_P5, KC_P6, KC_MINS, KC_PIPE,
+        _______, _______, _______, _______, KC_PGDN, _______,                        _______, KC_P1,   KC_P2, KC_P3, KC_EQL,  KC_UNDS,
+                          KC_PAUS, KC_PSCR,                                                            KC_P0, KC_PENT,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+    ),
+
+    [_RAISE] = LAYOUT(
+        QK_BOOT, _______, _______, _______, KC_VOLU, _______, _______,      _______, _______, KC_NUM,  KC_INS,  KC_SCRL, _______, _______,
+        _______, _______, _______, _______, KC_MUTE, _______, _______,      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
+        _______, _______, _______, _______, KC_VOLD, _______,                        _______, _______, _______, _______, _______, _______,
+                          _______, _______,                                                            _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x6_eic/keymaps/via/keymap.c

@@ -0,0 +1,46 @@
+// Copyright 2023 Duncan Sutherland (@dunk2k)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+#define APP_P LSA(KC_TAB)
+#define APP_N A(KC_TAB)
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q, KC_W,    KC_E,    KC_R,    KC_T,    APP_P,        APP_N,  KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,    KC_GRV,
+        KC_TAB,  KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,      KC_END, KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z, KC_X,    KC_C,    KC_V,    KC_B,                          KC_N,    KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
+                       KC_LBRC, KC_RBRC,                                                         KC_MINS, KC_EQL,
+                                         LOWER,   KC_SPC,                        KC_ENT,  RAISE,
+                                         KC_TAB,  KC_BSPC,                       KC_DEL,  KC_LCTL,
+                                         KC_CAPS, KC_LALT,                       KC_LGUI, KC_RSFT 
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, _______, _______, _______, KC_PGUP, KC_LBRC, _______,      _______, KC_RBRC, KC_P7,   KC_P8, KC_P9, _______, KC_PLUS,
+        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN, _______,      _______, KC_RPRN, KC_P4,   KC_P5, KC_P6, KC_MINS, KC_PIPE,
+        _______, _______, _______, _______, KC_PGDN, _______,                        _______, KC_P1,   KC_P2, KC_P3, KC_EQL,  KC_UNDS,
+                          KC_PAUS, KC_PSCR,                                                            KC_P0, KC_PENT,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+    ),
+
+    [_RAISE] = LAYOUT(
+        QK_BOOT, _______, _______, _______, KC_VOLU, _______, _______,      _______, _______, KC_NUM,  KC_INS,  KC_SCRL, _______, _______,
+        _______, _______, _______, _______, KC_MUTE, _______, _______,      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
+        _______, _______, _______, _______, KC_VOLD, _______,                        _______, _______, _______, _______, _______, _______,
+                          _______, _______,                                                            _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x6_eic/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/4x6_eic/readme.md

@@ -0,0 +1,10 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 4
+    - Last Row Key Count: Two (Default Dactyl Manuform)
+    - Inner Index Finger's Column: Use inner column

keyboards/handwired/dactyl_manuform/4x6_ex/keyboard.json

@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Dactyl Manuform 4x6 EX",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dunk2k",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x046A",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+
+                {"matrix": [5, 0], "x": 8, "y": 0.1},
+                {"matrix": [5, 1], "x": 9, "y": 0.1},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0.1},
+                {"matrix": [5, 4], "x": 12, "y": 0.6},
+                {"matrix": [5, 5], "x": 13, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.1},
+                {"matrix": [6, 1], "x": 9, "y": 1.1},
+                {"matrix": [6, 2], "x": 10, "y": 1},
+                {"matrix": [6, 3], "x": 11, "y": 1.1},
+                {"matrix": [6, 4], "x": 12, "y": 1.6},
+                {"matrix": [6, 5], "x": 13, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+                {"matrix": [7, 0], "x": 8, "y": 2.1},
+                {"matrix": [7, 1], "x": 9, "y": 2.1},
+                {"matrix": [7, 2], "x": 10, "y": 2},
+                {"matrix": [7, 3], "x": 11, "y": 2.1},
+                {"matrix": [7, 4], "x": 12, "y": 2.6},
+                {"matrix": [7, 5], "x": 13, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3.1},
+                {"matrix": [8, 4], "x": 12, "y": 3.6},
+                {"matrix": [8, 5], "x": 13, "y": 3.6},
+
+                {"matrix": [3, 4], "x": 4, "y": 4.1},
+                {"matrix": [3, 5], "x": 5, "y": 4.3},
+
+                {"matrix": [8, 0], "x": 8, "y": 4.3},
+                {"matrix": [8, 1], "x": 9, "y": 4.1},
+
+                {"matrix": [4, 4], "x": 4, "y": 5.3},
+                {"matrix": [4, 5], "x": 5.5, "y": 5.3},
+
+                {"matrix": [9, 0], "x": 7.5, "y": 5.3},
+                {"matrix": [9, 1], "x": 9, "y": 5.3},
+
+                {"matrix": [4, 2], "x": 4, "y": 6.3},
+                {"matrix": [4, 3], "x": 5, "y": 6.3},
+
+                {"matrix": [9, 2], "x": 8, "y": 6.3},
+                {"matrix": [9, 3], "x": 9, "y": 6.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/4x6_ex/keymaps/default/keymap.c

@@ -0,0 +1,45 @@
+// Copyright 2015 Tom Short (@tshort)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_GRV,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LALT, KC_LBRC, KC_RBRC,                                          KC_MINS, KC_EQL,  KC_RALT, KC_RCTL,
+                                            RAISE,   KC_SPC,       KC_ENT,  LOWER,
+                                            KC_DEL,  KC_HOME,      KC_END,  KC_BSPC,
+                                            KC_CAPS, KC_LGUI,      KC_RGUI, KC_BSLS
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, _______, _______, _______, _______, KC_LBRC,             KC_RBRC, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
+        _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN,             KC_RPRN, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, KC_PIPE,
+        _______, _______, _______, _______, _______, _______,             _______, KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_UNDS,
+        _______, _______, _______, KC_PSCR,                                                 _______, KC_P0,   _______, _______,
+                                            _______, _______,             _______, _______,
+                                            _______, _______,             _______, _______,
+                                            _______, _______,             _______, _______
+    ),
+
+    [_RAISE] = LAYOUT(
+        _______, QK_BOOT, _______, _______, _______, KC_LBRC,             KC_RBRC, _______, KC_NUM,  KC_INS,  KC_SCRL, KC_MUTE,
+        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN,             KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+        _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, KC_VOLD,
+        _______, _______, _______, _______,                                                 KC_EQL,  _______, _______, _______,
+                                            _______, _______,             _______, _______,
+                                            _______, _______,             _______, _______,
+                                            _______, _______,             _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x6_ex/keymaps/via/keymap.c

@@ -0,0 +1,45 @@
+// Copyright 2015 Tom Short (@tshort)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_GRV,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LALT, KC_LBRC, KC_RBRC,                                          KC_MINS, KC_EQL,  KC_RALT, KC_RCTL,
+                                            RAISE,   KC_SPC,       KC_ENT,  LOWER,
+                                            KC_DEL,  KC_HOME,      KC_END,  KC_BSPC,
+                                            KC_CAPS, KC_LGUI,      KC_RGUI, KC_BSLS
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, _______, _______, _______, _______, KC_LBRC,             KC_RBRC, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
+        _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN,             KC_RPRN, KC_P4,   KC_P5,   KC_P6,   KC_PMNS, KC_PIPE,
+        _______, _______, _______, _______, _______, _______,             _______, KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_UNDS,
+        _______, _______, _______, KC_PSCR,                                                 _______, KC_P0,   _______, _______,
+                                            _______, _______,             _______, _______,
+                                            _______, _______,             _______, _______,
+                                            _______, _______,             _______, _______
+    ),
+
+    [_RAISE] = LAYOUT(
+        _______, QK_BOOT, _______, _______, _______, KC_LBRC,             KC_RBRC, _______, KC_NUM,  KC_INS,  KC_SCRL, KC_MUTE,
+        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN,             KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+        _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, KC_VOLD,
+        _______, _______, _______, _______,                                                 KC_EQL,  _______, _______, _______,
+                                            _______, _______,             _______, _______,
+                                            _______, _______,             _______, _______,
+                                            _______, _______,             _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x6_ex/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/4x6_ex/readme.md

@@ -0,0 +1,11 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 4
+    - Last Row Key Count: Use All Keys
+    - Inner Index Finger's Column: Normal
+    

keyboards/handwired/dactyl_manuform/4x6_exic/keyboard.json

@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Dactyl ManuForm 4x6 EXIC",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dunk2k",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x046C",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"],
+        "rows": ["F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.1},
+
+                {"matrix": [5, 0], "x": 8, "y": 0.1},
+                {"matrix": [5, 1], "x": 9, "y": 0.1},
+                {"matrix": [5, 2], "x": 10, "y": 0.1},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0.1},
+                {"matrix": [5, 5], "x": 13, "y": 0.6},
+                {"matrix": [5, 6], "x": 14, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.1},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.1},
+                {"matrix": [6, 1], "x": 9, "y": 1.1},
+                {"matrix": [6, 2], "x": 10, "y": 1.1},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1.1},
+                {"matrix": [6, 5], "x": 13, "y": 1.6},
+                {"matrix": [6, 6], "x": 14, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+                {"matrix": [7, 1], "x": 9, "y": 2.1},
+                {"matrix": [7, 2], "x": 10, "y": 2.1},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2.1},
+                {"matrix": [7, 5], "x": 13, "y": 2.6},
+                {"matrix": [7, 6], "x": 14, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3.1},
+                {"matrix": [8, 5], "x": 13, "y": 3.6},
+                {"matrix": [8, 6], "x": 14, "y": 3.6},
+
+                {"matrix": [3, 4], "x": 4, "y": 4.1},
+                {"matrix": [3, 5], "x": 5, "y": 4.3},
+
+                {"matrix": [8, 1], "x": 9, "y": 4.3},
+                {"matrix": [8, 2], "x": 10, "y": 4.1},
+
+                {"matrix": [4, 4], "x": 4, "y": 5.3},
+                {"matrix": [4, 5], "x": 5.5, "y": 5.3},
+
+                {"matrix": [9, 1], "x": 8.5, "y": 5.3},
+                {"matrix": [9, 2], "x": 10, "y": 5.3},
+
+                {"matrix": [4, 2], "x": 4, "y": 6.3},
+                {"matrix": [4, 3], "x": 5, "y": 6.3},
+
+                {"matrix": [9, 3], "x": 9, "y": 6.3},
+                {"matrix": [9, 4], "x": 10, "y": 6.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/4x6_exic/keymaps/default/keymap.c

@@ -0,0 +1,46 @@
+// Copyright 2023 Duncan Sutherland (@dunk2k)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+#define APP_P LSA(KC_TAB)
+#define APP_N A(KC_TAB)
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    APP_P,        APP_N,  KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,    KC_GRV,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,      KC_END, KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                          KC_N,    KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LALT, KC_LBRC, KC_RBRC,                                                         KC_MINS, KC_EQL, KC_RALT, KC_RCTL,
+                                         LOWER,   KC_SPC,                        KC_ENT,  RAISE,
+                                         KC_TAB,  KC_BSPC,                       KC_DEL,  KC_LCTL,
+                                         KC_CAPS, KC_LGUI,                       KC_RGUI, KC_BSLS   
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, _______, _______, _______, KC_PGUP, KC_LBRC, _______,      _______, KC_RBRC, KC_P7,   KC_P8, KC_P9,   _______, KC_PLUS,
+        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN, _______,      _______, KC_RPRN, KC_P4,   KC_P5, KC_P6,   KC_MINS, KC_PIPE,
+        _______, _______, _______, _______, KC_PGDN, _______,                        _______, KC_P1,   KC_P2, KC_P3,   KC_EQL,  KC_UNDS,
+        _______, _______, KC_PAUS, KC_PSCR,                                                            KC_P0, KC_PENT, _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+    ),
+
+    [_RAISE] = LAYOUT(
+        QK_BOOT, _______, _______, _______, KC_VOLU, _______, _______,      _______, _______, KC_NUM,  KC_INS,  KC_SCRL, _______, _______,
+        _______, _______, _______, _______, KC_MUTE, _______, _______,      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
+        _______, _______, _______, _______, KC_VOLD, _______,                        _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______,                                                            _______, _______, _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x6_exic/keymaps/via/keymap.c

@@ -0,0 +1,46 @@
+// Copyright 2023 Duncan Sutherland (@dunk2k)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _RAISE,
+    _LOWER,
+};
+#define APP_P LSA(KC_TAB)
+#define APP_N A(KC_TAB)
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    APP_P,        APP_N,  KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,    KC_GRV,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,      KC_END, KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                          KC_N,    KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LALT, KC_LBRC, KC_RBRC,                                                         KC_MINS, KC_EQL, KC_RALT, KC_RCTL,
+                                         LOWER,   KC_SPC,                        KC_ENT,  RAISE,
+                                         KC_TAB,  KC_BSPC,                       KC_DEL,  KC_LCTL,
+                                         KC_CAPS, KC_LGUI,                       KC_RGUI, KC_BSLS   
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, _______, _______, _______, KC_PGUP, KC_LBRC, _______,      _______, KC_RBRC, KC_P7,   KC_P8, KC_P9,   _______, KC_PLUS,
+        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN, _______,      _______, KC_RPRN, KC_P4,   KC_P5, KC_P6,   KC_MINS, KC_PIPE,
+        _______, _______, _______, _______, KC_PGDN, _______,                        _______, KC_P1,   KC_P2, KC_P3,   KC_EQL,  KC_UNDS,
+        _______, _______, KC_PAUS, KC_PSCR,                                                            KC_P0, KC_PENT, _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+    ),
+
+    [_RAISE] = LAYOUT(
+        QK_BOOT, _______, _______, _______, KC_VOLU, _______, _______,      _______, _______, KC_NUM,  KC_INS,  KC_SCRL, _______, _______,
+        _______, _______, _______, _______, KC_MUTE, _______, _______,      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,
+        _______, _______, _______, _______, KC_VOLD, _______,                        _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______,                                                            _______, _______, _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/4x6_exic/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/4x6_exic/readme.md

@@ -0,0 +1,10 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 4
+    - Last Row Key Count: Use All Keys
+    - Inner Index Finger's Column: Use inner column

keyboards/handwired/dactyl_manuform/5x6/keyboard.json

@@ -1,120 +1,115 @@
 {
-    "keyboard_name": "Dactyl-Manuform (5x6)",
+    "keyboard_name": "Dactyl ManuForm 5x6",
     "manufacturer": "tshort",
-    "url": "",
+    "url": "https://github.com/tshort/dactyl-keyboard",
     "maintainer": "qmk",
     "usb": {
         "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
+        "pid": "0x0560",
+        "device_version": "1.0.0"
     },
     "features": {
-        "bootmagic": false,
-        "command": true,
+        "bootmagic": true,
         "console": false,
+        "command": false,
         "extrakey": true,
-        "mousekey": true,
-        "nkro": false
+        "mousekey": true
     },
+    "development_board": "promicro",
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
     },
     "diode_direction": "COL2ROW",
     "split": {
-        "enabled": true,
+        "enabled": true,   
         "soft_serial_pin": "D0"
     },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_5x6": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_5x6": {
+        "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
                 {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
 
-                {"matrix": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "y": 0},
+                {"matrix": [6, 0], "x": 8, "y": 0.1},
+                {"matrix": [6, 1], "x": 9, "y": 0.1},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0.1},
+                {"matrix": [6, 4], "x": 12, "y": 0.6},
+                {"matrix": [6, 5], "x": 13, "y": 0.6},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
 
-                {"matrix": [7, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "y": 1},
+                {"matrix": [7, 0], "x": 8, "y": 1.1},
+                {"matrix": [7, 1], "x": 9, "y": 1.1},
+                {"matrix": [7, 2], "x": 10, "y": 1},
+                {"matrix": [7, 3], "x": 11, "y": 1.1},
+                {"matrix": [7, 4], "x": 12, "y": 1.6},
+                {"matrix": [7, 5], "x": 13, "y": 1.6},
 
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
                 {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
 
-                {"matrix": [8, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "y": 2},
+                {"matrix": [8, 0], "x": 8, "y": 2.1},
+                {"matrix": [8, 1], "x": 9, "y": 2.1},
+                {"matrix": [8, 2], "x": 10, "y": 2},
+                {"matrix": [8, 3], "x": 11, "y": 2.1},
+                {"matrix": [8, 4], "x": 12, "y": 2.6},
+                {"matrix": [8, 5], "x": 13, "y": 2.6},
 
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
                 {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
 
-                {"matrix": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "y": 3},
+                {"matrix": [9, 0], "x": 8, "y": 3.1},
+                {"matrix": [9, 1], "x": 9, "y": 3.1},
+                {"matrix": [9, 2], "x": 10, "y": 3},
+                {"matrix": [9, 3], "x": 11, "y": 3.1},
+                {"matrix": [9, 4], "x": 12, "y": 3.6},
+                {"matrix": [9, 5], "x": 13, "y": 3.6},
 
-                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4.1},
                 {"matrix": [4, 3], "x": 3, "y": 4},
 
-                {"matrix": [10, 2], "x": 13, "y": 4},
-                {"matrix": [10, 3], "x": 14, "y": 4},
+                {"matrix": [10, 2], "x": 10, "y": 4},
+                {"matrix": [10, 3], "x": 11, "y": 4.1},
 
-                {"matrix": [4, 4], "x": 4, "y": 5},
-                {"matrix": [4, 5], "x": 5, "y": 5},
+                {"matrix": [4, 4], "x": 4, "y": 5.1},
+                {"matrix": [4, 5], "x": 5, "y": 5.3},
 
-                {"matrix": [10, 0], "x": 11, "y": 5},
-                {"matrix": [10, 1], "x": 12, "y": 5},
+                {"matrix": [10, 0], "x": 8, "y": 5.3},
+                {"matrix": [10, 1], "x": 9, "y": 5.1},
 
-                {"matrix": [5, 4], "x": 6, "y": 6},
-                {"matrix": [5, 5], "x": 7, "y": 6},
+                {"matrix": [5, 4], "x": 4, "y": 6.3},
+                {"matrix": [5, 5], "x": 5.5, "y": 6.3},
 
-                {"matrix": [11, 0], "x": 9, "y": 6},
-                {"matrix": [11, 1], "x": 10, "y": 6},
+                {"matrix": [11, 0], "x": 7.5, "y": 6.3},
+                {"matrix": [11, 1], "x": 9, "y": 6.3},
 
-                {"matrix": [5, 2], "x": 6, "y": 7},
-                {"matrix": [5, 3], "x": 7, "y": 7},
+                {"matrix": [5, 2], "x": 4, "y": 7.3},
+                {"matrix": [5, 3], "x": 5, "y": 7.3},
 
-                {"matrix": [11, 2], "x": 9, "y": 7},
-                {"matrix": [11, 3], "x": 10, "y": 7}
+                {"matrix": [11, 2], "x": 8, "y": 7.3},
+                {"matrix": [11, 3], "x": 9, "y": 7.3}
             ]
         }
     }

keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h

@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS

keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c

@@ -1,14 +1,19 @@
+// Copyright 2015 Tom Short (tshort)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
+enum layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
 
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_5x6(
+    [_QWERTY] = LAYOUT(
         KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
         KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
         KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
@@ -19,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                          KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
     ),
 
-    [_LOWER] = LAYOUT_5x6(
+    [_LOWER] = LAYOUT(
         KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
         _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
         _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
@@ -31,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     ),
 
-    [_RAISE] = LAYOUT_5x6(
+    [_RAISE] = LAYOUT(
           KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
           _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
           _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,

keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h

@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-//#define EE_HANDS
-// Rows are doubled-up

keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/keymap.c

@@ -1,55 +0,0 @@
-/* A Swedish XMonad layout for the Dactyl Manuform 5x6 Keyboard */ 
-
-#include QMK_KEYBOARD_H
-#include "keymap_swedish.h"
-
-enum dactyl_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-};
-
-#define RAISE  MO(_RAISE)
-#define LOWER  MO(_LOWER)
-#define TERM   LGUI(LSFT(KC_ENT))
-#define ALTTAB LGUI(KC_TAB)
-#define KILL   LGUI(LSFT(KC_C))
-#define OPEN   LGUI(KC_P)
-#define KC_QSM LSFT(SE_PLUS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT_5x6(
-     KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                        KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , SE_QUOT,
-     KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                        KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , SE_ARNG,
-     KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                        KC_H   , KC_J   , KC_K   , KC_L   , SE_ODIA, SE_ADIA,
-     KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,                        KC_N   , KC_M   , KC_COMM, KC_DOT , SE_SLSH, SE_MINS,
-                       KC_EXLM, KC_QSM ,                                                            SE_PLUS, SE_EQL ,
-                                                  RAISE  , KC_SPC ,      KC_ENT , LOWER  ,
-                                                  ALTTAB , KC_LGUI,      KC_BSPC, KC_DEL ,
-                                                  OPEN   , TERM   ,      KILL   , KC_LALT
-  ),
-
-  [_LOWER] = LAYOUT_5x6(
-     SE_TILD, KC_EXLM,  SE_AT , KC_HASH, SE_DLR , KC_PERC,                        SE_CIRC, SE_AMPR, SE_ASTR, SE_SLSH, SE_LPRN, SE_RPRN,
-     SE_ACUT, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, SE_LCBR, SE_RCBR,
-     _______, _______, _______, _______, _______, _______,                        KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, SE_LBRC, SE_RBRC,
-     _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, SE_LABK, SE_RABK,
-                       _______, _______,                                                            _______, _______,
-                                                  _______, _______,      _______, _______,
-                                                  _______, _______,      _______, _______,
-                                                  _______, _______,      _______, _______
-
-  ),
-
-  [_RAISE] = LAYOUT_5x6(
-     KC_F12 , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                        KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-     _______, _______, _______, _______, _______, _______,                        QK_BOOT, _______, _______, _______, KC_MUTE, SE_PIPE,
-     _______, _______, _______, _______, _______, _______,                        KC_HOME, KC_PGDN, KC_PGUP, KC_END , KC_VOLU, SE_BSLS,
-     _______, _______, _______, _______, _______, _______,                        _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, _______,
-                       _______, _______,                                                            _______, _______, 
-                                                  _______, _______,      _______, _______,
-                                                  _______, _______,      _______, _______,
-                                                  _______, _______,      _______, _______
-  ),
-};

keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c

@@ -13,7 +13,7 @@ enum layers {
 #define LOWER MO(_LOWER)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_5x6(
+    [_QWERTY] = LAYOUT(
         KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
         KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
         KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                          KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
     ),
 
-    [_LOWER] = LAYOUT_5x6(
+    [_LOWER] = LAYOUT(
         KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
         _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
         _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     ),
 
-    [_RAISE] = LAYOUT_5x6(
+    [_RAISE] = LAYOUT(
           KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
           _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
           _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,

keyboards/handwired/dactyl_manuform/5x6/readme.md

@@ -0,0 +1,10 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 5
+    - Last Row Key Count: Two (Default Dactyl Manuform)
+    - Inner Index Finger's Column: Normal

keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json

@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (5x6+2)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "jceb",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.3"
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
-    "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",
-        "bootmagic": {
-            "matrix": [6, 5]
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_5x6_2_5": {
-            "layout": [
-                {"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": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "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, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "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": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4},
-                {"matrix": [5, 5], "x": 6, "y": 4},
-                {"matrix": [5, 3], "x": 7, "y": 4},
-
-                {"matrix": [11, 2], "x": 9, "y": 4},
-                {"matrix": [11, 0], "x": 10, "y": 4},
-                {"matrix": [10, 1], "x": 11, "y": 4},
-                {"matrix": [10, 2], "x": 13, "y": 4},
-                {"matrix": [10, 3], "x": 14, "y": 4},
-                {"matrix": [10, 4], "x": 15, "y": 4},
-                {"matrix": [10, 5], "x": 16, "y": 4},
-
-                {"matrix": [5, 4], "x": 6, "y": 5},
-                {"matrix": [5, 2], "x": 7, "y": 5},
-
-                {"matrix": [11, 3], "x": 9, "y": 5},
-                {"matrix": [11, 1], "x": 10, "y": 5}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/5x6_2_5/readme.md

@@ -1,13 +0,0 @@
-# Dactyl ManuForm Mini
-
-The Dactyl ManuForm Mini is a fork of the [Dactyl ManuForm](https://github.com/tshort/dactyl-keyboard). The Dactyl ManuForm is a fork of the [Dactyl](https://github.com/adereth/dactyl-keyboard) with the thumb cluster from [ManuForm](https://github.com/jeffgran/ManuForm).
-
-This [specific version](https://github.com/jceb/dactyl-manuform-mini-keyboard) of the Dactyl ManuForm Mini adds to additional keys to each side, CTRL and ALT, that are missing in the default configuration of the mini keyboard. In addition, a thumb cluster with 5 keys is enabled.
-
-The keyboard is custom built and handwired. There multiple build guides available.
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/dactyl_manuform/5x6_2_5:default
-
-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).

keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json

@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (5x6)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "jceb",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.2"
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "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",
-        "bootmagic": {
-            "matrix": [6, 5]
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_5x6_5": {
-            "layout": [
-                {"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": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "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, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "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": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4},
-                {"matrix": [5, 5], "x": 6, "y": 4},
-                {"matrix": [5, 3], "x": 7, "y": 4},
-
-                {"matrix": [11, 2], "x": 9, "y": 4},
-                {"matrix": [11, 0], "x": 10, "y": 4},
-                {"matrix": [10, 1], "x": 11, "y": 4},
-                {"matrix": [10, 2], "x": 13, "y": 4},
-                {"matrix": [10, 3], "x": 14, "y": 4},
-
-                {"matrix": [5, 4], "x": 6, "y": 5},
-                {"matrix": [5, 2], "x": 7, "y": 5},
-
-                {"matrix": [11, 3], "x": 9, "y": 5},
-                {"matrix": [11, 1], "x": 10, "y": 5}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/config.h

@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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
-
-#define EE_HANDS
-
-#define KINETIC_SPEED

keyboards/handwired/dactyl_manuform/5x6_5/keymaps/via/rules.mk

@@ -1 +0,0 @@
-VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json

@@ -1,113 +0,0 @@
-{
-    "manufacturer": "QMK",
-    "keyboard_name": "Dactyl Manuform 5x6+6",
-    "url": "https://github.com/fgoodwin/dactyl-manuform-5x6_6/tree/main/5x6_6",
-    "maintainer": "fgoodwin",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3536",
-        "device_version": "0.0.3"
-    },
-    "features": {
-        "bootmagic": false,
-        "command": true,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_split_5x6_6": {
-            "layout": [
-                {"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": [7, 0], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [7, 2], "x": 13, "y": 0},
-                {"matrix": [7, 3], "x": 14, "y": 0},
-                {"matrix": [7, 4], "x": 15, "y": 0},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
-                {"matrix": [8, 1], "x": 12, "y": 1},
-                {"matrix": [8, 2], "x": 13, "y": 1},
-                {"matrix": [8, 3], "x": 14, "y": 1},
-                {"matrix": [8, 4], "x": 15, "y": 1},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
-                {"matrix": [9, 1], "x": 12, "y": 2},
-                {"matrix": [9, 2], "x": 13, "y": 2},
-                {"matrix": [9, 3], "x": 14, "y": 2},
-                {"matrix": [9, 4], "x": 15, "y": 2},
-                {"matrix": [9, 5], "x": 16, "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": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [10, 0], "x": 11, "y": 3},
-                {"matrix": [10, 1], "x": 12, "y": 3},
-                {"matrix": [10, 2], "x": 13, "y": 3},
-                {"matrix": [10, 3], "x": 14, "y": 3},
-                {"matrix": [10, 4], "x": 15, "y": 3},
-                {"matrix": [10, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 5, "y": 4},
-                {"matrix": [4, 5], "x": 6, "y": 4},
-
-                {"matrix": [11, 0], "x": 7, "y": 4},
-                {"matrix": [11, 1], "x": 9, "y": 4},
-                {"matrix": [11, 2], "x": 10, "y": 4},
-                {"matrix": [11, 3], "x": 11, "y": 4},
-
-                {"matrix": [5, 4], "x": 13, "y": 4},
-                {"matrix": [5, 5], "x": 14, "y": 4},
-
-                {"matrix": [12, 0], "x": 5, "y": 5},
-                {"matrix": [12, 1], "x": 6, "y": 5},
-
-                {"matrix": [6, 4], "x": 7, "y": 5},
-                {"matrix": [6, 5], "x": 5, "y": 5},
-
-                {"matrix": [13, 0], "x": 9, "y": 5},
-                {"matrix": [13, 1], "x": 10, "y": 5}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c

@@ -1,39 +0,0 @@
-/*
-Copyright 2022 fgoodwin <fgoodwin@north-tech.net>
-
-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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_split_5x6_6(
-        KC_ESC,    KC_1,      KC_2,      KC_3,     KC_4,       KC_5,         KC_6,      KC_7,    KC_8,     KC_9,     KC_0,    KC_BSLS,
-        KC_GRV,    KC_Q,      KC_W,      KC_E,     KC_R,       KC_T,         KC_Y,      KC_U,    KC_I,     KC_O,     KC_P,    KC_EQL,
-        KC_TAB,    KC_A,      KC_S,      KC_D,     KC_F,       KC_G,         KC_H,      KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT,
-        KC_LSFT,     KC_Z,      KC_X,      KC_C,     KC_V,       KC_B,         KC_N,      KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, KC_MINS,
-                              KC_NO,     KC_LGUI,  KC_LCTL,    KC_SPC,       KC_RSFT,   KC_ENT,  KC_LBRC,     KC_RBRC,
-                                                   MO(1),      LCTL(KC_C),   KC_BSPC,   MO(1),
-                                                   KC_LALT,    LCTL(KC_V),   KC_DEL,    KC_RSFT
-    ),
-    [1] = LAYOUT_split_5x6_6(
-        KC_TRNS,   KC_F1,     KC_F2,     KC_F3,    KC_F4,         KC_F5,     KC_F6,       KC_F7,      KC_F8,       KC_F9,       KC_F10,     KC_F11,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,       KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,    KC_F12,
-        KC_TRNS,   KC_TRNS,   KC_PSCR,   KC_DOWN,  KC_UP,         KC_HOME,   KC_END,      KC_LEFT,    KC_RIGHT,    KC_TRNS,     KC_TRNS,    KC_TRNS,
-        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,       KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_BSLS,    KC_TRNS,
-                   QK_BOOT,     KC_TRNS,   KC_TRNS,  KC_TRNS,       KC_TRNS,   KC_TRNS,     KC_TRNS,    KC_TRNS,
-                                         MO(1),    LCTL(KC_C),    KC_TRNS,   MO(1),
-                                         KC_TRNS,  LCTL(KC_V),    KC_TRNS,   KC_TRNS
-    )
-};

keyboards/handwired/dactyl_manuform/5x6_6/readme.md

@@ -1,22 +0,0 @@
-# Dactyl Manuform (5x6) with 6 thumb cluster
-
-The [Dactyl-Manuform](https://github.com/tshort/dactyl-keyboard) is a split curved keyboard based on the design of [adereth dactyl](https://github.com/adereth/dactyl-keyboard) and thumb cluster design of the [manuform](https://geekhack.org/index.php?topic=46015.0) keyboard, the hardware is similar to the let's split keyboard. All information needed for making one is in the first link.
-
-![Imgur](https://i.imgur.com/MvtMG1vh.png)
-
-* Keyboard Maintainer: fgoodwin
-* Hardware Supported: Pro Micro Micro Micro USB or USB C
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/dactyl_manuform/5x6_6:default
-
-Flashing example for this keyboard:
-
-    make handwired/dactyl_manuform/5x6_6: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).
-
-Enter the bootloader in 2 ways:
-**Physical reset button**: Briefly press the reset button on the bottom of the case, or bridge the reset and ground pins momentarily on the pro micro
-**Keycode in layout**: Press the key mapped to `QK_BOOT` (by default hold down `MO(1)` and press the left most key in row 5 on the left hand half of the keyboard)

keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json

@@ -1,118 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (5x6) 68 Keys",
-    "manufacturer": "kpagratis",
-    "url": "",
-    "maintainer": "kpagratis",
-    "development_board": "promicro",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0016",
-        "device_version": "0.0.1"
-    },
-    "features": {
-        "bootmagic": true,
-        "command": true,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "ROW2COL",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"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": [6, 0], "x": 11, "y": 0},
-                {"matrix": [6, 1], "x": 12, "y": 0},
-                {"matrix": [6, 2], "x": 13, "y": 0},
-                {"matrix": [6, 3], "x": 14, "y": 0},
-                {"matrix": [6, 4], "x": 15, "y": 0},
-                {"matrix": [6, 5], "x": 16, "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, 0], "x": 11, "y": 1},
-                {"matrix": [7, 1], "x": 12, "y": 1},
-                {"matrix": [7, 2], "x": 13, "y": 1},
-                {"matrix": [7, 3], "x": 14, "y": 1},
-                {"matrix": [7, 4], "x": 15, "y": 1},
-                {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 2},
-                {"matrix": [8, 1], "x": 12, "y": 2},
-                {"matrix": [8, 2], "x": 13, "y": 2},
-                {"matrix": [8, 3], "x": 14, "y": 2},
-                {"matrix": [8, 4], "x": 15, "y": 2},
-                {"matrix": [8, 5], "x": 16, "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": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [9, 0], "x": 11, "y": 3},
-                {"matrix": [9, 1], "x": 12, "y": 3},
-                {"matrix": [9, 2], "x": 13, "y": 3},
-                {"matrix": [9, 3], "x": 14, "y": 3},
-                {"matrix": [9, 4], "x": 15, "y": 3},
-                {"matrix": [9, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-
-                {"matrix": [10, 2], "x": 13, "y": 4},
-                {"matrix": [10, 3], "x": 14, "y": 4},
-                {"matrix": [10, 4], "x": 15, "y": 4},
-                {"matrix": [10, 5], "x": 16, "y": 4},
-
-                {"matrix": [4, 4], "x": 4, "y": 5},
-                {"matrix": [4, 5], "x": 5, "y": 5},
-
-                {"matrix": [10, 0], "x": 11, "y": 5},
-                {"matrix": [10, 1], "x": 12, "y": 5},
-
-                {"matrix": [5, 4], "x": 6, "y": 6},
-                {"matrix": [5, 5], "x": 7, "y": 6},
-
-                {"matrix": [11, 0], "x": 9, "y": 6},
-                {"matrix": [11, 1], "x": 10, "y": 6},
-
-                {"matrix": [5, 2], "x": 6, "y": 7},
-                {"matrix": [5, 3], "x": 7, "y": 7},
-
-                {"matrix": [11, 2], "x": 9, "y": 7},
-                {"matrix": [11, 3], "x": 10, "y": 7}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/5x6_68/readme.md

@@ -1,5 +0,0 @@
-# Dactyl Manuform 5x6_68
-
-This is a Dactyl ManuForm 5x6 with an extended, 4 key, bottom row; totalling 68 keys.  
-
-![diagram](https://i.imgur.com/TGd36fWh.png)

keyboards/handwired/dactyl_manuform/5x6_eic/keyboard.json

@@ -0,0 +1,119 @@
+{
+    "keyboard_name": "Dactyl ManuForm 5x6 EIC",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dunk2k",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x056B",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "console": false,
+        "command": false,
+        "extrakey": true,
+        "mousekey": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.1},
+
+                {"matrix": [6, 0], "x": 8, "y": 0.1},
+                {"matrix": [6, 1], "x": 9, "y": 0.1},
+                {"matrix": [6, 2], "x": 10, "y": 0.1},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0.1},
+                {"matrix": [6, 5], "x": 13, "y": 0.6},
+                {"matrix": [6, 6], "x": 14, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.1},
+
+                {"matrix": [7, 0], "x": 8, "y": 1.1},
+                {"matrix": [7, 1], "x": 9, "y": 1.1},
+                {"matrix": [7, 2], "x": 10, "y": 1.1},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 4], "x": 12, "y": 1.1},
+                {"matrix": [7, 5], "x": 13, "y": 1.6},
+                {"matrix": [7, 6], "x": 14, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+                {"matrix": [2, 6], "x": 6, "y": 2.1},
+
+                {"matrix": [8, 0], "x": 8, "y": 2.1},
+                {"matrix": [8, 1], "x": 9, "y": 2.1},
+                {"matrix": [8, 2], "x": 10, "y": 2.1},
+                {"matrix": [8, 3], "x": 11, "y": 2},
+                {"matrix": [8, 4], "x": 12, "y": 2.1},
+                {"matrix": [8, 5], "x": 13, "y": 2.6},
+                {"matrix": [8, 6], "x": 14, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+
+                {"matrix": [9, 1], "x": 9, "y": 3.1},
+                {"matrix": [9, 2], "x": 10, "y": 3.1},
+                {"matrix": [9, 3], "x": 11, "y": 3},
+                {"matrix": [9, 4], "x": 12, "y": 3.1},
+                {"matrix": [9, 5], "x": 13, "y": 3.6},
+                {"matrix": [9, 6], "x": 14, "y": 3.6},
+
+                {"matrix": [4, 2], "x": 2, "y": 4.1},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 4], "x": 12, "y": 4.1},
+
+                {"matrix": [4, 4], "x": 4, "y": 5.1},
+                {"matrix": [4, 5], "x": 5, "y": 5.3},
+
+                {"matrix": [10, 1], "x": 9, "y": 5.3},
+                {"matrix": [10, 2], "x": 10, "y": 5.1},
+
+                {"matrix": [5, 4], "x": 4, "y": 6.3},
+                {"matrix": [5, 5], "x": 5.5, "y": 6.3},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 6.3},
+                {"matrix": [11, 2], "x": 10, "y": 6.3},
+
+                {"matrix": [5, 2], "x": 4, "y": 7.3},
+                {"matrix": [5, 3], "x": 5, "y": 7.3},
+
+                {"matrix": [11, 3], "x": 9, "y": 7.3},
+                {"matrix": [11, 4], "x": 10, "y": 7.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/5x6_eic/keymaps/default/keymap.c

@@ -0,0 +1,53 @@
+// Copyright 2023 Duncan Sutherland (@dunk2k)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+#define APP_P LSA(KC_TAB)
+#define APP_N A(KC_TAB)
+#define APPMGR G(KC_TAB)
+#define TSKMGR RCS(KC_ESC)
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_ESC,  KC_1, KC_2,    KC_3,    KC_4,    KC_5, APP_P,           APP_N, KC_6,   KC_7,    KC_8,    KC_9,   KC_0,    KC_GRV,
+        KC_CAPS, KC_Q, KC_W,    KC_E,    KC_R,    KC_T, KC_HOME,        KC_END, KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_BSLS,
+        KC_LSFT, KC_A, KC_S,    KC_D,    KC_F,    KC_G, APPMGR,         TSKMGR, KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+        KC_LCTL, KC_Z, KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,   KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RCTL,
+                       KC_LBRC, KC_RBRC,                                                         KC_MINS, KC_EQL,
+                                         LOWER,   KC_SPC,                      KC_ENT,  RAISE,
+                                         KC_TAB,  KC_BSPC,                     KC_DEL,  KC_RSFT,
+                                         KC_LALT, KC_LGUI,                     KC_RGUI, KC_RALT
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR , KC_PERC, _______,      _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
+        _______, _______, _______, _______, _______, KC_LBRC, _______,      _______, KC_RBRC, KC_P7,   KC_P8,   KC_P9,   _______, KC_PLUS,
+        _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, _______,      _______, KC_RPRN, KC_P4,   KC_P5,   KC_P6,   _______, KC_PIPE,
+        _______, _______, _______, _______, _______, _______,                        _______, KC_P1,   KC_P2,   KC_P3,   KC_PEQL, _______,
+                          KC_PAUS, KC_PSCR,                                                            KC_P0,   KC_PDOT,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+
+    ),
+
+    [_RAISE] = LAYOUT(
+          KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+          _______, _______, _______, _______, _______, KC_LBRC, _______,        _______, KC_RBRC, _______, KC_NUM,  KC_INS,  KC_SCRL, KC_MUTE,
+          _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_LPRN, _______,        _______, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+          _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, KC_VOLD,
+                            _______, _______,                                                              _______, _______,
+                                              _______, _______,                         _______, _______,
+                                              _______, _______,                         _______, _______,
+                                              _______, _______,                         _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/5x6_eic/keymaps/via/keymap.c

@@ -0,0 +1,53 @@
+// Copyright 2023 Duncan Sutherland (@dunk2k)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+#define APP_P LSA(KC_TAB)
+#define APP_N A(KC_TAB)
+#define APPMGR G(KC_TAB)
+#define TSKMGR RCS(KC_ESC)
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_ESC,  KC_1, KC_2,    KC_3,    KC_4,    KC_5, APP_P,           APP_N, KC_6,   KC_7,    KC_8,    KC_9,   KC_0,    KC_GRV,
+        KC_CAPS, KC_Q, KC_W,    KC_E,    KC_R,    KC_T, KC_HOME,        KC_END, KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_BSLS,
+        KC_LSFT, KC_A, KC_S,    KC_D,    KC_F,    KC_G, APPMGR,         TSKMGR, KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+        KC_LCTL, KC_Z, KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,   KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RCTL,
+                       KC_LBRC, KC_RBRC,                                                         KC_MINS, KC_EQL,
+                                         LOWER,   KC_SPC,                      KC_ENT,  RAISE,
+                                         KC_TAB,  KC_BSPC,                     KC_DEL,  KC_RSFT,
+                                         KC_LALT, KC_LGUI,                     KC_RGUI, KC_RALT
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR , KC_PERC, _______,      _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
+        _______, _______, _______, _______, _______, KC_LBRC, _______,      _______, KC_RBRC, KC_P7,   KC_P8,   KC_P9,   _______, KC_PLUS,
+        _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, _______,      _______, KC_RPRN, KC_P4,   KC_P5,   KC_P6,   _______, KC_PIPE,
+        _______, _______, _______, _______, _______, _______,                        _______, KC_P1,   KC_P2,   KC_P3,   KC_PEQL, _______,
+                          KC_PAUS, KC_PSCR,                                                            KC_P0,   KC_PDOT,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______,
+                                            _______, _______,                        _______, _______
+
+    ),
+
+    [_RAISE] = LAYOUT(
+          KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+          _______, _______, _______, _______, _______, KC_LBRC, _______,        _______, KC_RBRC, _______, KC_NUM,  KC_INS,  KC_SCRL, KC_MUTE,
+          _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_LPRN, _______,        _______, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+          _______, _______, _______, _______, _______, _______,                          _______, _______, _______, _______, _______, KC_VOLD,
+                            _______, _______,                                                              _______, _______,
+                                              _______, _______,                         _______, _______,
+                                              _______, _______,                         _______, _______,
+                                              _______, _______,                         _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/5x6_eic/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/5x6_eic/readme.md

@@ -0,0 +1,10 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 5
+    - Last Row Key Count: Two (Default Dactyl Manuform)
+    - Inner Index Finger's Column: Use inner column

keyboards/handwired/dactyl_manuform/5x6_ex/keyboard.json

@@ -0,0 +1,118 @@
+{
+    "keyboard_name": "Dactyl-Manuform 5x6 EX",
+    "manufacturer": "kpagratis",
+    "url": "",
+    "maintainer": "kpagratis",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0016",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "ROW2COL",
+    "split": {
+        "enabled": true,
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+
+                {"matrix": [6, 0], "x": 8, "y": 0.1},
+                {"matrix": [6, 1], "x": 9, "y": 0.1},
+                {"matrix": [6, 2], "x": 10, "y": 0},
+                {"matrix": [6, 3], "x": 11, "y": 0.1},
+                {"matrix": [6, 4], "x": 12, "y": 0.6},
+                {"matrix": [6, 5], "x": 13, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+
+                {"matrix": [7, 0], "x": 8, "y": 1.1},
+                {"matrix": [7, 1], "x": 9, "y": 1.1},
+                {"matrix": [7, 2], "x": 10, "y": 1},
+                {"matrix": [7, 3], "x": 11, "y": 1.1},
+                {"matrix": [7, 4], "x": 12, "y": 1.6},
+                {"matrix": [7, 5], "x": 13, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+                {"matrix": [8, 0], "x": 8, "y": 2.1},
+                {"matrix": [8, 1], "x": 9, "y": 2.1},
+                {"matrix": [8, 2], "x": 10, "y": 2},
+                {"matrix": [8, 3], "x": 11, "y": 2.1},
+                {"matrix": [8, 4], "x": 12, "y": 2.6},
+                {"matrix": [8, 5], "x": 13, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+
+                {"matrix": [9, 0], "x": 8, "y": 3.1},
+                {"matrix": [9, 1], "x": 9, "y": 3.1},
+                {"matrix": [9, 2], "x": 10, "y": 3},
+                {"matrix": [9, 3], "x": 11, "y": 3.1},
+                {"matrix": [9, 4], "x": 12, "y": 3.6},
+                {"matrix": [9, 5], "x": 13, "y": 3.6},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.6},
+                {"matrix": [4, 1], "x": 1, "y": 4.6},
+                {"matrix": [4, 2], "x": 2, "y": 4.1},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [10, 2], "x": 10, "y": 4},
+                {"matrix": [10, 3], "x": 11, "y": 4.1},
+                {"matrix": [10, 4], "x": 12, "y": 4.6},
+                {"matrix": [10, 5], "x": 13, "y": 4.6},
+
+                {"matrix": [4, 4], "x": 4, "y": 5.1},
+                {"matrix": [4, 5], "x": 5, "y": 5.3},
+
+                {"matrix": [10, 0], "x": 8, "y": 5.3},
+                {"matrix": [10, 1], "x": 9, "y": 5.1},
+
+                {"matrix": [5, 4], "x": 4, "y": 6.3},
+                {"matrix": [5, 5], "x": 5.5, "y": 6.3},
+
+                {"matrix": [11, 0], "x": 7.5, "y": 6.3},
+                {"matrix": [11, 1], "x": 9, "y": 6.3},
+
+                {"matrix": [5, 2], "x": 4, "y": 7.3},
+                {"matrix": [5, 3], "x": 5, "y": 7.3},
+
+                {"matrix": [11, 2], "x": 8, "y": 7.3},
+                {"matrix": [11, 3], "x": 9, "y": 7.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h → keyboards/handwired/dactyl_manuform/5x6_ex/keymaps/default/config.h

@@ -3,6 +3,5 @@
 
 #pragma once
 
-
 #define SPLIT_USB_DETECT
 #define TAPPING_TERM 250

keyboards/handwired/dactyl_manuform/5x6_ex/keymaps/via/keymap.c

@@ -0,0 +1,49 @@
+// Copyright 2023 Kostas Pagratis (@kpagratis)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,           KC_6,    KC_7,  KC_8,    KC_9,   KC_0,    KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,           KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,    KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,           KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,           KC_N,    KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LALT, KC_LBRC, KC_RBRC,                                          KC_MINS, KC_EQL, KC_RALT, KC_RCTL,
+                                            RAISE,   KC_SPC,         KC_ENT,  LOWER,
+                                            KC_HOME, KC_BSPC,        KC_DEL,  KC_END,
+                                            KC_PGUP, KC_LGUI,        KC_RGUI, KC_PGDN
+    ),
+
+    [_LOWER] = LAYOUT(
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+        _______, _______, _______, _______, _______, KC_LBRC,        KC_RBRC, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, KC_SCRL, KC_INS,  KC_PAUS, KC_PSCR, KC_LPRN,        KC_RPRN, KC_P4,   KC_P5,   KC_P6,   _______, _______,
+        _______, _______, _______, _______, _______, _______,        _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
+        _______, _______, _______, _______,                                            KC_P0,   KC_PDOT, _______, _______,
+                                            _______, _______,        _______, _______,
+                                            _______, _______,        _______, _______,
+                                            _______, _______,        _______, _______
+
+    ),
+
+    [_RAISE] = LAYOUT(
+        KC_F12,  KC_F1,   KC_F2,   KC_F3 ,  KC_F4,   KC_F5,          KC_F6,   KC_F7 ,  KC_F8,   KC_F9,   KC_F10 , KC_F11,
+        _______, _______, _______, _______, _______, KC_TRNS,        KC_TRNS, _______, KC_NUM,  _______, _______, KC_MUTE,
+        _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_TRNS,        KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+        _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, KC_VOLD,
+        _______, _______, _______, _______,                                            _______, _______, _______, _______,
+                                            _______, _______,        _______, _______,
+                                            _______, _______,        _______, _______,
+                                            _______, _______,        _______, _______
+    )
+};

keyboards/handwired/dactyl_manuform/5x6_ex/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/5x6_ex/readme.md

@@ -0,0 +1,10 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 5
+    - Last Row Key Count: Use All Keys
+    - Inner Index Finger's Column: Normal

keyboards/handwired/dactyl_manuform/5x6_exic/keyboard.json

@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Dactyl ManuForm 5x6 EXIC",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dunk2k",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x056C",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layout_aliases": {
+        "LAYOUT_5x7": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.1},
+
+                {"matrix": [6, 0], "x": 8, "y": 0.1},
+                {"matrix": [6, 1], "x": 9, "y": 0.1},
+                {"matrix": [6, 2], "x": 10, "y": 0.1},
+                {"matrix": [6, 3], "x": 11, "y": 0},
+                {"matrix": [6, 4], "x": 12, "y": 0.1},
+                {"matrix": [6, 5], "x": 13, "y": 0.6},
+                {"matrix": [6, 6], "x": 14, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.1},
+
+                {"matrix": [7, 0], "x": 8, "y": 1.1},
+                {"matrix": [7, 1], "x": 9, "y": 1.1},
+                {"matrix": [7, 2], "x": 10, "y": 1.1},
+                {"matrix": [7, 3], "x": 11, "y": 1},
+                {"matrix": [7, 4], "x": 12, "y": 1.1},
+                {"matrix": [7, 5], "x": 13, "y": 1.6},
+                {"matrix": [7, 6], "x": 14, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+                {"matrix": [2, 6], "x": 6, "y": 2.1},
+
+                {"matrix": [8, 0], "x": 8, "y": 2.1},
+                {"matrix": [8, 1], "x": 9, "y": 2.1},
+                {"matrix": [8, 2], "x": 10, "y": 2.1},
+                {"matrix": [8, 3], "x": 11, "y": 2},
+                {"matrix": [8, 4], "x": 12, "y": 2.1},
+                {"matrix": [8, 5], "x": 13, "y": 2.6},
+                {"matrix": [8, 6], "x": 14, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+
+                {"matrix": [9, 1], "x": 9, "y": 3.1},
+                {"matrix": [9, 2], "x": 10, "y": 3.1},
+                {"matrix": [9, 3], "x": 11, "y": 3},
+                {"matrix": [9, 4], "x": 12, "y": 3.1},
+                {"matrix": [9, 5], "x": 13, "y": 3.6},
+                {"matrix": [9, 6], "x": 14, "y": 3.6},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.6},
+                {"matrix": [4, 1], "x": 1, "y": 4.6},
+                {"matrix": [4, 2], "x": 2, "y": 4.1},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [10, 3], "x": 11, "y": 4},
+                {"matrix": [10, 4], "x": 12, "y": 4.1},
+                {"matrix": [10, 5], "x": 13, "y": 4.6},
+                {"matrix": [10, 6], "x": 14, "y": 4.6},
+
+                {"matrix": [4, 4], "x": 4, "y": 5.1},
+                {"matrix": [4, 5], "x": 5, "y": 5.3},
+
+                {"matrix": [10, 1], "x": 9, "y": 5.3},
+                {"matrix": [10, 2], "x": 10, "y": 5.1},
+
+                {"matrix": [5, 4], "x": 4, "y": 6.3},
+                {"matrix": [5, 5], "x": 5.5, "y": 6.3},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 6.3},
+                {"matrix": [11, 2], "x": 10, "y": 6.3},
+
+                {"matrix": [5, 2], "x": 4, "y": 7.3},
+                {"matrix": [5, 3], "x": 5, "y": 7.3},
+
+                {"matrix": [11, 3], "x": 9, "y": 7.3},
+                {"matrix": [11, 4], "x": 10, "y": 7.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/5x6_exic/keymaps/default/keymap.c

@@ -0,0 +1,50 @@
+// Copyright 2018 (@zwnk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    _QWERTY,
+    _FN,
+    _NUMPAD,
+};
+
+#define TASK RCS(KC_ESC)
+#define TAB_R C(KC_TAB)
+#define TAB_L RCS(KC_TAB)
+#define TAB_RO RCS(KC_T)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_ESC,        KC_1,    KC_2,  KC_3,  KC_4,    KC_5, KC_6,         KC_7,        KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,
+        KC_TAB,        KC_Q,    KC_W,  KC_E,  KC_R,    KC_T, KC_LBRC,      KC_RBRC,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LCTL,       KC_A,    KC_S,  KC_D,  KC_F,    KC_G, TAB_RO,       TG(_NUMPAD), KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        OSM(MOD_LSFT), KC_Z,    KC_X,  KC_C,  KC_V,    KC_B,                            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT),
+        KC_CAPS,       KC_LGUI, TAB_L, TAB_R,                                                             KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,
+                                              TT(_FN), KC_SPC,                          KC_BSPC, KC_ENT,
+                                              KC_END,  KC_HOME,                         KC_PGUP, KC_PGDN,
+                                              KC_PSCR, TASK,                            KC_LCTL, KC_LALT   
+    ),
+
+    [_FN] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,        KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        _______, _______, _______, KC_UP,   _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT,      _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______,
+        KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT,                                                            _______, _______, _______, _______,
+                                            _______, _______,                        KC_DEL, _______,
+                                            _______, _______,                       _______, _______,
+                                            _______, _______,                       _______, _______
+    ),
+
+    [_NUMPAD] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,       _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,       _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, KC_P1,   KC_P2,   KC_P3,   KC_PSLS, _______,
+        _______, _______, _______, _______,                                                             KC_P0,   KC_PDOT, _______, _______,
+                                            _______, _______,                         _______, KC_PENT,
+                                            _______, _______,                         _______, _______,
+                                            _______, _______,                         _______, _______        
+    )
+};

keyboards/handwired/dactyl_manuform/5x6_exic/keymaps/via/keymap.c

@@ -0,0 +1,50 @@
+// Copyright 2018 (@zwnk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    _QWERTY,
+    _FN,
+    _NUMPAD,
+};
+
+#define TASK RCS(KC_ESC)
+#define TAB_R C(KC_TAB)
+#define TAB_L RCS(KC_TAB)
+#define TAB_RO RCS(KC_T)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_ESC,        KC_1,    KC_2,  KC_3,  KC_4,    KC_5, KC_6,         KC_7,        KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,
+        KC_TAB,        KC_Q,    KC_W,  KC_E,  KC_R,    KC_T, KC_LBRC,      KC_RBRC,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LCTL,       KC_A,    KC_S,  KC_D,  KC_F,    KC_G, TAB_RO,       TG(_NUMPAD), KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        OSM(MOD_LSFT), KC_Z,    KC_X,  KC_C,  KC_V,    KC_B,                            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT),
+        KC_CAPS,       KC_LGUI, TAB_L, TAB_R,                                                             KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,
+                                              TT(_FN), KC_SPC,                          KC_BSPC, KC_ENT,
+                                              KC_END,  KC_HOME,                         KC_PGUP, KC_PGDN,
+                                              KC_PSCR, TASK,                            KC_LCTL, KC_LALT   
+    ),
+
+    [_FN] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,        KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        _______, _______, _______, KC_UP,   _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, QK_BOOT,      _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______,
+        KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT,                                                            _______, _______, _______, _______,
+                                            _______, _______,                        KC_DEL, _______,
+                                            _______, _______,                       _______, _______,
+                                            _______, _______,                       _______, _______
+    ),
+
+    [_NUMPAD] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,       _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,       _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, KC_P1,   KC_P2,   KC_P3,   KC_PSLS, _______,
+        _______, _______, _______, _______,                                                             KC_P0,   KC_PDOT, _______, _______,
+                                            _______, _______,                         _______, KC_PENT,
+                                            _______, _______,                         _______, _______,
+                                            _______, _______,                         _______, _______        
+    )
+};

keyboards/handwired/dactyl_manuform/5x6_exic/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/5x7/keyboard.json

@@ -1,131 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (5x7)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3537",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "features": {
-        "bootmagic": false,
-        "command": true,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_5x7": {
-            "layout": [
-                {"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": [0, 6], "x": 6, "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": [1, 6], "x": 6, "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": [2, 6], "x": 6, "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": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-
-                {"matrix": [4, 4], "x": 4, "y": 5},
-                {"matrix": [4, 5], "x": 5, "y": 5},
-
-                {"matrix": [5, 4], "x": 6, "y": 6},
-                {"matrix": [5, 5], "x": 7, "y": 6},
-
-                {"matrix": [5, 2], "x": 6, "y": 7},
-                {"matrix": [5, 3], "x": 7, "y": 7},
-
-                {"matrix": [6, 0], "x": 10, "y": 0},
-                {"matrix": [6, 1], "x": 11, "y": 0},
-                {"matrix": [6, 2], "x": 12, "y": 0},
-                {"matrix": [6, 3], "x": 13, "y": 0},
-                {"matrix": [6, 4], "x": 14, "y": 0},
-                {"matrix": [6, 5], "x": 15, "y": 0},
-                {"matrix": [6, 6], "x": 16, "y": 0},
-
-                {"matrix": [7, 0], "x": 10, "y": 1},
-                {"matrix": [7, 1], "x": 11, "y": 1},
-                {"matrix": [7, 2], "x": 12, "y": 1},
-                {"matrix": [7, 3], "x": 13, "y": 1},
-                {"matrix": [7, 4], "x": 14, "y": 1},
-                {"matrix": [7, 5], "x": 15, "y": 1},
-                {"matrix": [7, 6], "x": 16, "y": 1},
-
-                {"matrix": [8, 0], "x": 10, "y": 2},
-                {"matrix": [8, 1], "x": 11, "y": 2},
-                {"matrix": [8, 2], "x": 12, "y": 2},
-                {"matrix": [8, 3], "x": 13, "y": 2},
-                {"matrix": [8, 4], "x": 14, "y": 2},
-                {"matrix": [8, 5], "x": 15, "y": 2},
-                {"matrix": [8, 6], "x": 16, "y": 2},
-
-                {"matrix": [9, 1], "x": 11, "y": 3},
-                {"matrix": [9, 2], "x": 12, "y": 3},
-                {"matrix": [9, 3], "x": 13, "y": 3},
-                {"matrix": [9, 4], "x": 14, "y": 3},
-                {"matrix": [9, 5], "x": 15, "y": 3},
-                {"matrix": [9, 6], "x": 16, "y": 3},
-
-                {"matrix": [10, 3], "x": 13, "y": 4},
-                {"matrix": [10, 4], "x": 14, "y": 4},
-                {"matrix": [10, 5], "x": 15, "y": 4},
-                {"matrix": [10, 6], "x": 16, "y": 4},
-
-                {"matrix": [10, 1], "x": 11, "y": 5},
-                {"matrix": [10, 2], "x": 12, "y": 5},
-
-                {"matrix": [11, 1], "x": 9, "y": 6},
-                {"matrix": [11, 2], "x": 10, "y": 6},
-
-                {"matrix": [11, 3], "x": 9, "y": 7},
-                {"matrix": [11, 4], "x": 10, "y": 7}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h

@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS

keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c

@@ -1,80 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _FN     1
-#define _NUMPAD 2
-
-// Some basic macros
-#define TASK   LCTL(LSFT(KC_ESC))
-#define TAB_R  LCTL(KC_TAB)
-#define TAB_L  LCTL(LSFT(KC_TAB))
-#define TAB_RO LCTL(LSFT(KC_T))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_5x7(
-        // left hand
-        KC_ESC,    KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,
-        KC_TAB,    KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_LBRC,
-        KC_LCTL,   KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   TAB_RO,
-        OSM(MOD_LSFT),   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,
-        KC_CAPS,   KC_LGUI, TAB_L,   TAB_R,
-                                    TT(_FN), KC_SPC,
-                                    KC_END, KC_HOME,
-                                    KC_PSCR, TASK,
-        // right hand
-                          KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,
-                          KC_RBRC, KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_BSLS,
-                      TG(_NUMPAD), KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-                                   KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  OSM(MOD_RSFT),
-                                            KC_LEFT, KC_UP,    KC_DOWN,  KC_RGHT,
-             KC_BSPC, KC_ENT,
-             KC_PGUP, KC_PGDN,
-             KC_LCTL, KC_LALT
-    ),
-
-    [_FN] = LAYOUT_5x7(
-        // left hand
-        _______,   KC_F1,     KC_F2,      KC_F3,    KC_F4,     KC_F5,    KC_F6,
-        _______,   _______,   _______,    KC_UP,    _______,   _______,  _______,
-        _______,   _______,   KC_LEFT,    KC_DOWN,  KC_RGHT,   _______,  QK_BOOT,
-        _______,   _______,   _______,   _______,   _______,   _______,
-        KC_MSTP,   KC_MPLY,   KC_MPRV,   KC_MNXT,
-                                    _______, _______,
-                                    _______, _______,
-                                    _______, _______,
-        // right hand
-                          KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    _______,
-                          _______,   _______,   _______,   _______,   _______,   _______,   _______,
-                          _______,   _______,   _______,   _______,   _______,   _______,   _______,
-                                     _______,   _______,   _______,   _______,   _______,   _______,
-                                                           _______,   _______,   _______,   _______,
-             KC_DEL, _______,
-             _______, _______,
-             _______, _______
-    ),
-
-    [_NUMPAD] = LAYOUT_5x7(
-        // left hand
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,
-        _______,   _______,   _______,   _______,
-                                    _______, _______,
-                                    _______, _______,
-                                    _______, _______,
-        // right hand
-                          _______,   _______,   KC_NUM,    _______,   KC_PMNS,   KC_PPLS,   _______,
-                          _______,   _______,   KC_P7,     KC_P8,     KC_P9,     _______,   _______,
-                          _______,   _______,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   _______,
-                                     _______,   KC_P1,     KC_P2,     KC_P3,     KC_PSLS,   _______,
-                                                           KC_P0,     KC_PDOT,   _______,   _______,
-             _______, KC_PENT,
-             _______, _______,
-             _______, _______
-    ),
-};

keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h

@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS

keyboards/handwired/dactyl_manuform/5x7/keymaps/via/keymap.c

@@ -1,123 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _FN     1
-#define _NUMPAD 2
-#define _BLANK  3
-
-// Some basic macros
-#define TASK   LCTL(LSFT(KC_ESC))
-#define TAB_R  LCTL(KC_TAB)
-#define TAB_L  LCTL(LSFT(KC_TAB))
-#define TAB_RO LCTL(LSFT(KC_T))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_5x7(
-        // left hand
-        KC_ESC,    KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,
-        KC_TAB,    KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   KC_LBRC,
-        KC_LCTL,   KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   TAB_RO,
-        OSM(MOD_LSFT),   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,
-        KC_CAPS,   KC_LGUI, TAB_L,   TAB_R,
-                                    TT(_FN), KC_SPC,
-                                    KC_END, KC_HOME,
-                                    KC_PSCR, TASK,
-        // right hand
-                          KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_GRV,
-                          KC_RBRC, KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_BSLS,
-                      TG(_NUMPAD), KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-                                   KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  OSM(MOD_RSFT),
-                                            KC_LEFT, KC_UP,    KC_DOWN,  KC_RGHT,
-             KC_BSPC, KC_ENT,
-             KC_PGUP, KC_PGDN,
-             KC_LCTL, KC_LALT
-    ),
-
-    [_FN] = LAYOUT_5x7(
-        // left hand
-        _______,   KC_F1,     KC_F2,      KC_F3,    KC_F4,     KC_F5,    KC_F6,
-        _______,   _______,   _______,    KC_UP,    _______,   _______,  _______,
-        _______,   _______,   KC_LEFT,    KC_DOWN,  KC_RGHT,   _______,  QK_BOOT,
-        _______,   _______,   _______,   _______,   _______,   _______,
-        KC_MSTP,   KC_MPLY,   KC_MPRV,   KC_MNXT,
-                                    _______, _______,
-                                    _______, _______,
-                                    _______, _______,
-        // right hand
-                          KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    _______,
-                          _______,   _______,   _______,   _______,   _______,   _______,   _______,
-                          _______,   _______,   _______,   _______,   _______,   _______,   _______,
-                                     _______,   _______,   _______,   _______,   _______,   _______,
-                                                           _______,   _______,   _______,   _______,
-             KC_DEL, _______,
-             _______, _______,
-             _______, _______
-    ),
-
-    [_NUMPAD] = LAYOUT_5x7(
-        // left hand
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,
-        _______,   _______,   _______,   _______,
-                                    _______, _______,
-                                    _______, _______,
-                                    _______, _______,
-        // right hand
-                          _______,   _______,   KC_NUM,    _______,   KC_PMNS,   KC_PPLS,   _______,
-                          _______,   _______,   KC_P7,     KC_P8,     KC_P9,     _______,   _______,
-                          _______,   _______,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   _______,
-                                     _______,   KC_P1,     KC_P2,     KC_P3,     KC_PSLS,   _______,
-                                                           KC_P0,     KC_PDOT,   _______,   _______,
-             _______, KC_PENT,
-             _______, _______,
-             _______, _______
-    ),
-
-    [_NUMPAD] = LAYOUT_5x7(
-        // left hand
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,
-        _______,   _______,   _______,   _______,
-                                    _______, _______,
-                                    _______, _______,
-                                    _______, _______,
-        // right hand
-                          _______,   _______,   KC_NUM,    _______,   KC_PMNS,   KC_PPLS,   _______,
-                          _______,   _______,   KC_P7,     KC_P8,     KC_P9,     _______,   _______,
-                          _______,   _______,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   _______,
-                                     _______,   KC_P1,     KC_P2,     KC_P3,     KC_PSLS,   _______,
-                                                           KC_P0,     KC_PDOT,   _______,   _______,
-             _______, KC_PENT,
-             _______, _______,
-             _______, _______
-    ),
-
-    [_BLANK] = LAYOUT_5x7(
-        // left hand
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,  _______,
-        _______,   _______,   _______,   _______,   _______,   _______,
-        _______,   _______,   _______,   _______,
-                                    _______, _______,
-                                    _______, _______,
-                                    _______, _______,
-        // right hand
-                          _______,   _______,   _______,   _______,   _______,   _______,   _______,
-                          _______,   _______,   _______,   _______,   _______,   _______,   _______,
-                          _______,   _______,   _______,   _______,   _______,   _______,   _______,
-                                     _______,   _______,   _______,   _______,   _______,   _______,
-                                                           _______,   _______,   _______,   _______,
-             _______, _______,
-             _______, _______,
-             _______, _______
-    )
-};

keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h

@@ -19,21 +19,9 @@
 // in col2row col is input, and row is output
 // #define SPLIT_HAND_MATRIX_GRID A10, A4
 // 68kohm
-#define SPLIT_HAND_PIN              B10
+#define SPLIT_HAND_PIN B10
 
 /* connection */
 #define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
 #define SERIAL_USART_RX_PIN B7     // USART RX pin
 #define SERIAL_USART_TX_PIN B6     // USART TX pin
-
-#define SELECT_SOFT_SERIAL_SPEED 1 // or 0, 2, 3, 4, 5
-                                   //  0: 460800 baud
-                                   //  1: 230400 baud (default)
-                                   //  2: 115200 baud
-                                   //  3: 57600 baud
-                                   //  4: 38400 baud
-                                   //  5: 19200 baud
-#define SERIAL_USART_DRIVER SD1    // USART driver of TX and RX pin. default: SD1
-#define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-#define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
-#define SERIAL_USART_TIMEOUT 20    // USART driver timeout. default 20

keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json

@@ -1,4 +1,12 @@
 {
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "command": true
+    },
+    "development_board": "blackpill_f411",
     "matrix_pins": {
         "cols": ["B1", "B0", "A7", "A6", "A5", "A4"],
         "rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"]
@@ -9,13 +17,5 @@
         "bootmagic": {
             "matrix": [7, 0]
         }
-    },
-    "development_board": "blackpill_f411",
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": true,
-        "command": true
     }
 }

keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk

@@ -1,3 +1 @@
-# split settings
-# https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver
 SERIAL_DRIVER = usart

keyboards/handwired/dactyl_manuform/6x6/info.json

@@ -1,204 +1,120 @@
 {
-    "keyboard_name": "Dactyl-Manuform (6x6)",
+    "keyboard_name": "Dactyl ManuForm 6x6",
     "manufacturer": "tshort",
-    "url": "",
+    "url": "https://github.com/tshort/dactyl-keyboard",
     "maintainer": "qmk",
     "usb": {
         "vid": "0x444D",
-        "pid": "0x3636",
-        "device_version": "0.0.1"
+        "pid": "0x0660",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "layout_aliases": {
+        "LAYOUT_6x6": "LAYOUT"
     },
     "layouts": {
-        "LAYOUT_6x6": {
-            "layout": [
-                {"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": [7, 0], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [7, 2], "x": 13, "y": 0},
-                {"matrix": [7, 3], "x": 14, "y": 0},
-                {"matrix": [7, 4], "x": 15, "y": 0},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
-                {"matrix": [8, 1], "x": 12, "y": 1},
-                {"matrix": [8, 2], "x": 13, "y": 1},
-                {"matrix": [8, 3], "x": 14, "y": 1},
-                {"matrix": [8, 4], "x": 15, "y": 1},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
-                {"matrix": [9, 1], "x": 12, "y": 2},
-                {"matrix": [9, 2], "x": 13, "y": 2},
-                {"matrix": [9, 3], "x": 14, "y": 2},
-                {"matrix": [9, 4], "x": 15, "y": 2},
-                {"matrix": [9, 5], "x": 16, "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": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [10, 0], "x": 11, "y": 3},
-                {"matrix": [10, 1], "x": 12, "y": 3},
-                {"matrix": [10, 2], "x": 13, "y": 3},
-                {"matrix": [10, 3], "x": 14, "y": 3},
-                {"matrix": [10, 4], "x": 15, "y": 3},
-                {"matrix": [10, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-
-                {"matrix": [11, 0], "x": 11, "y": 4},
-                {"matrix": [11, 1], "x": 12, "y": 4},
-                {"matrix": [11, 2], "x": 13, "y": 4},
-                {"matrix": [11, 3], "x": 14, "y": 4},
-                {"matrix": [11, 4], "x": 15, "y": 4},
-                {"matrix": [11, 5], "x": 16, "y": 4},
-
-                {"matrix": [5, 2], "x": 2, "y": 5},
-                {"matrix": [5, 3], "x": 3, "y": 5},
-
-                {"matrix": [12, 2], "x": 13, "y": 5},
-                {"matrix": [12, 3], "x": 14, "y": 5},
-
-                {"matrix": [5, 4], "x": 4, "y": 6},
-                {"matrix": [5, 5], "x": 5, "y": 6},
-
-                {"matrix": [12, 0], "x": 11, "y": 6},
-                {"matrix": [12, 1], "x": 12, "y": 6},
-
-                {"matrix": [6, 4], "x": 6, "y": 7},
-                {"matrix": [6, 5], "x": 7, "y": 7},
-
-                {"matrix": [13, 0], "x": 9, "y": 7},
-                {"matrix": [13, 1], "x": 10, "y": 7},
-
-                {"matrix": [6, 2], "x": 6, "y": 8},
-                {"matrix": [6, 3], "x": 7, "y": 8},
-
-                {"matrix": [13, 2], "x": 9, "y": 8},
-                {"matrix": [13, 3], "x": 10, "y": 8}
-            ]
-        },
-        "LAYOUT_6x6_5_thumb": {
+        "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
                 {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-
-                {"matrix": [7, 0], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [7, 2], "x": 13, "y": 0},
-                {"matrix": [7, 3], "x": 14, "y": 0},
-                {"matrix": [7, 4], "x": 15, "y": 0},
-                {"matrix": [7, 5], "x": 16, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+
+                {"matrix": [7, 0], "x": 8, "y": 0.1},
+                {"matrix": [7, 1], "x": 9, "y": 0.1},
+                {"matrix": [7, 2], "x": 10, "y": 0},
+                {"matrix": [7, 3], "x": 11, "y": 0.1},
+                {"matrix": [7, 4], "x": 12, "y": 0.6},
+                {"matrix": [7, 5], "x": 13, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
                 {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-
-                {"matrix": [8, 0], "x": 11, "y": 1},
-                {"matrix": [8, 1], "x": 12, "y": 1},
-                {"matrix": [8, 2], "x": 13, "y": 1},
-                {"matrix": [8, 3], "x": 14, "y": 1},
-                {"matrix": [8, 4], "x": 15, "y": 1},
-                {"matrix": [8, 5], "x": 16, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+
+                {"matrix": [8, 0], "x": 8, "y": 1.1},
+                {"matrix": [8, 1], "x": 9, "y": 1.1},
+                {"matrix": [8, 2], "x": 10, "y": 1},
+                {"matrix": [8, 3], "x": 11, "y": 1.1},
+                {"matrix": [8, 4], "x": 12, "y": 1.6},
+                {"matrix": [8, 5], "x": 13, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
                 {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-
-                {"matrix": [9, 0], "x": 11, "y": 2},
-                {"matrix": [9, 1], "x": 12, "y": 2},
-                {"matrix": [9, 2], "x": 13, "y": 2},
-                {"matrix": [9, 3], "x": 14, "y": 2},
-                {"matrix": [9, 4], "x": 15, "y": 2},
-                {"matrix": [9, 5], "x": 16, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+                {"matrix": [9, 0], "x": 8, "y": 2.1},
+                {"matrix": [9, 1], "x": 9, "y": 2.1},
+                {"matrix": [9, 2], "x": 10, "y": 2},
+                {"matrix": [9, 3], "x": 11, "y": 2.1},
+                {"matrix": [9, 4], "x": 12, "y": 2.6},
+                {"matrix": [9, 5], "x": 13, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
                 {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [10, 0], "x": 11, "y": 3},
-                {"matrix": [10, 1], "x": 12, "y": 3},
-                {"matrix": [10, 2], "x": 13, "y": 3},
-                {"matrix": [10, 3], "x": 14, "y": 3},
-                {"matrix": [10, 4], "x": 15, "y": 3},
-                {"matrix": [10, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+
+                {"matrix": [10, 0], "x": 8, "y": 3.1},
+                {"matrix": [10, 1], "x": 9, "y": 3.1},
+                {"matrix": [10, 2], "x": 10, "y": 3},
+                {"matrix": [10, 3], "x": 11, "y": 3.1},
+                {"matrix": [10, 4], "x": 12, "y": 3.6},
+                {"matrix": [10, 5], "x": 13, "y": 3.6},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.6},
+                {"matrix": [4, 1], "x": 1, "y": 4.6},
+                {"matrix": [4, 2], "x": 2, "y": 4.1},
                 {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.1},
+                {"matrix": [4, 5], "x": 5, "y": 4.1},
 
-                {"matrix": [11, 0], "x": 11, "y": 4},
-                {"matrix": [11, 1], "x": 12, "y": 4},
-                {"matrix": [11, 2], "x": 13, "y": 4},
-                {"matrix": [11, 3], "x": 14, "y": 4},
-                {"matrix": [11, 4], "x": 15, "y": 4},
-                {"matrix": [11, 5], "x": 16, "y": 4},
+                {"matrix": [11, 0], "x": 8, "y": 4.1},
+                {"matrix": [11, 1], "x": 9, "y": 4.1},
+                {"matrix": [11, 2], "x": 10, "y": 4},
+                {"matrix": [11, 3], "x": 11, "y": 4.1},
+                {"matrix": [11, 4], "x": 12, "y": 4.6},
+                {"matrix": [11, 5], "x": 13, "y": 4.6},
 
-                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5.1},
                 {"matrix": [5, 3], "x": 3, "y": 5},
 
-                {"matrix": [12, 2], "x": 13, "y": 5},
-                {"matrix": [12, 3], "x": 14, "y": 5},
+                {"matrix": [12, 2], "x": 10, "y": 5},
+                {"matrix": [12, 3], "x": 11, "y": 5.1},
 
-                {"matrix": [5, 4], "x": 4, "y": 6},
+                {"matrix": [5, 4], "x": 4, "y": 6.1},
+                {"matrix": [5, 5], "x": 5, "y": 6.3},
 
-                {"matrix": [12, 1], "x": 12, "y": 6},
+                {"matrix": [12, 0], "x": 8, "y": 6.3},
+                {"matrix": [12, 1], "x": 9, "y": 6.1},
 
-                {"matrix": [6, 4], "x": 6, "y": 7},
-                {"matrix": [6, 5], "x": 7, "y": 7},
+                {"matrix": [6, 4], "x": 4, "y": 7.3},
+                {"matrix": [6, 5], "x": 5.5, "y": 7.3},
 
-                {"matrix": [13, 0], "x": 9, "y": 7},
-                {"matrix": [13, 1], "x": 10, "y": 7},
+                {"matrix": [13, 0], "x": 7.5, "y": 7.3},
+                {"matrix": [13, 1], "x": 9, "y": 7.3},
 
-                {"matrix": [6, 2], "x": 6, "y": 8},
-                {"matrix": [6, 3], "x": 7, "y": 8},
+                {"matrix": [6, 2], "x": 4, "y": 8.3},
+                {"matrix": [6, 3], "x": 5, "y": 8.3},
 
-                {"matrix": [13, 2], "x": 9, "y": 8},
-                {"matrix": [13, 3], "x": 10, "y": 8}
+                {"matrix": [13, 2], "x": 8, "y": 8.3},
+                {"matrix": [13, 3], "x": 9, "y": 8.3}
             ]
         }
     }

keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h

@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-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
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS

keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c

@@ -13,7 +13,7 @@ enum custom_layers {
 #define LOWER MO(_LOWER)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_6x6(
+    [_QWERTY] = LAYOUT(
         KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
         KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
         KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                          KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
     ),
 
-    [_LOWER] = LAYOUT_6x6(
+    [_LOWER] = LAYOUT(
         KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6  ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
         KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
         _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                 _______,_______,            _______,_______
     ),
 
-    [_RAISE] = LAYOUT_6x6(
+    [_RAISE] = LAYOUT(
         KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
         _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
         _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,

keyboards/handwired/dactyl_manuform/6x6/keymaps/via/keymap.c

@@ -0,0 +1,51 @@
+// Copyright 2021 david@impstyle.com (@zwnk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
+        KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
+        KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
+        KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
+        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
+                         KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
+                                         RAISE ,KC_SPC,                        KC_ENT, LOWER,
+                                         KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
+                                         KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
+    ),
+
+    [_LOWER] = LAYOUT(
+        KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6  ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
+        KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
+        _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
+        _______,_______,_______,_______,_______,_______,                        _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
+                                                _______,KC_PSCR,            _______, KC_P0,
+                                                _______,_______,            _______,_______,
+                                                _______,_______,            _______,_______,
+                                                _______,_______,            _______,_______
+    ),
+
+    [_RAISE] = LAYOUT(
+        KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
+        _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
+        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
+        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______,
+                                                _______,_______,            KC_EQL ,_______,
+                                                _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______
+    )
+};

keyboards/handwired/dactyl_manuform/6x6/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json

@@ -1,4 +1,5 @@
 {
+    "development_board": "promicro",
     "matrix_pins": {
         "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
         "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
@@ -7,19 +8,5 @@
     "split": {
         "enabled": true,
         "soft_serial_pin": "D0"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "features": {
-        "bootmagic": false,
-        "mousekey": true,
-        "extrakey": true,
-        "command": true
     }
 }

keyboards/handwired/dactyl_manuform/6x6/readme.md

@@ -1,63 +1,10 @@
-# Dactyl Manuform (6x6) optional 5thumb cluster
-
-## Dactyl Manufrom 6x6
-
-![Dactyl Manufrom 6x6](https://i.imgur.com/j8dsBgs.jpeg)
-
-## Dactyl Manufrom 6x6 with 5 key thumb cluster
-
-![Dactyl Manufrom 6x6 with thumb](https://i.imgur.com/C7FRiwd.jpeg)
-
-## Description
-
-* Keyboard Maintainer: [dumam for 5thumb](https://github.com/DuMaM) and others
-* Hardware Supported: STM32F4BlackPill, Promicro and clones
-
-Basic guide how to build 6x6 board is in root keyboard dir. This will help you to to create your own board with 6key based cluster with promicro. [For more click here](../readme.md).
-
-If you want to use 5thumb cluster or stm32, you also should read base guide, but please came back here after you finish 😉.
-
-For my build I used stm32f411 black pill. It's pretty cheap board and I highly recommend you to buy one from official distributors, to support board creators. [To buy it, please go into designer site](https://github.com/WeActStudio/WeActStudio.MiniSTM32F4x1).
-
-I recommend using stm32 boards for this project, because QMK recently added support for [tinyuf2 bootloader](https://github.com/adafruit/tinyuf2). This bootloader is great for cases where you are going to use QMK Configurator and don't want to use any command line interface. This way when you need change keyboard layout, you only need an UF2 file. Setting up board in boot mode will allow you to drag and drop it on to created STM32F flash drive.
-![BlackPill Schematic](blackpill_f411/STM32F4x1_PinoutDiagram_RichardBalint.png "Schematic of stm32f4 blackpill")
-
-For case I used 3D models form here. Big thanks to creators.
-
-- [dactyl-manuform-mini-keyboard](https://github.com/l4u/dactyl-manuform-mini-keyboard)
-- [dactyl-manuform](https://github.com/carbonfet/dactyl-manuform)
-- [Good build guide](https://medium.com/swlh/complete-idiot-guide-for-building-a-dactyl-manuform-keyboard-53454845b065)
-
-## STM32 Usage
-
-![BlackPill](https://raw.githubusercontent.com/WeActTC/MiniSTM32F4x1/master/images/STM32F4x1_PinoutDiagram_RichardBalint.png)
-
-My fixes allows for using STM32 with all keymaps located in this dir. Please note that you need to pull down and up B10 pin. I used here 68kohm resistor. Don't use bigger one then 100kohm and lower then 10kohm. Pin you should use for this it B10. [More can be found here](https://beta.docs.qmk.fm/using-qmk/hardware-features/feature_split_keyboard#setting-handedness).
-
-### Features
-
-- any board could be master one, and they can be used separately from each other
-- it's using full usart (4 cables), mostly due to some stability and half detection problems
-- easy keymaps update -> drag and drop file
-- pin used for rows (B12, B13, B14, B15, A8 , A9, A10) and for cols (B1, B0, A7, A6, A5, A4)
-
-## Build
-
-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).
-After setting up your build environment you can try to build it with those commands.
-
-Make Promicro based img:
-
-    qmk compile -kb keyboards/handwired/dactyl_manuform/6x6 -km default
-
-Make BlackPill one:
-
-    qmk compile -kb keyboards/handwired/dactyl_manuform/6x6/blackpill_f411 -km default
-
-## Bootloader for BlackPill
-
-Enter the bootloader in 3 ways:
-
-* **Bootmagic reset**: Hold down the key at F1 for left side, and F7 for right side.
-* **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`, in dumam keymap it's assigned to F1 and F12 keys on mod layers.
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 6
+    - Last Row Key Count: Two (Default Dactyl Manuform)
+    - Inner Index Finger's Column: Normal

keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json

@@ -1,139 +0,0 @@
-{
-    "keyboard_name": "Dactyl-Manuform (6x6+4)",
-    "manufacturer": "tshort",
-    "url": "",
-    "maintainer": "dmik",
-    "usb": {
-        "vid": "0x444D",
-        "pid": "0x3636",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "led_count": 12
-    },
-    "ws2812": {
-        "pin": "D3"
-    },
-    "features": {
-        "bootmagic": false,
-        "command": true,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false
-    },
-    "matrix_pins": {
-        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
-        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
-    },
-    "diode_direction": "COL2ROW",
-    "split": {
-        "enabled": true,
-        "soft_serial_pin": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT_6x6_4": {
-            "layout": [
-                {"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": [7, 0], "x": 11, "y": 0},
-                {"matrix": [7, 1], "x": 12, "y": 0},
-                {"matrix": [7, 2], "x": 13, "y": 0},
-                {"matrix": [7, 3], "x": 14, "y": 0},
-                {"matrix": [7, 4], "x": 15, "y": 0},
-                {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
-                {"matrix": [8, 1], "x": 12, "y": 1},
-                {"matrix": [8, 2], "x": 13, "y": 1},
-                {"matrix": [8, 3], "x": 14, "y": 1},
-                {"matrix": [8, 4], "x": 15, "y": 1},
-                {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
-                {"matrix": [9, 1], "x": 12, "y": 2},
-                {"matrix": [9, 2], "x": 13, "y": 2},
-                {"matrix": [9, 3], "x": 14, "y": 2},
-                {"matrix": [9, 4], "x": 15, "y": 2},
-                {"matrix": [9, 5], "x": 16, "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": [3, 5], "x": 5, "y": 3},
-
-                {"matrix": [10, 0], "x": 11, "y": 3},
-                {"matrix": [10, 1], "x": 12, "y": 3},
-                {"matrix": [10, 2], "x": 13, "y": 3},
-                {"matrix": [10, 3], "x": 14, "y": 3},
-                {"matrix": [10, 4], "x": 15, "y": 3},
-                {"matrix": [10, 5], "x": 16, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1, "y": 4},
-                {"matrix": [4, 2], "x": 2, "y": 4},
-                {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-
-                {"matrix": [11, 0], "x": 11, "y": 4},
-                {"matrix": [11, 1], "x": 12, "y": 4},
-                {"matrix": [11, 2], "x": 13, "y": 4},
-                {"matrix": [11, 3], "x": 14, "y": 4},
-                {"matrix": [11, 4], "x": 15, "y": 4},
-                {"matrix": [11, 5], "x": 16, "y": 4},
-
-                {"matrix": [5, 0], "x": 0, "y": 5},
-                {"matrix": [5, 1], "x": 1, "y": 5},
-                {"matrix": [5, 2], "x": 2, "y": 5},
-                {"matrix": [5, 3], "x": 3, "y": 5},
-
-                {"matrix": [12, 2], "x": 13, "y": 5},
-                {"matrix": [12, 3], "x": 14, "y": 5},
-                {"matrix": [12, 4], "x": 15, "y": 5},
-                {"matrix": [12, 5], "x": 16, "y": 5},
-
-                {"matrix": [5, 4], "x": 4, "y": 6},
-                {"matrix": [5, 5], "x": 5, "y": 6},
-
-                {"matrix": [12, 0], "x": 11, "y": 6},
-                {"matrix": [12, 1], "x": 12, "y": 6},
-
-                {"matrix": [6, 4], "x": 6, "y": 7},
-                {"matrix": [6, 5], "x": 7, "y": 7},
-
-                {"matrix": [13, 0], "x": 9, "y": 7},
-                {"matrix": [13, 1], "x": 10, "y": 7},
-
-                {"matrix": [6, 2], "x": 6, "y": 8},
-                {"matrix": [6, 3], "x": 7, "y": 8},
-
-                {"matrix": [13, 2], "x": 9, "y": 8},
-                {"matrix": [13, 3], "x": 10, "y": 8}
-            ]
-        }
-    }
-}

keyboards/handwired/dactyl_manuform/6x6_eic/keyboard.json

@@ -0,0 +1,136 @@
+{
+    "keyboard_name": "Dactyl ManuForm 6x6 EIC",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dunk2k",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x066B",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.1},
+
+                {"matrix": [7, 0], "x": 8, "y": 0.1},
+                {"matrix": [7, 1], "x": 9, "y": 0.1},
+                {"matrix": [7, 2], "x": 10, "y": 0.1},
+                {"matrix": [7, 3], "x": 11, "y": 0},
+                {"matrix": [7, 4], "x": 12, "y": 0.1},
+                {"matrix": [7, 5], "x": 13, "y": 0.6},
+                {"matrix": [7, 6], "x": 14, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.1},
+
+                {"matrix": [8, 0], "x": 8, "y": 1.1},
+                {"matrix": [8, 1], "x": 9, "y": 1.1},
+                {"matrix": [8, 2], "x": 10, "y": 1.1},
+                {"matrix": [8, 3], "x": 11, "y": 1},
+                {"matrix": [8, 4], "x": 12, "y": 1.1},
+                {"matrix": [8, 5], "x": 13, "y": 1.6},
+                {"matrix": [8, 6], "x": 14, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+                {"matrix": [2, 6], "x": 6, "y": 2.1},
+
+                {"matrix": [9, 0], "x": 8, "y": 2.1},
+                {"matrix": [9, 1], "x": 9, "y": 2.1},
+                {"matrix": [9, 2], "x": 10, "y": 2.1},
+                {"matrix": [9, 3], "x": 11, "y": 2},
+                {"matrix": [9, 4], "x": 12, "y": 2.1},
+                {"matrix": [9, 5], "x": 13, "y": 2.6},
+                {"matrix": [9, 6], "x": 14, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+                {"matrix": [3, 6], "x": 6, "y": 3.1},
+
+                {"matrix": [10, 0], "x": 8, "y": 3.1},
+                {"matrix": [10, 1], "x": 9, "y": 3.1},
+                {"matrix": [10, 2], "x": 10, "y": 3.1},
+                {"matrix": [10, 3], "x": 11, "y": 3},
+                {"matrix": [10, 4], "x": 12, "y": 3.1},
+                {"matrix": [10, 5], "x": 13, "y": 3.6},
+                {"matrix": [10, 6], "x": 14, "y": 3.6},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.6},
+                {"matrix": [4, 1], "x": 1, "y": 4.6},
+                {"matrix": [4, 2], "x": 2, "y": 4.1},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.1},
+                {"matrix": [4, 5], "x": 5, "y": 4.1},
+
+                {"matrix": [11, 1], "x": 9, "y": 4.1},
+                {"matrix": [11, 2], "x": 10, "y": 4.1},
+                {"matrix": [11, 3], "x": 11, "y": 4},
+                {"matrix": [11, 4], "x": 12, "y": 4.1},
+                {"matrix": [11, 5], "x": 13, "y": 4.6},
+                {"matrix": [11, 6], "x": 14, "y": 4.6},
+
+                {"matrix": [5, 2], "x": 2, "y": 5.1},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+
+                {"matrix": [12, 3], "x": 11, "y": 5},
+                {"matrix": [12, 4], "x": 12, "y": 5.1},
+
+                {"matrix": [5, 4], "x": 4, "y": 6.1},
+                {"matrix": [5, 5], "x": 5, "y": 6.3},
+
+                {"matrix": [12, 1], "x": 9, "y": 6.3},
+                {"matrix": [12, 2], "x": 10, "y": 6.1},
+
+                {"matrix": [6, 4], "x": 4, "y": 7.3},
+                {"matrix": [6, 5], "x": 5.5, "y": 7.3},
+
+                {"matrix": [13, 1], "x": 8.5, "y": 7.3},
+                {"matrix": [13, 2], "x": 10, "y": 7.3},
+
+                {"matrix": [6, 2], "x": 4, "y": 8.3},
+                {"matrix": [6, 3], "x": 5, "y": 8.3},
+
+                {"matrix": [13, 3], "x": 9, "y": 8.3},
+                {"matrix": [13, 4], "x": 10, "y": 8.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/6x6_eic/keymaps/default/keymap.c

@@ -0,0 +1,55 @@
+// Copyright 2023 Duncan Sutherland (@dunk2k)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+#define LS_CAPS LSFT_T(KC_CAPS)
+#define RS_QUOT RSFT_T(KC_QUOT)
+#define APP_N A(KC_TAB)
+#define APP_P LSA(KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,  APP_P,      APP_N,    KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_ESC,  KC_1,  KC_2,    KC_3,    KC_6,    KC_5, KC_LBRC,      KC_RBRC,  KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_GRV,
+        KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T, KC_LCBR,      KC_RCBR,  KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_BSLS,
+        LS_CAPS, KC_A,  KC_S,    KC_D,    KC_F,    KC_G, KC_LPRN,      KC_RPRN,  KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, RS_QUOT,
+        KC_LCTL, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
+                        KC_LEFT, KC_RGHT,                                                      KC_UP,   KC_DOWN,
+                                          RAISE,   KC_SPC,              KC_ENT,  LOWER,
+                                          KC_BSPC, KC_LALT,             KC_RALT, KC_DEL,
+                                          KC_HOME, KC_LGUI,             KC_RGUI, KC_END 
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______,_______,_______,_______,_______,_______,_______,    _______,_______,_______,_______,_______,_______,_______,
+        _______,_______,KC_EXLM,KC_AT,  KC_HASH, KC_DLR,_______,    _______,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,_______,_______,
+        _______,_______,_______,_______,KC_PGUP,_______,_______,    _______,KC_NUM, KC_P7,  KC_P8,  KC_P9,  KC_PMNS,_______,
+        _______,_______,KC_INS, KC_PAUS,KC_SCRL,KC_PSCR,_______,    _______,KC_PAST,KC_P4,  KC_P5,  KC_P6,  KC_PPLS,_______,
+        _______,_______,_______,_______,KC_PGDN,_______,                    KC_PSLS,KC_P1,  KC_P2,  KC_P3,  KC_PENT,_______,
+                        _______,_______,                                                    KC_P0,  KC_PDOT,
+                                        _______,_______,                    _______,_______,
+                                        _______,_______,                    _______,_______,
+                                        _______,_______,                    _______,_______
+    ),
+
+    [_RAISE] = LAYOUT(
+        KC_F13, KC_F14, KC_F15,  KC_F16,  KC_F17,KC_F18,_______,       _______,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
+        _______,_______,_______,_______,_______,_______,_______,       _______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,KC_VOLU,_______,_______,       _______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,KC_MUTE,_______,_______,       _______,_______,KC_MNXT,KC_MPRV,KC_MPLY,KC_MSTP,_______,
+        _______,_______,_______,_______,KC_VOLD,_______,                       _______,_______,_______,_______,_______,_______,
+                        _______,_______,                                                       _______,_______,
+                                        _______,_______,                      _______,_______,
+                                        _______,_______,                      _______,_______,
+                                        _______,_______,                      _______,_______
+    )
+};

keyboards/handwired/dactyl_manuform/6x6_eic/keymaps/via/keymap.c

@@ -0,0 +1,55 @@
+// Copyright 2023 Duncan Sutherland (@dunk2k)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+#define LS_CAPS LSFT_T(KC_CAPS)
+#define RS_QUOT RSFT_T(KC_QUOT)
+#define APP_N A(KC_TAB)
+#define APP_P LSA(KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,  APP_P,      APP_N,    KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_ESC,  KC_1,  KC_2,    KC_3,    KC_6,    KC_5, KC_LBRC,      KC_RBRC,  KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_GRV,
+        KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T, KC_LCBR,      KC_RCBR,  KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_BSLS,
+        LS_CAPS, KC_A,  KC_S,    KC_D,    KC_F,    KC_G, KC_LPRN,      KC_RPRN,  KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, RS_QUOT,
+        KC_LCTL, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RCTL,
+                        KC_LEFT, KC_RGHT,                                                      KC_UP,   KC_DOWN,
+                                          RAISE,   KC_SPC,              KC_ENT,  LOWER,
+                                          KC_BSPC, KC_LALT,             KC_RALT, KC_DEL,
+                                          KC_HOME, KC_LGUI,             KC_RGUI, KC_END 
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______,_______,_______,_______,_______,_______,_______,    _______,_______,_______,_______,_______,_______,_______,
+        _______,_______,KC_EXLM,KC_AT,  KC_HASH, KC_DLR,_______,    _______,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,_______,_______,
+        _______,_______,_______,_______,KC_PGUP,_______,_______,    _______,KC_NUM, KC_P7,  KC_P8,  KC_P9,  KC_PMNS,_______,
+        _______,_______,KC_INS, KC_PAUS,KC_SCRL,KC_PSCR,_______,    _______,KC_PAST,KC_P4,  KC_P5,  KC_P6,  KC_PPLS,_______,
+        _______,_______,_______,_______,KC_PGDN,_______,                    KC_PSLS,KC_P1,  KC_P2,  KC_P3,  KC_PENT,_______,
+                        _______,_______,                                                    KC_P0,  KC_PDOT,
+                                        _______,_______,                    _______,_______,
+                                        _______,_______,                    _______,_______,
+                                        _______,_______,                    _______,_______
+    ),
+
+    [_RAISE] = LAYOUT(
+        KC_F13, KC_F14, KC_F15,  KC_F16,  KC_F17,KC_F18,_______,       _______,KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
+        _______,_______,_______,_______,_______,_______,_______,       _______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,KC_VOLU,_______,_______,       _______,_______,_______,_______,_______,_______,_______,
+        _______,_______,_______,_______,KC_MUTE,_______,_______,       _______,_______,KC_MNXT,KC_MPRV,KC_MPLY,KC_MSTP,_______,
+        _______,_______,_______,_______,KC_VOLD,_______,                       _______,_______,_______,_______,_______,_______,
+                        _______,_______,                                                       _______,_______,
+                                        _______,_______,                      _______,_______,
+                                        _______,_______,                      _______,_______,
+                                        _______,_______,                      _______,_______
+    )
+};

keyboards/handwired/dactyl_manuform/6x6_eic/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/6x6_eic/readme.md

@@ -0,0 +1,10 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 6
+    - Last Row Key Count: Two (Default Dactyl Manuform)
+    - Inner Index Finger's Column: Use inner column

keyboards/handwired/dactyl_manuform/6x6_ex/keyboard.json

@@ -0,0 +1,127 @@
+{
+    "keyboard_name": "Dactyl ManuForm 6x6 EX",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dmik",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x066A",
+        "device_version": "1.0.0"
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layout_aliases": {
+        "LAYOUT_6x6_4": "LAYOUT"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+
+                {"matrix": [7, 0], "x": 8, "y": 0.1},
+                {"matrix": [7, 1], "x": 9, "y": 0.1},
+                {"matrix": [7, 2], "x": 10, "y": 0},
+                {"matrix": [7, 3], "x": 11, "y": 0.1},
+                {"matrix": [7, 4], "x": 12, "y": 0.6},
+                {"matrix": [7, 5], "x": 13, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+
+                {"matrix": [8, 0], "x": 8, "y": 1.1},
+                {"matrix": [8, 1], "x": 9, "y": 1.1},
+                {"matrix": [8, 2], "x": 10, "y": 1},
+                {"matrix": [8, 3], "x": 11, "y": 1.1},
+                {"matrix": [8, 4], "x": 12, "y": 1.6},
+                {"matrix": [8, 5], "x": 13, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+                {"matrix": [9, 0], "x": 8, "y": 2.1},
+                {"matrix": [9, 1], "x": 9, "y": 2.1},
+                {"matrix": [9, 2], "x": 10, "y": 2},
+                {"matrix": [9, 3], "x": 11, "y": 2.1},
+                {"matrix": [9, 4], "x": 12, "y": 2.6},
+                {"matrix": [9, 5], "x": 13, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+
+                {"matrix": [10, 0], "x": 8, "y": 3.1},
+                {"matrix": [10, 1], "x": 9, "y": 3.1},
+                {"matrix": [10, 2], "x": 10, "y": 3},
+                {"matrix": [10, 3], "x": 11, "y": 3.1},
+                {"matrix": [10, 4], "x": 12, "y": 3.6},
+                {"matrix": [10, 5], "x": 13, "y": 3.6},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.6},
+                {"matrix": [4, 1], "x": 1, "y": 4.6},
+                {"matrix": [4, 2], "x": 2, "y": 4.1},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.1},
+                {"matrix": [4, 5], "x": 5, "y": 4.1},
+
+                {"matrix": [11, 0], "x": 8, "y": 4.1},
+                {"matrix": [11, 1], "x": 9, "y": 4.1},
+                {"matrix": [11, 2], "x": 10, "y": 4},
+                {"matrix": [11, 3], "x": 11, "y": 4.1},
+                {"matrix": [11, 4], "x": 12, "y": 4.6},
+                {"matrix": [11, 5], "x": 13, "y": 4.6},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.6},
+                {"matrix": [5, 1], "x": 1, "y": 5.6},
+                {"matrix": [5, 2], "x": 2, "y": 5.1},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+
+                {"matrix": [12, 2], "x": 10, "y": 5},
+                {"matrix": [12, 3], "x": 11, "y": 5.1},
+                {"matrix": [12, 4], "x": 12, "y": 5.6},
+                {"matrix": [12, 5], "x": 13, "y": 5.6},
+
+                {"matrix": [5, 4], "x": 4, "y": 6.1},
+                {"matrix": [5, 5], "x": 5, "y": 6.3},
+
+                {"matrix": [12, 0], "x": 8, "y": 6.3},
+                {"matrix": [12, 1], "x": 9, "y": 6.1},
+
+                {"matrix": [6, 4], "x": 4, "y": 7.3},
+                {"matrix": [6, 5], "x": 5.5, "y": 7.3},
+
+                {"matrix": [13, 0], "x": 7.5, "y": 7.3},
+                {"matrix": [13, 1], "x": 9, "y": 7.3},
+
+                {"matrix": [6, 2], "x": 4, "y": 8.3},
+                {"matrix": [6, 3], "x": 5, "y": 8.3},
+
+                {"matrix": [13, 2], "x": 8, "y": 8.3},
+                {"matrix": [13, 3], "x": 9, "y": 8.3}
+            ]
+        }
+    }
+}

keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c → keyboards/handwired/dactyl_manuform/6x6_ex/keymaps/default/keymap.c

@@ -14,7 +14,7 @@ enum custom_layers {
 #define LOWER MO(_LOWER)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_6x6_4(
+    [_QWERTY] = LAYOUT(
         KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
         KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
         KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                          KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
     ),
 
-    [_LOWER] = LAYOUT_6x6_4(
+    [_LOWER] = LAYOUT(
         KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6  ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
         KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
         _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                 _______,_______,            _______,_______
     ),
 
-    [_RAISE] = LAYOUT_6x6_4(
+    [_RAISE] = LAYOUT(
         KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
         _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
         _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,

keyboards/handwired/dactyl_manuform/6x6_ex/keymaps/via/keymap.c

@@ -0,0 +1,52 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
+        KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
+        KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
+        KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
+        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
+        _______,_______, KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,_______,_______,
+                                         RAISE,KC_SPC,                        KC_ENT, LOWER,
+                                         KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
+                                         KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
+    ),
+
+    [_LOWER] = LAYOUT(
+        KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6  ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
+        KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
+        _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
+        _______,_______,_______,_______,_______,_______,                        _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
+                                _______,_______,_______,KC_PSCR,            _______, KC_P0,_______,_______,
+                                                _______,_______,            _______,_______,
+                                                _______,_______,            _______,_______,
+                                                _______,_______,            _______,_______
+    ),
+
+    [_RAISE] = LAYOUT(
+        KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM ,KC_INS ,KC_SCRL,KC_MUTE,
+        _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
+        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
+        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______,
+                                _______,_______,_______,_______,            KC_EQL ,_______,_______,_______,
+                                                _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______
+    )
+};

keyboards/handwired/dactyl_manuform/6x6_ex/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/handwired/dactyl_manuform/6x6_ex/readme.md

@@ -0,0 +1,10 @@
+## Dactyl Generator
+
+- Presets
+    - Manuform: Original
+- Keys:
+    - Thumb Key Cluster: 6 (Default)
+    - Number of Columns: 6
+    - Number of Rows: 6
+    - Last Row Key Count: Use All Keys
+    - Inner Index Finger's Column: Normal

keyboards/handwired/dactyl_manuform/6x6_exic/keyboard.json

@@ -0,0 +1,140 @@
+{
+    "keyboard_name": "Dactyl ManuForm 6x6 EXIC",
+    "manufacturer": "tshort",
+    "url": "https://github.com/tshort/dactyl-keyboard",
+    "maintainer": "dunk2k",
+    "usb": {
+        "vid": "0x444D",
+        "pid": "0x066C",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "promicro",
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"],
+        "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
+    "split": {
+        "enabled": true,   
+        "soft_serial_pin": "D0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.6},
+                {"matrix": [0, 1], "x": 1, "y": 0.6},
+                {"matrix": [0, 2], "x": 2, "y": 0.1},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.1},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+                {"matrix": [0, 6], "x": 6, "y": 0.1},
+
+                {"matrix": [7, 0], "x": 8, "y": 0.1},
+                {"matrix": [7, 1], "x": 9, "y": 0.1},
+                {"matrix": [7, 2], "x": 10, "y": 0.1},
+                {"matrix": [7, 3], "x": 11, "y": 0},
+                {"matrix": [7, 4], "x": 12, "y": 0.1},
+                {"matrix": [7, 5], "x": 13, "y": 0.6},
+                {"matrix": [7, 6], "x": 14, "y": 0.6},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.6},
+                {"matrix": [1, 1], "x": 1, "y": 1.6},
+                {"matrix": [1, 2], "x": 2, "y": 1.1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.1},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+                {"matrix": [1, 6], "x": 6, "y": 1.1},
+
+                {"matrix": [8, 0], "x": 8, "y": 1.1},
+                {"matrix": [8, 1], "x": 9, "y": 1.1},
+                {"matrix": [8, 2], "x": 10, "y": 1.1},
+                {"matrix": [8, 3], "x": 11, "y": 1},
+                {"matrix": [8, 4], "x": 12, "y": 1.1},
+                {"matrix": [8, 5], "x": 13, "y": 1.6},
+                {"matrix": [8, 6], "x": 14, "y": 1.6},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.6},
+                {"matrix": [2, 1], "x": 1, "y": 2.6},
+                {"matrix": [2, 2], "x": 2, "y": 2.1},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.1},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+                {"matrix": [2, 6], "x": 6, "y": 2.1},
+
+                {"matrix": [9, 0], "x": 8, "y": 2.1},
+                {"matrix": [9, 1], "x": 9, "y": 2.1},
+                {"matrix": [9, 2], "x": 10, "y": 2.1},
+                {"matrix": [9, 3], "x": 11, "y": 2},
+                {"matrix": [9, 4], "x": 12, "y": 2.1},
+                {"matrix": [9, 5], "x": 13, "y": 2.6},
+                {"matrix": [9, 6], "x": 14, "y": 2.6},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.6},
+                {"matrix": [3, 1], "x": 1, "y": 3.6},
+                {"matrix": [3, 2], "x": 2, "y": 3.1},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.1},
+                {"matrix": [3, 5], "x": 5, "y": 3.1},
+                {"matrix": [3, 6], "x": 6, "y": 3.1},
+
+                {"matrix": [10, 0], "x": 8, "y": 3.1},
+                {"matrix": [10, 1], "x": 9, "y": 3.1},
+                {"matrix": [10, 2], "x": 10, "y": 3.1},
+                {"matrix": [10, 3], "x": 11, "y": 3},
+                {"matrix": [10, 4], "x": 12, "y": 3.1},
+                {"matrix": [10, 5], "x": 13, "y": 3.6},
+                {"matrix": [10, 6], "x": 14, "y": 3.6},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.6},
+                {"matrix": [4, 1], "x": 1, "y": 4.6},
+                {"matrix": [4, 2], "x": 2, "y": 4.1},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4.1},
+                {"matrix": [4, 5], "x": 5, "y": 4.1},
+
+                {"matrix": [11, 1], "x": 9, "y": 4.1},
+                {"matrix": [11, 2], "x": 10, "y": 4.1},
+                {"matrix": [11, 3], "x": 11, "y": 4},
+                {"matrix": [11, 4], "x": 12, "y": 4.1},
+                {"matrix": [11, 5], "x": 13, "y": 4.6},
+                {"matrix": [11, 6], "x": 14, "y": 4.6},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.6},
+                {"matrix": [5, 1], "x": 1, "y": 5.6},
+                {"matrix": [5, 2], "x": 2, "y": 5.1},
+                {"matrix": [5, 3], "x": 3, "y": 5},
+
+                {"matrix": [12, 3], "x": 11, "y": 5},
+                {"matrix": [12, 4], "x": 12, "y": 5.1},
+                {"matrix": [12, 5], "x": 13, "y": 5.6},
+                {"matrix": [12, 6], "x": 14, "y": 5.6},
+
+                {"matrix": [5, 4], "x": 4, "y": 6.1},
+                {"matrix": [5, 5], "x": 5, "y": 6.3},
+
+                {"matrix": [12, 1], "x": 9, "y": 6.3},
+                {"matrix": [12, 2], "x": 10, "y": 6.1},
+
+                {"matrix": [6, 4], "x": 4, "y": 7.3},
+                {"matrix": [6, 5], "x": 5.5, "y": 7.3},
+
+                {"matrix": [13, 1], "x": 8.5, "y": 7.3},
+                {"matrix": [13, 2], "x": 10, "y": 7.3},
+
+                {"matrix": [6, 2], "x": 4, "y": 8.3},
+                {"matrix": [6, 3], "x": 5, "y": 8.3},
+
+                {"matrix": [13, 3], "x": 9, "y": 8.3},
+                {"matrix": [13, 4], "x": 10, "y": 8.3}
+            ]
+        }
+    }
+}