Handwired/Dactyl keyboard (#2058)

* Copy the ergodox_ez code to handwired/dactyl

Differences from the Ergodox:

* Use QMK_SUBPROJECT_H instead of QMK_KEYBOARD_H, since it's under
    handwired
* Omitted several keymaps. They'll eventually be broken (since the
    Dactyl has fewer keys), and I don't want to try to fix them.
* Omitted the keymap images for the default layout, since they depict
    a different keyboard.
* Everything that said Ergodox now says Dactyl, naturally.

* [whitespace] Delete trailing whitespace

My editor does this automatically so it's just gonna keep cropping up...

* Cut the dactyl down to the right number of columns

(Remember, throughout matrix.c, everything called "row" is really a
column, and vice-versa).

* Remove LED-related code

* Tighten up the Dactyl's build options

* Whitespace cleanup in twimaster.c

* Hardtabs -> spaces
* No more trailing whitespace

* Typo fix

* Correct the CPU frequency units

The Teensy's CPU definitely doesn't run at 16 petahertz...

* Restore access to ONEHAND_ENABLE

I turned it off in 26d47cb42622d990a7c3335e7fcc151aa3edfbf0 while
desperately debugging; I just wanted to ensure it wasn't causing the
problem I was seeing. It was not, in fact, causing the problem, so it's
back.

Also fixed the swap matrix in dactyl.c, since it still referred to
columns that exist in the Ergodox but not the Dactyl.

* Clearer phrasing about TWI's effect on scan rate

* Fix up the Dactyl's firmware-loading instructions

Sadly, the Dactyl has no hole for the onboard reset button.

* Dvorak keymap for the Dactyl

* The Erincalling Layout

* Erincalling layout: Add a := key

I've been working in Go, which uses := a lot, and it's awkward to type
in this layout.

* Dactyl README: link to the dactyl-keyboard repo

* Add a missing copyright line

I don't know how much this matters? Honestly, it's enough for me that my
name is on the git commit. But hey, let's be consistent until there's a
specific reason not to be, right?

* Dactyl: remove commented-out code

I hate it I hate it I hate it

There's not even any information about what it was trying to do!!!! >:(

* Add a note about the row/column ridiculousness

* [whitespace] realign some constants

* Don't claim B4 is tied to VCC

It doesn't matter at all? I honestly don't know what the reason ever
was. It looks like it dates back to the original ErgoDox and I've never
seen one sentence about the purpose.

I've been skipping that wire for some time, and I promise it works fine.

* Dactyl keymaps: Send RALT for right-hand alt key

Not terribly important but I just like things tidy OK

* typo fix

* Refer to "dactyl.h" explicitly

QMK_SUBPROJECT_H has been working locally, but fails in CI. Strange!

* Dactyl: Don't use QMK_SUBPROJECT_H at all

It's still breaking in CI, even though it was a never a problem locally.

6 files changed, 553 insertions, 0 deletions

