[Keyboard] Add Dactyl Manuform 6x6_4 and Kinesis keyboards (#15475)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

14 files changed, 611 insertions, 0 deletions

diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c
new file mode 100644
index 0000000000..ad213e2b75
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c
@@ -0,0 +1,5 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "6x6_4.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
new file mode 100644
index 0000000000..7c767cae7e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
@@ -0,0 +1,37 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "dactyl_manuform.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_6x6_4( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
+    L50, L51, L52, L53,                                              R52, R53, R54, R55, \
+                        L54, L55,                          R50, R51, \
+                                  L64, L65,      R60, R61, \
+                                  L62, L63,      R62, R63 \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { L40, L41, L42, L43, L44, L45 }, \
+    { L50, L51, L52, L53, L54, L55 }, \
+    { XXX, XXX, L62, L63, L64, L65 }, \
+\
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { R40, R41, R42, R43, R44, R45 }, \
+    { R50, R51, R52, R53, R54, R55 }, \
+    { R60, R61, R62, R63, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
new file mode 100644
index 0000000000..8f965f6957
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
@@ -0,0 +1,40 @@
+/*
+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
+
+#include "config_common.h"
+
+#define PRODUCT_ID 0x3636
+#define DEVICE_VER 0x0001
+#define PRODUCT    Dactyl-Manuform (6x6+4)
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 14
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+// WS2812 RGB LED strip input and number of LEDs
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
new file mode 100644
index 0000000000..470e775c0e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Dactyl Manuform 6x6 4 extra keys",
+    "url": "",
+    "maintainer": "dmik",
+    "layouts": {
+        "LAYOUT_6x6_4": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+
+                {"x": 0, "y": 5},
+                {"x": 1, "y": 5},
+                {"x": 2, "y": 5},
+                {"x": 3, "y": 5},
+
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+                {"x": 16, "y": 5},
+
+                {"x": 4, "y": 6},
+                {"x": 5, "y": 6},
+
+                {"x": 11, "y": 6},
+                {"x": 12, "y": 6},
+
+                {"x": 6, "y": 7},
+                {"x": 7, "y": 7},
+
+                {"x": 9, "y": 7},
+                {"x": 10, "y": 7},
+
+                {"x": 6, "y": 8},
+                {"x": 7, "y": 8},
+
+                {"x": 9, "y": 8},
+                {"x": 10, "y": 8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9b4de373ec
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/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_6x6_4(
+        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_BSLASH,
+        _______,_______, 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_6x6_4(
+        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_6x6_4(
+        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_NLCK,KC_INS ,KC_SLCK,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 ,_______,_______,_______,
+                                                _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______
+    )
+};
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
new file mode 100644
index 0000000000..0415379827
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c
new file mode 100644
index 0000000000..a564360b48
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c
@@ -0,0 +1,5 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "6x6_kinesis.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
new file mode 100644
index 0000000000..00f931281b
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
@@ -0,0 +1,37 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "dactyl_manuform.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_6x6_kinesis( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
+    L50, L51, L52, L53,                                              R52, R53, R54, R55, \
+                        L54, L55,                          R50, R51, \
+                                  L64, L65,      R60, R61, \
+                                  L62, L63,      R62, R63 \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { L40, L41, L42, L43, L44, L45 }, \
+    { L50, L51, L52, L53, L54, L55 }, \
+    { XXX, XXX, L62, L63, L64, L65 }, \
+\
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { R40, R41, R42, R43, R44, R45 }, \
+    { R50, R51, R52, R53, R54, R55 }, \
+    { R60, R61, R62, R63, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
new file mode 100644
index 0000000000..8f965f6957
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
@@ -0,0 +1,40 @@
+/*
+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
+
+#include "config_common.h"
+
+#define PRODUCT_ID 0x3636
+#define DEVICE_VER 0x0001
+#define PRODUCT    Dactyl-Manuform (6x6+4)
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 14
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+// WS2812 RGB LED strip input and number of LEDs
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
new file mode 100644
index 0000000000..e106a04c69
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Dactyl Manuform 6x6 Kinesis Advantage edition",
+    "url": "",
+    "maintainer": "dmik",
+    "layouts": {
+        "LAYOUT_6x6_kinesis": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+
+                {"x": 1, "y": 5},
+                {"x": 2, "y": 5},
+                {"x": 3, "y": 5},
+                {"x": 4, "y": 5},
+
+                {"x": 12, "y": 5},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+
+                {"x": 5, "y": 7, "h": 2},
+                {"x": 6, "y": 7, "h": 2},
+
+                {"x": 10, "y": 7, "h": 2},
+                {"x": 11, "y": 7, "h": 2},
+
+                {"x": 6, "y": 6},
+                {"x": 7, "y": 6},
+
+                {"x": 9, "y": 6},
+                {"x": 10, "y": 6},
+
+                {"x": 7, "y": 8},
+                {"x": 7, "y": 7},
+
+                {"x": 9, "y": 7},
+                {"x": 9, "y": 8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2ef9794d6d
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/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_6x6_kinesis(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                         KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_CAPS,
+        KC_EQL , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                         KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS,
+        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_LCTL, 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_GRV , LOWER  , KC_LEFT, KC_RGHT,                                           KC_UP  , KC_DOWN, KC_LBRC, KC_RBRC,
+                                            KC_BSPC, KC_DEL ,                         KC_ENT , KC_SPC ,
+                                            KC_LGUI, KC_LALT,                         KC_RCTL, KC_RGUI,
+                                            KC_END , KC_HOME,                         KC_PGUP, KC_PGDN
+    ),
+
+    [_LOWER] = LAYOUT_6x6_kinesis(
+        _______, KC_F11 , KC_F12 , _______, _______, _______,                         KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______,                                           _______, _______, _______, _______,
+                                            _______, KC_INS ,                         _______, _______,
+                                            _______, _______,                         _______, _______,
+                                            _______, _______,                         _______, _______
+    ),
+
+    [_RAISE] = LAYOUT_6x6_kinesis(
+        _______, KC_F11 , KC_F12 , _______, _______, _______,                         KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______,                                           _______, _______, _______, _______,
+                                            _______, KC_INS ,                         _______, _______,
+                                            _______, _______,                         _______, _______,
+                                            _______, _______,                         _______, _______
+    ),
+};
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md b/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
new file mode 100644
index 0000000000..1e44cc9601
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
@@ -0,0 +1,85 @@
+# Kinesis Advantage Keymap
+
+## About this keymap
+
+This keymap is designed after Kinesis Advantage's QWERTY layout with the following key differences:
+ - There are only 10 F-keys in the main layer, F1 and F2 are moved to additional LOWER layer.
+ - The INS key acts like a LOWER layer activation key and Del in LOWER layer ats like INS.
+ - LCtl is placed where CAPS should be and CAPS is moved to a free key after F10.
+ - Brigtness and volume control keys are added to LOWER layer.
+
+ The keymap file also contains RAISE layer but it is currently equivalent to LOWER layer and does
+ not have an activation key mapped. It is intended for possible extensions.
+
+## Mapping details
+
+        Main QUERTY layer:
+        ,-------------------------------------------.                           ,-------------------------------------------.
+        | ESC    |  F1  |  F2  |  F3  |  F4  |  F5  |                           |  F6  |  F7  |  F8  |  F9  |  F10 | CAPS   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        | =      |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        | Tab    |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |   \    |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        | LCtl   |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |   ;  |   '    |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        | LShift |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |   ,  |   .  |   /  | RShift |
+        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                 |   `  | LOWER| Left | Rght |                                         |  Up  |  Dn  |   [  |   ]  |
+                 `---------------------------'                                         `---------------------------'
+                                                ,-------------.      ,-------------.
+                                                | LGui | LAlt |      | RCtl | RGui |
+                                         ,------|------|------|      |------+------+------.
+                                         |      |      | Home |      | PgUp |      |      |
+                                         | BkSp | Del  |------|      |------|Enter |Space |
+                                         |      |      | End  |      | PgDn |      |      |
+                                         `--------------------'      `--------------------'
+
+        LOWER layer:
+        ,-------------------------------------------.                           ,-------------------------------------------.
+        |        |  F11 |  F12 |      |      |      |                           |BriDn |BriUp |VMute |VolDn |VolUp |        |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                 |      |      |      |      |                                         |      |      |      |      |
+                 `---------------------------'                                         `---------------------------'
+                                                ,-------------.      ,-------------.
+                                                |      |      |      |      |      |
+                                         ,------|------|------|      |------+------+------.
+                                         |      |      |      |      |      |      |      |
+                                         |      | INS  |------|      |------|      |      |
+                                         |      |      |      |      |      |      |      |
+                                         `--------------------'      `--------------------'
+
+## Soldering details
+
+The below picture shows correspondence between the keys and the row/column wires of the left and
+right halves:
+
+        LOWER layer:
+        ,-------------------------------------------.                           ,-------------------------------------------.
+        |  L00   | L01  | L02  | L03  | L04  | L05  |                           | R00  | R01  | R02  | R03  | R04  |  R05   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |  L10   | L11  | L12  | L13  | L14  | L15  |                           | R10  | R11  | R12  | R13  | R14  |  R15   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |  L20   | L21  | L22  | L23  | L24  | L25  |                           | R20  | R21  | R22  | R23  | R24  |  R25   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |  L30   | L31  | L32  | L33  | L34  | L35  |                           | R30  | R31  | R32  | R33  | R34  |  R35   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |  L40   | L41  | L42  | L43  | L44  | L45  |                           | R40  | R41  | R42  | R43  | R44  |  R45   |
+        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                 | L50  | L51  | L52  | L53  |                                         | R52  | R53  | R54  | R55  |
+                 `---------------------------'                                         `---------------------------'
+                                                ,-------------.      ,-------------.
+                                                | L64  | L65  |      | R60  | R61  |
+                                         ,------|------|------|      |------+------+------.
+                                         |      |      | L63  |      | R62  |      |      |
+                                         | L54  | L55  |------|      |------| R50  | R51  |
+                                         |      |      | L62  |      | R63  |      |      |
+                                         `--------------------'      `--------------------'
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
new file mode 100644
index 0000000000..0415379827
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
index c6d71f9114..d304814d7d 100644
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
@@ -16,6 +16,10 @@
 #    include "5x7.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_6x6)
 #    include "6x6.h"
+#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_4)
+#    include "6x6_4.h"
+#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_kinesis)
+#    include "6x6_kinesis.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_6x7)
 #    include "6x7.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key)