Merge remote-tracking branch 'origin/master' into develop

13 files changed, 608 insertions, 0 deletions

diff --git a/keyboards/handwired/alcor_dactyl/config.h b/keyboards/handwired/alcor_dactyl/config.h
new file mode 100644
index 0000000000..f8ffe4d6a3
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/config.h
@@ -0,0 +1,33 @@
+// Copyright 2022 Ethan (@rocketstrong)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP10
+#define SERIAL_USART_RX_PIN GP9
+#define RGB_DI_PIN GP16
+#define DRIVER_LED_TOTAL 2
+#define RGB_MATRIX_SPLIT { 1, 1 }
+#define RGBLED_NUM 1
+#define EE_HANDS
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json
new file mode 100644
index 0000000000..7bdde8550c
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -0,0 +1,130 @@
+{
+    "manufacturer": "Ethan",
+    "keyboard_name": "alcor_dactyl",
+    "maintainer": "rocketstrong",
+    "bootloader": "rp2040",
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "features": {
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "split": {
+        "enabled": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP15", "GP14", "GP13"],
+        "rows": ["GP5", "GP4", "GP3", "GP2", "GP1", "GP0"]
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            {"x":0, "y":0.375},
+            {"x":16.5, "y":0.38}
+        ]
+    },
+    "layouts": {
+        "LAYOUT":{
+            "layout":[
+                {"matrix":[0,0], "x":0, "y":0.375, "w":1.5},
+                {"matrix":[0,1], "x":1.5, "y":0.38},
+                {"matrix":[0,2], "x":2.5, "y":0.125},
+                {"matrix":[0,3], "x":3.5, "y":0.25},
+                {"matrix":[0,4], "x":4.5, "y":0.25},
+                {"matrix":[0,5], "x":5.5, "y":0.25},
+                {"matrix":[0,6], "x":6.5, "y":0.25},
+
+                {"matrix":[6,6], "x":10.5, "y":0.25},
+                {"matrix":[6,5], "x":11.5, "y":0.25},
+                {"matrix":[6,4], "x":12.5, "y":0.25},
+                {"matrix":[6,3], "x":13.5, "y":0.25},
+                {"matrix":[6,2], "x":14.5, "y":0.13},
+                {"matrix":[6,1], "x":15.5, "y":0.38},
+                {"matrix":[6,0], "x":16.5, "y":0.38, "w":1.5},
+
+                {"matrix":[1,0], "x":0, "y":1.375, "w":1.5},
+                {"matrix":[1,1], "x":1.5, "y":1.375},
+                {"matrix":[1,2], "x":2.5, "y":1.125},
+                {"matrix":[1,3], "x":3.5, "y":1.25},
+                {"matrix":[1,4], "x":4.5, "y":1.25},
+                {"matrix":[1,5], "x":5.5, "y":1.25},
+                {"matrix":[1,6], "x":6.5, "y":1.25},
+
+                {"matrix":[7,6], "x":10.5, "y":1.25},
+                {"matrix":[7,5], "x":11.5, "y":1.25},
+                {"matrix":[7,4], "x":12.5, "y":1.25},
+                {"matrix":[7,3], "x":13.5, "y":1.25},
+                {"matrix":[7,2], "x":14.5, "y":1.13},
+                {"matrix":[7,1], "x":15.5, "y":1.38},
+                {"matrix":[7,0], "x":16.5, "y":1.38, "w":1.5},
+
+                {"matrix":[2,0], "x":0, "y":2.375, "w":1.5},
+                {"matrix":[2,1], "x":1.5, "y":2.375},
+                {"matrix":[2,2], "x":2.5, "y":2.125},
+                {"matrix":[2,3], "x":3.5, "y":2.25},
+                {"matrix":[2,4], "x":4.5, "y":2.25},
+                {"matrix":[2,5], "x":5.5, "y":2.25},
+                {"matrix":[2,6], "x":6.5, "y":2.25},
+
+                {"matrix":[8,6], "x":10.5, "y":2.25},
+                {"matrix":[8,5], "x":11.5, "y":2.25},
+                {"matrix":[8,4], "x":12.5, "y":2.25},
+                {"matrix":[8,3], "x":13.5, "y":2.25},
+                {"matrix":[8,2], "x":14.5, "y":2.13},
+                {"matrix":[8,1], "x":15.5, "y":2.38},
+                {"matrix":[8,0], "x":16.5, "y":2.38, "w":1.5},
+
+                {"matrix":[3,0], "x":0, "y":3.375, "w":1.5},
+                {"matrix":[3,1], "x":1.5, "y":3.375},
+                {"matrix":[3,2], "x":2.5, "y":3.125},
+                {"matrix":[3,3], "x":3.5, "y":3.25},
+                {"matrix":[3,4], "x":4.5, "y":3.25},
+                {"matrix":[3,5], "x":5.5, "y":3.25},
+
+                {"matrix":[9,5], "x":11.5, "y":3.25},
+                {"matrix":[9,4], "x":12.5, "y":3.25},
+                {"matrix":[9,3], "x":13.5, "y":3.25},
+                {"matrix":[9,2], "x":14.5, "y":3.13},
+                {"matrix":[9,1], "x":15.5, "y":3.38},
+                {"matrix":[9,0], "x":16.5, "y":3.38, "w":1.5},
+
+                {"matrix":[4,0], "x":0.5, "y":4.375},
+                {"matrix":[4,1], "x":1.5, "y":4.375},
+                {"matrix":[4,2], "x":2.5, "y":4.125},
+                {"matrix":[4,3], "x":3.5, "y":4.25},
+
+                {"matrix":[10,3], "x":13.5, "y":4.25},
+                {"matrix":[10,2], "x":14.5, "y":4.13},
+                {"matrix":[10,1], "x":15.5, "y":4.38},
+                {"matrix":[10,0], "x":16.5, "y":4.38},
+
+                {"matrix":[4,4], "x":5, "y":4.5, "h":2},
+                {"matrix":[4,5], "x":6.25, "y":4.5, "h":1.5},
+                {"matrix":[10,5], "x":10.75, "y":4.5, "h":1.5},
+                {"matrix":[10,4], "x":12, "y":4.5, "h":2},
+
+                {"matrix":[5,4], "x":6.25, "y":6.25},
+                {"matrix":[5,5], "x":7.5, "y":6.25},
+
+                {"matrix":[11,5], "x":9.5, "y":6.25},
+                {"matrix":[11,4], "x":10.75, "y":6.25},
+
+                {"matrix":[5,2], "x":6.25, "y":7.25},
+                {"matrix":[5,3], "x":7.25, "y":7.25},
+
+                {"matrix":[11,3], "x":9.75, "y":7.25},
+                {"matrix":[11,2], "x":10.75, "y":7.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/alcor_dactyl/keymaps/colemak_dh/keymap.c b/keyboards/handwired/alcor_dactyl/keymaps/colemak_dh/keymap.c
new file mode 100644
index 0000000000..8d41611402
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/keymaps/colemak_dh/keymap.c
@@ -0,0 +1,100 @@
+// Copyright 2022 Ethan (@rocketstrong)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+/*
+ *          ┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐                    ┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  │                    │  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘                    └──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐                                    ┌──┐┌──┐└──┘└────┘
+ *  ┌──┐┌──┐│  ││  │  ┌──┐ ┌──┐              ┌──┐ ┌──┐  │  ││  │┌──┐┌──┐
+ *  │  ││  │└──┘└──┘  │  │ │  │              │  │ │  │  └──┘└──┘│  ││  │
+ *  └──┘└──┘          │  │ │  │              │  │ │  │          └──┘└──┘
+ *                    │  │ └──┘              └──┘ │  │
+ *                    └──┘ ┌──┐ ┌──┐    ┌──┐ ┌──┐ └──┘
+ *                         │  │ │  │    │  │ │  │
+ *                         └──┘ └──┘    └──┘ └──┘
+ *                         ┌──┐┌──┐      ┌──┐┌──┐
+ *                         │  ││  │      │  ││  │
+ *                         └──┘└──┘      └──┘└──┘
+ */
+
+enum Colemaklayers {
+  _ARSTG,
+  _NUMPAD,
+  _SYMBOLS
+};
+
+enum custom_keycodes {
+    AD_DDS = SAFE_RANGE,
+    AD_SCOPE
+};
+
+#define TT_NUM TT(_NUMPAD)
+#define TT_SYM TT(_SYMBOLS)
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case AD_DDS:
+            if (!record->event.pressed) {
+                // when keycode AD_DDS is pressed
+                SEND_STRING("../");
+            } else {
+                // when keycode AD_DDS is released
+            }
+            break;
+        case AD_SCOPE:
+            if (!record->event.pressed) {
+                // when keycode AD_DDS is pressed
+                SEND_STRING("::");
+            } else {
+                // when keycode AD_DDS is released
+            }
+            break;
+    }
+    return true;
+}
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_ARSTG] = LAYOUT(
+        KC_GRV  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_MINS  ,      KC_EQL  , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_ESC  ,
+        KC_TAB  , KC_Q    , KC_W    , KC_F    , KC_P    , KC_B    , KC_LBRC ,       KC_RBRC , KC_J    , KC_L    , KC_U    , KC_Y    , KC_SCLN , KC_BSLS ,
+        KC_ESC  , KC_A    , KC_R    , KC_S    , KC_T    , KC_G    , KC_PSCR ,       KC_PAUS , KC_M    , KC_N    , KC_E    , KC_I    , KC_O    , KC_QUOT ,
+        KC_LSFT , KC_Z    , KC_X    , KC_C    , KC_D    , KC_V    ,                           KC_K    , KC_H    , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT ,
+        KC_LCTL , KC_LGUI , KC_LALT , KC_DEL  ,                                                                   KC_LEFT , KC_UP   , KC_DOWN , KC_RIGHT,
+                                                        KC_SPC  , KC_BSPC ,           KC_TAB  , KC_ENT  ,
+                                                          TT_NUM  , KC_LSFT ,       KC_RSFT , TT_SYM  ,
+                                                          KC_LCTL , KC_LALT ,       KC_RALT , KC_RCTL
+    ),
+    [_NUMPAD] = LAYOUT(
+        KC_NO   , 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_NO   ,
+        KC_TRNS , KC_PGUP , KC_HOME , KC_UP   , KC_END  , KC_NO   , KC_NO   ,       KC_NO   , KC_NUM  , KC_P7   , KC_P8   , KC_P9   , KC_PMNS , KC_NO   ,
+        KC_TRNS , KC_PGDN , KC_LEFT , KC_DOWN , KC_RIGHT, KC_NO   , KC_TRNS ,       KC_TRNS , KC_PSLS , KC_P4   , KC_P5   , KC_P6   , KC_PPLS , KC_NO   ,
+        KC_TRNS , KC_NO   , KC_NO   , KC_NO   , KC_NO   , KC_NO   ,                           KC_PAST , KC_P1   , KC_P2   , KC_P3   , KC_PEQL , KC_NO   ,
+        KC_TRNS , KC_NO   , KC_NO   , KC_NO   ,                                                                   KC_P0   , KC_PDOT , KC_PCMM , KC_NO   ,
+                                                        KC_TRNS , KC_TRNS ,           KC_TRNS , KC_PENT ,
+                                                          KC_TRNS , KC_TRNS ,       KC_TRNS , KC_TRNS ,
+                                                          KC_TRNS , QK_BOOT ,       KC_TRNS , KC_TRNS
+    ),
+    [_SYMBOLS] = LAYOUT(
+        KC_NO   , 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_NO   ,
+        KC_TRNS , KC_QUOT , KC_LT   , KC_GT   , KC_DQT  , KC_DOT  , KC_NO   ,       KC_NO   , KC_AMPR , AD_SCOPE, KC_LBRC , KC_RBRC , KC_PERC , KC_NO   ,
+        KC_TRNS , KC_EXLM , KC_MINS , KC_PLUS , KC_EQL  , KC_HASH , KC_NO   ,       KC_NO   , KC_PIPE , KC_COLN , KC_LPRN , KC_RPRN , KC_QUES , KC_NO   ,
+        KC_TRNS , KC_CIRC , KC_SLSH , KC_ASTR , KC_BSLS , AD_DDS  ,                           KC_TILD , KC_DLR  , KC_LCBR , KC_RCBR , KC_AT   , KC_NO   ,
+        KC_TRNS , KC_NO   , KC_NO   , KC_NO   ,                                                                   KC_NO   , KC_NO   , KC_NO   , KC_NO   ,
+                                                        KC_TRNS , KC_TRNS ,           KC_TRNS , KC_PENT ,
+                                                          KC_TRNS , KC_TRNS ,       KC_TRNS , KC_TRNS ,
+                                                          KC_TRNS , KC_TRNS ,       QK_BOOT , KC_TRNS
+    )
+};
diff --git a/keyboards/handwired/alcor_dactyl/keymaps/default/keymap.c b/keyboards/handwired/alcor_dactyl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..55ddb29888
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2022 Ethan (@rocketstrong)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+/*
+ *          ┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐┌──┐            ┌──┐┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  ││  │            │  ││  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘└──┘            └──┘└──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐┌──┐┌──┐                    ┌──┐┌──┐┌──┐┌──┐└──┘└────┘
+ *┌────┐┌──┐│  ││  ││  ││  │                    │  ││  ││  ││  │┌──┐┌────┐
+ *│    ││  │└──┘└──┘└──┘└──┘                    └──┘└──┘└──┘└──┘│  ││    │
+ *└────┘└──┘┌──┐┌──┐                                    ┌──┐┌──┐└──┘└────┘
+ *  ┌──┐┌──┐│  ││  │  ┌──┐ ┌──┐              ┌──┐ ┌──┐  │  ││  │┌──┐┌──┐
+ *  │  ││  │└──┘└──┘  │  │ │  │              │  │ │  │  └──┘└──┘│  ││  │
+ *  └──┘└──┘          │  │ │  │              │  │ │  │          └──┘└──┘
+ *                    │  │ └──┘              └──┘ │  │
+ *                    └──┘ ┌──┐ ┌──┐    ┌──┐ ┌──┐ └──┘
+ *                         │  │ │  │    │  │ │  │
+ *                         └──┘ └──┘    └──┘ └──┘
+ *                         ┌──┐┌──┐      ┌──┐┌──┐
+ *                         │  ││  │      │  ││  │
+ *                         └──┘└──┘      └──┘└──┘
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO,                                                KC_NO, KC_NO, KC_NO, KC_NO,
+                                        KC_NO, KC_NO,            KC_NO, KC_NO,
+                                            KC_NO, KC_NO,    KC_NO, KC_NO,
+                                            KC_NO, KC_NO,    KC_NO, KC_NO
+    )
+};
diff --git a/keyboards/handwired/alcor_dactyl/readme.md b/keyboards/handwired/alcor_dactyl/readme.md
new file mode 100644
index 0000000000..3c18faf247
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/readme.md
@@ -0,0 +1,28 @@
+# alcor_dactyl
+
+![alcor_dactyl](https://i.imgur.com/F0E1JCQh.jpg)
+
+This is a handwired dactyl manufor utalising an RP2040-zero
+
+* Keyboard Maintainer: [Ethan](https://github.com/rocketstrong)
+* Hardware Supported: Waveshare RP2040-Zero
+* Hardware Availability: https://www.waveshare.com/wiki/RP2040-Zero
+* 3D Print File Source: https://dactyl.mbugert.de/manuform
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/alcor_dactyl:default
+
+Flashing example for this keyboard:
+
+    make handwired/alcor_dactyl:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/alcor_dactyl/rules.mk b/keyboards/handwired/alcor_dactyl/rules.mk
new file mode 100644
index 0000000000..8fb51ec82d
--- /dev/null
+++ b/keyboards/handwired/alcor_dactyl/rules.mk
@@ -0,0 +1,2 @@
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c
new file mode 100644
index 0000000000..dbfb96ce40
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c
@@ -0,0 +1,18 @@
+/*
+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 "5x6_6.h"
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
new file mode 100644
index 0000000000..1392cb0b18
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h
@@ -0,0 +1,47 @@
+/*
+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 "quantum.h"
+#pragma once
+
+#define XXX KC_NO
+
+#define LAYOUT_split_5x6_6( \
+    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, \
+              L42, L43, L44, L45,                          R40, R41, R42, R43, \
+                        L54, L55,                          R50, R51, \
+                        L64, L65,                          R60, R61 \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { XXX, XXX, L42, L43, L44, L45 }, \
+    { XXX, XXX, XXX, XXX, L54, L55 }, \
+    { XXX, XXX, XXX, XXX, 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, XXX, XXX }, \
+    { R50, R51, XXX, XXX, XXX, XXX }, \
+    { R60, R61, XXX, XXX, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/config.h b/keyboards/handwired/dactyl_manuform/5x6_6/config.h
new file mode 100644
index 0000000000..3571a6d979
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/config.h
@@ -0,0 +1,34 @@
+/*
+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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_COLS 6
+#define MATRIX_ROWS 14
+
+#undef SOFT_SERIAL_PIN
+#define SOFT_SERIAL_PIN D3
+
+// 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
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
new file mode 100644
index 0000000000..2774cec118
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
@@ -0,0 +1,93 @@
+{
+    "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"
+    },
+    "layouts": {
+        "LAYOUT_split_5x6_6": {
+            "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": 2, "y": 4},
+                {"x": 3, "y": 4},
+
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4},
+
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+
+                {"x": 5, "y": 5},
+                {"x": 6, "y": 5},
+                {"x": 7, "y": 5},
+
+                {"x": 5, "y": 5},
+                {"x": 9, "y": 5},
+                {"x": 10, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..74fe44702e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+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,
+                   RESET,     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
+    )
+};
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/readme.md b/keyboards/handwired/dactyl_manuform/5x6_6/readme.md
new file mode 100644
index 0000000000..78107a183d
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/readme.md
@@ -0,0 +1,22 @@
+# 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)
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
new file mode 100644
index 0000000000..1d413868d4
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/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 = yes            # 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
\ No newline at end of file