diff --git a/keyboards/handwired/dactyl/keymaps/default/keymap.c b/keyboards/handwired/dactyl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0d414d85b2
--- /dev/null
+++ b/keyboards/handwired/dactyl/keymaps/default/keymap.c
@@ -0,0 +1,183 @@
+#include "dactyl.h"
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define MDIA 2 // media keys
+
+enum custom_keycodes {
+  PLACEHOLDER = SAFE_RANGE, // ensure these codes start after the highest keycode defined in Quantum
+  VRSN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   =  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Del  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | BkSp |   A  |   S  |   D  |   F  |   G  |                    |   H  |   J  |   K  |   L  |; / L2|'/Cmd |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LShift|Z/Ctrl|   X  |   C  |   V  |   B  |                    |   N  |   M  |   ,  |   .  |//Ctrl|RShift|
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * |Grv/L1|  '"  |AltShf| Left | Right|                                  |  Up  | Down |   [  |   ]  | ~L1  |
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      | App  | LGui |  | Alt  | ^/Esc|
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      | Home |  | PgUp |      |      |
+ *                               | Space|Backsp|------|  |------|  Tab |Enter |
+ *                               |      |ace   | End  |  | PgDn |      |      |
+ *                               `--------------------'  `--------------------'
+ */
+[BASE] = LAYOUT_dactyl(  // layer 0 : default
+        // left hand
+           KC_EQL,         KC_1,           KC_2,     KC_3,     KC_4,  KC_5,
+          KC_DELT,         KC_Q,           KC_W,     KC_E,     KC_R,  KC_T,
+          KC_BSPC,         KC_A,           KC_S,     KC_D,     KC_F,  KC_G,
+          KC_LSFT,  CTL_T(KC_Z),           KC_X,     KC_C,     KC_V,  KC_B,
+  LT(SYMB,KC_GRV),      KC_QUOT,  LALT(KC_LSFT),  KC_LEFT,  KC_RGHT,
+                                                                      ALT_T(KC_APP),  KC_LGUI,
+                                                                                      KC_HOME,
+                                                             KC_SPC,        KC_BSPC,   KC_END,
+        // right hand
+                             KC_6,   KC_7,     KC_8,     KC_9,               KC_0,         KC_MINS,
+                             KC_Y,   KC_U,     KC_I,     KC_O,               KC_P,         KC_BSLS,
+                             KC_H,   KC_J,     KC_K,     KC_L,  LT(MDIA, KC_SCLN),  GUI_T(KC_QUOT),
+                             KC_N,   KC_M,  KC_COMM,   KC_DOT,     CTL_T(KC_SLSH),         KC_RSFT,
+                                    KC_UP,  KC_DOWN,  KC_LBRC,            KC_RBRC,          KC_FN1,
+          KC_RALT,  CTL_T(KC_ESC),
+          KC_PGUP,
+          KC_PGDN, KC_TAB, KC_ENT
+    ),
+/* Keymap 1: Symbol Layer
+ *
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |Versn |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   !  |   @  |   {  |   }  |   |  |                    |  Up  |   7  |   8  |   9  |   *  |  F12 |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   #  |   $  |   (  |   )  |   `  |                    | Down |   4  |   5  |   6  |   +  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   %  |   ^  |   [  |   ]  |   ~  |                    |   &  |   1  |   2  |   3  |   \  |      |
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * |RESET |      |      |      |      |                                  |      |   .  |   0  |   =  |      |
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      |      |      |  |      |      |
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      |      |  |      |      |      |
+ *                               |      |      |------|  |------|      |      |
+ *                               |      |      |      |  |      |      |      |
+ *                               `--------------------'  `--------------------'
+ */
+// SYMBOLS
+[SYMB] = LAYOUT_dactyl(
+       // left hand
+          VRSN,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+       KC_TRNS,  KC_EXLM,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_PIPE,
+       KC_TRNS,  KC_HASH,   KC_DLR,  KC_LPRN,  KC_RPRN,   KC_GRV,
+       KC_TRNS,  KC_PERC,  KC_CIRC,  KC_LBRC,  KC_RBRC,  KC_TILD,
+         RESET,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+                                                         KC_TRNS,  KC_TRNS,
+                                                                   KC_TRNS,
+                                               KC_TRNS,  KC_TRNS,  KC_TRNS,
+       // right hand
+                KC_F6,      KC_F7,   KC_F8, KC_F9,  KC_F10,   KC_F11,
+                KC_UP,       KC_7,    KC_8,  KC_9, KC_ASTR,   KC_F12,
+                KC_DOWN,     KC_4,    KC_5,  KC_6, KC_PLUS,  KC_TRNS,
+                KC_AMPR,     KC_1,    KC_2,  KC_3, KC_BSLS,  KC_TRNS,
+                          KC_TRNS,  KC_DOT,  KC_0,  KC_EQL,  KC_TRNS,
+      KC_TRNS,  KC_TRNS,
+      KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_TRNS
+),
+/* Keymap 2: Media and mouse keys
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      | MsUp |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |MsLeft|MsDown|MsRght|      |                    |      |      |      |      |      | Play |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      | Prev | Next |      |      |
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * |      |      |      | Lclk | Rclk |                                  | VolUp| VolDn| Mute |      |      |
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      |      |      |  |      |      |
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      |      |  |      |      |Brwser|
+ *                               |      |      |------|  |------|      |Back  |
+ *                               |      |      |      |  |      |      |      |
+ *                               `--------------------'  `--------------------'
+ *
+ */
+// MEDIA AND MOUSE
+[MDIA] = LAYOUT_dactyl(
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MS_U,  KC_TRNS,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_BTN1,  KC_BTN2,
+                                                         KC_TRNS,  KC_TRNS,
+                                                                   KC_TRNS,
+                                               KC_TRNS,  KC_TRNS,  KC_TRNS,
+    // right hand
+                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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MPLY,
+                KC_TRNS,  KC_TRNS,  KC_MPRV,  KC_MNXT,  KC_TRNS,  KC_TRNS,
+                          KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_TRNS,  KC_TRNS,
+      KC_TRNS,  KC_TRNS,
+      KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_WBAK
+),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB)                // FN1 - Momentary Layer 1 (Symbols)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+  switch(id) {
+    case 0:
+      if (record->event.pressed) {
+        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+      }
+      break;
+    case 1:
+      if (record->event.pressed) { // For resetting EEPROM
+        eeconfig_init();
+      }
+      break;
+  }
+  return MACRO_NONE;
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case VRSN:
+      if (record->event.pressed) {
+        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {};
diff --git a/keyboards/handwired/dactyl/keymaps/default/readme.md b/keyboards/handwired/dactyl/keymaps/default/readme.md
new file mode 100644
index 0000000000..e393e396e3
--- /dev/null
+++ b/keyboards/handwired/dactyl/keymaps/default/readme.md
@@ -0,0 +1,10 @@
+# Dactyl Default Configuration
+
+## Changelog
+
+* Nov 2017:
+  * Copied and adapted from the Ergodox EZ equivalent
+  * Notable differences:
+    - Don't try to have the columns that don't exist, naturally
+    - Removed RGB keys, since there are no RGB LEDs in the Dactyl (as designed, at least)
+
diff --git a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
new file mode 100644
index 0000000000..a0b98b993d
--- /dev/null
+++ b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
@@ -0,0 +1,183 @@
+#include "dactyl.h"
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define MDIA 2 // media keys
+
+enum custom_keycodes {
+  PLACEHOLDER = SAFE_RANGE, // ensure these codes start after the highest keycode defined in Quantum
+  VRSN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   =  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Del  |  '"  |   ,  |   .  |   P  |   Y  |                    |   F  |   G  |   C  |   R  |   L  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | BkSp |   A  |   O  |   E  |   U  |   I  |                    |   D  |   H  |   T  |   N  | S/L2 |//Cmd |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LShift|;/Ctrl|   Q  |   J  |   K  |   X  |                    |   B  |   M  |   W  |   V  |Z/Ctrl|RShift|
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * |Grv/L1|   =  |AltShf| Left | Right|                                  |  Up  | Down |   [  |   ]  | ~L1  |
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      | App  | LGui |  | Alt  | ^/Esc|
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      | Home |  | PgUp |      |      |
+ *                               | Space|Backsp|------|  |------|  Tab |Enter |
+ *                               |      |ace   | End  |  | PgDn |      |      |
+ *                               `--------------------'  `--------------------'
+ */
+[BASE] = LAYOUT_dactyl(  // layer 0 : default
+        // left hand
+           KC_EQL,            KC_1,           KC_2,     KC_3,     KC_4,  KC_5,
+          KC_DELT,         KC_QUOT,        KC_COMM,   KC_DOT,     KC_P,  KC_Y,
+          KC_BSPC,            KC_A,           KC_O,     KC_E,     KC_U,  KC_I,
+          KC_LSFT,  CTL_T(KC_SCLN),           KC_Q,     KC_J,     KC_K,  KC_X,
+  LT(SYMB,KC_GRV),          KC_EQL,  LALT(KC_LSFT),  KC_LEFT,  KC_RGHT,
+                                                                      ALT_T(KC_APP),  KC_LGUI,
+                                                                                      KC_HOME,
+                                                             KC_SPC,        KC_BSPC,   KC_END,
+        // right hand
+                             KC_6,   KC_7,     KC_8,     KC_9,            KC_0,         KC_MINS,
+                             KC_F,   KC_G,     KC_C,     KC_R,            KC_L,         KC_BSLS,
+                             KC_D,   KC_H,     KC_T,     KC_N,  LT(MDIA, KC_S),  GUI_T(KC_SLSH),
+                             KC_B,   KC_M,     KC_W,     KC_V,     CTL_T(KC_Z),         KC_RSFT,
+                                    KC_UP,  KC_DOWN,  KC_LBRC,         KC_RBRC,          KC_FN1,
+          KC_RALT,  CTL_T(KC_ESC),
+          KC_PGUP,
+          KC_PGDN, KC_TAB, KC_ENT
+    ),
+/* Keymap 1: Symbol Layer
+ *
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |Versn |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   !  |   @  |   {  |   }  |   |  |                    |  Up  |   7  |   8  |   9  |   *  |  F12 |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   #  |   $  |   (  |   )  |   `  |                    | Down |   4  |   5  |   6  |   +  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   %  |   ^  |   [  |   ]  |   ~  |                    |   &  |   1  |   2  |   3  |   \  |      |
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * |RESET |      |      |      |      |                                  |      |   .  |   0  |   =  |      |
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      |      |      |  |      |      |
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      |      |  |      |      |      |
+ *                               |      |      |------|  |------|      |      |
+ *                               |      |      |      |  |      |      |      |
+ *                               `--------------------'  `--------------------'
+ */
+// SYMBOLS
+[SYMB] = LAYOUT_dactyl(
+       // left hand
+          VRSN,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+       KC_TRNS,  KC_EXLM,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_PIPE,
+       KC_TRNS,  KC_HASH,   KC_DLR,  KC_LPRN,  KC_RPRN,   KC_GRV,
+       KC_TRNS,  KC_PERC,  KC_CIRC,  KC_LBRC,  KC_RBRC,  KC_TILD,
+         RESET,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+                                                         KC_TRNS,  KC_TRNS,
+                                                                   KC_TRNS,
+                                               KC_TRNS,  KC_TRNS,  KC_TRNS,
+       // right hand
+                KC_F6,      KC_F7,   KC_F8, KC_F9,  KC_F10,   KC_F11,
+                KC_UP,       KC_7,    KC_8,  KC_9, KC_ASTR,   KC_F12,
+                KC_DOWN,     KC_4,    KC_5,  KC_6, KC_PLUS,  KC_TRNS,
+                KC_AMPR,     KC_1,    KC_2,  KC_3, KC_BSLS,  KC_TRNS,
+                          KC_TRNS,  KC_DOT,  KC_0,  KC_EQL,  KC_TRNS,
+      KC_TRNS,  KC_TRNS,
+      KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_TRNS
+),
+/* Keymap 2: Media and mouse keys
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      | MsUp |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |MsLeft|MsDown|MsRght|      |                    |      |      |      |      |      | Play |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      | Prev | Next |      |      |
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * |      |      |      | Lclk | Rclk |                                  | VolUp| VolDn| Mute |      |      |
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      |      |      |  |      |      |
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      |      |  |      |      |Brwser|
+ *                               |      |      |------|  |------|      |Back  |
+ *                               |      |      |      |  |      |      |      |
+ *                               `--------------------'  `--------------------'
+ *
+ */
+// MEDIA AND MOUSE
+[MDIA] = LAYOUT_dactyl(
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MS_U,  KC_TRNS,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_BTN1,  KC_BTN2,
+                                                         KC_TRNS,  KC_TRNS,
+                                                                   KC_TRNS,
+                                               KC_TRNS,  KC_TRNS,  KC_TRNS,
+    // right hand
+                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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MPLY,
+                KC_TRNS,  KC_TRNS,  KC_MPRV,  KC_MNXT,  KC_TRNS,  KC_TRNS,
+                          KC_VOLU,  KC_VOLD,  KC_MUTE,  KC_TRNS,  KC_TRNS,
+      KC_TRNS,  KC_TRNS,
+      KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_WBAK
+),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB)                // FN1 - Momentary Layer 1 (Symbols)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+  switch(id) {
+    case 0:
+      if (record->event.pressed) {
+        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+      }
+      break;
+    case 1:
+      if (record->event.pressed) { // For resetting EEPROM
+        eeconfig_init();
+      }
+      break;
+  }
+  return MACRO_NONE;
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case VRSN:
+      if (record->event.pressed) {
+        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {};
diff --git a/keyboards/handwired/dactyl/keymaps/dvorak/readme.md b/keyboards/handwired/dactyl/keymaps/dvorak/readme.md
new file mode 100644
index 0000000000..42ec3cd4f6
--- /dev/null
+++ b/keyboards/handwired/dactyl/keymaps/dvorak/readme.md
@@ -0,0 +1,9 @@
+# Dactyl Dvorak keymap
+
+Modifiers and layers 1+ are the same as in the default layout.
+Only the layer-0 dvorak-relevant keys are different.
+
+## Changelog
+
+* Nov 2017:
+  * Copied and adapted from the default keymap.
diff --git a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
new file mode 100644
index 0000000000..d22d138a00
--- /dev/null
+++ b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
@@ -0,0 +1,162 @@
+#include "dactyl.h"
+#include "debug.h"
+#include "action_layer.h"
+#include "version.h"
+
+#define BASE 0 // default layer
+#define CONT 1 // control layer
+#define QWER 2 // qwerty layer
+
+enum custom_keycodes {
+  PLACEHOLDER = SAFE_RANGE, // ensure these codes start after the highest keycode defined in Quantum
+  COLON_EQ,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | Esc  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |   \  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |  '"  |   ,  |   .  |   P  |   Y  |                    |   F  |   G  |   C  |   R  |   L  |   /  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  :=  |   A  |   O  |   E  |   U  |   I  |                    |   D  |   H  |   T  |   N  |   S  |   -  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LShift|   ;  |   Q  |   J  |   K  |   X  |                    |   B  |   M  |   W  |   V  |   Z  |RShift|
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * | Home |   `  |   =  | Left | Right|                                  |  Up  | Down |   [  |   ]  | End  |
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      | LCtl | LAlt |  | RCtl | Ralt |
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      |  L1  |  |  L1  |      |      |
+ *                               | Back |Delete|------|  |------|Enter |Space |
+ *                               |Space |      | LGui |  | RGui |      |      |
+ *                               `--------------------'  `--------------------'
+ */
+[BASE] = LAYOUT_dactyl(  // layer 0 : default
+        // left hand
+    KC_ESC,     KC_1,     KC_2,     KC_3,     KC_4,      KC_5,
+    KC_TAB,  KC_QUOT,  KC_COMM,   KC_DOT,     KC_P,      KC_Y,
+  COLON_EQ,     KC_A,     KC_O,     KC_E,     KC_U,      KC_I,
+   KC_LSFT,  KC_SCLN,     KC_Q,     KC_J,     KC_K,      KC_X,
+   KC_HOME,   KC_GRV,   KC_EQL,  KC_LEFT,  KC_RGHT,
+                                                    KC_LCTRL,   KC_LALT,
+                                                               MO(CONT),
+                                          KC_BSPC,    KC_DEL,   KC_LGUI,
+        // right hand
+                       KC_6,     KC_7,      KC_8,     KC_9,     KC_0,  KC_BSLS,
+                       KC_F,     KC_G,      KC_C,     KC_R,     KC_L,  KC_SLSH,
+                       KC_D,     KC_H,      KC_T,     KC_N,     KC_S,  KC_MINS,
+                       KC_B,     KC_M,      KC_W,     KC_V,     KC_Z,  KC_RSFT,
+                                 KC_UP,  KC_DOWN,  KC_LBRC,  KC_RBRC,   KC_END,
+          KC_RALT,  KC_RCTL,
+         MO(CONT),
+          KC_RGUI,   KC_ENT,  KC_SPACE
+    ),
+/* Keymap 1: Control layer (media keys, Fkeys, numpad)
+ *
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  |  F10 | RESET|
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      | Mute | VolD | VolU |      |                    |      |   7  |   8  |   9  |   +  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      | Prev |PPause| Next |      |                    |      |   4  |   5  |   6  |   =  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |   1  |   2  |   3  |   ,  |      |
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * |PageUp|      |      |      |      |                                  |   0  |   0  |   .  |      |PageDn|
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      |      |      |  |      |      |
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      |      |  |      |      |      |
+ *                               |      |      |------|  |------|      |      |
+ *                               |      |      |      |  |      |      |      |
+ *                               `--------------------'  `--------------------'
+ */
+// SYMBOLS
+[CONT] = LAYOUT_dactyl(
+       // left hand
+       KC_TRNS,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+       KC_TRNS,  KC_TRNS,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,
+      TG(QWER),  KC_TRNS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_TRNS,
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+       KC_PGUP,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+                                                         KC_TRNS,  KC_TRNS,
+                                                                   KC_TRNS,
+                                               KC_TRNS,  KC_TRNS,  KC_TRNS,
+       // right hand
+                KC_F6,      KC_F7,   KC_F8,   KC_F9,      KC_F10,    RESET,
+                KC_TRNS,     KC_7,    KC_8,    KC_9,  KC_KP_PLUS,  KC_TRNS,
+                KC_TRNS,     KC_4,    KC_5,    KC_6,      KC_EQL,  KC_TRNS,
+                KC_TRNS,     KC_1,    KC_2,    KC_3,     KC_COMM,  KC_TRNS,
+                             KC_0,    KC_0,  KC_DOT,     KC_TRNS,  KC_PGDN,
+      KC_TRNS,  KC_TRNS,
+      KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_TRNS
+),
+/* Keymap 2: QWERTY overlay
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |   [  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   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  |   ,  |   .  |   /  |      |
+ * |------+------+------+------+------+------'                    `------+------+------+------+------+------|
+ * |      |      |      |      |      |                                  |      |      |   -  |   \  |      |
+ * `----------------------------------'                                  `----------------------------------'
+ *                                      ,-------------.  ,-------------.
+ *                                      |      |      |  |      |      |
+ *                               ,------|------|------|  |------+------+------.
+ *                               |      |      |      |  |      |      |      |
+ *                               |      |      |------|  |------|      |      |
+ *                               |      |      |      |  |      |      |      |
+ *                               `--------------------'  `--------------------'
+ *
+ */
+// QWERTY
+[QWER] = LAYOUT_dactyl(
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+       KC_TRNS,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+       KC_TRNS,     KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+       KC_TRNS,     KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+                                                         KC_TRNS,  KC_TRNS,
+                                                                   KC_TRNS,
+                                               KC_TRNS,  KC_TRNS,  KC_TRNS,
+    // right hand
+                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_LBRC,
+                   KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,  KC_RBRC,
+                   KC_H,     KC_J,     KC_K,     KC_L,  KC_SCLN,  KC_QUOT,
+                   KC_N,     KC_M,  KC_COMM,   KC_DOT,  KC_SLSH,  KC_TRNS,
+                          KC_TRNS,  KC_TRNS,  KC_MINS,  KC_BSLS,  KC_TRNS,
+      KC_TRNS,  KC_TRNS,
+      KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_TRNS
+),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    switch(keycode) {
+      case COLON_EQ:
+        SEND_STRING(":=");
+        return false;
+        break;
+    }
+  }
+
+  return true;
+}
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {};
diff --git a/keyboards/handwired/dactyl/keymaps/erincalling/readme.md b/keyboards/handwired/dactyl/keymaps/erincalling/readme.md
new file mode 100644
index 0000000000..7528ed07eb
--- /dev/null
+++ b/keyboards/handwired/dactyl/keymaps/erincalling/readme.md
@@ -0,0 +1,6 @@
+# Erincalling Dactyl keymap
+
+## Changelog
+
+* Nov 2017:
+  * Ported and adapted from the ergodox-firmware layout I'd been using