Update to drashna userspace (Keymap Templating) (#2338)

* Change tapping term to be longer

* Make Audio/Underglow settings permanent

* Use wait_ms rather than _delay_ms

* Readd One Shot Mods

* Switch to Imperial March startup sound

* Move OSM to it's own layer

* Minor Formatting Tweaks

* Keymap Templates and formatting fixes

2 files changed, 93 insertions, 73 deletions

diff --git a/keyboards/ergodox_ez/keymaps/drashna/config.h b/keyboards/ergodox_ez/keymaps/drashna/config.h
index 2f5422b14..d543379a3 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/config.h
+++ b/keyboards/ergodox_ez/keymaps/drashna/config.h
@@ -15,7 +15,7 @@
 #ifdef TAPPING_TERM
 #undef TAPPING_TERM
 #endif
-#define TAPPING_TERM 150
+#define TAPPING_TERM 175
 #undef PERMISSIVE_HOLD
 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 #define ONESHOT_TAP_TOGGLE 2
diff --git a/keyboards/ergodox_ez/keymaps/drashna/keymap.c b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
index 0d0e1fba2..268a1d085 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
@@ -48,26 +48,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      | End   |       | PgDn |       |      |
  *                                 `---------------------'       `---------------------'
  */
-  [_QWERTY] = LAYOUT_ergodox(
-                KC_EQUAL,       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       TG(_MOUS),
-                KC_TAB,         KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       TG(_DIABLO),
-                KC_BSPACE,      KC_A,       KC_S,       KC_D,       KC_F,       KC_G,
-                KC_LSFT,      LCTL_T(KC_Z),KC_X,       KC_C,       KC_V,       KC_B,       TG(_GAMEPAD),
-                LT(_SYMB,KC_GRAVE),KC_QUOTE, KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
+  [_QWERTY] = LAYOUT_ergodox_wrapper(
+                KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    TG(_MOUS),
+                KC_TAB,  _________________QWERTY_L1_________________, TG(_DIABLO),
+                KC_BSPC, _________________QWERTY_L2_________________,
+                KC_LSFT, _________________QWERTY_L3_________________, TG(_GAMEPAD),
+       LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________,
                 
-                                    ALT_T(KC_APPLICATION),  KC_LGUI,
-                                                            KC_HOME,
-                                    KC_SPACE,   KC_BSPACE,  KC_END,
+                                            ALT_T(KC_APP),   KC_LGUI,
+                                                             KC_HOME,
+                                           KC_SPACE,KC_BSPC, KC_END,
                                     
-                TG(_MOUS),       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,           KC_MINUS,
-                TG(_DIABLO),     KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,           KC_BSLASH,
-                                KC_H,       KC_J,       KC_K,       KC_L,       KC_SCOLON,      GUI_T(KC_QUOTE),
-                TG(_GAMEPAD),  KC_N,       KC_M,       KC_COMMA,   KC_DOT,     RCTL_T(KC_SLASH),OSM(MOD_RSFT),
-                                            KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(_SYMB),
-                KC_RGUI,    CTL_T(KC_ESCAPE),
-                KC_PGUP,
-                KC_PGDOWN,  KC_DELETE,  KC_ENTER
-            ),
+           TG(_MOUS),    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,   KC_MINS,
+           TG(_DIABLO),  _________________QWERTY_R1_________________, KC_BSLS,
+                         _________________QWERTY_R2_________________, GUI_T(KC_QUOT),
+           TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_RSFT,
+                         ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
+           KC_RGUI,      CTL_T(KC_ESCAPE),
+           KC_PGUP,
+           KC_PGDOWN,    KC_DELETE,  KC_ENTER
+    ),
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
@@ -91,25 +91,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[_COLEMAK] = LAYOUT_ergodox(  
+[_COLEMAK] = LAYOUT_ergodox_wrapper(  
         // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(_MOUS),
-        KC_TAB,         KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   TG(_DIABLO),
-        KC_BSPC,        KC_A,         KC_R,   KC_S,   KC_T,   KC_D,
-        KC_LSFT,        LCTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   TG(_GAMEPAD),
-        LT(_SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
-                                              ALT_T(KC_APP),  KC_LGUI,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
+                KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    TG(_MOUS),
+                KC_TAB,  _________________COLEMAK_L1________________, TG(_DIABLO),
+                KC_BSPC, _________________COLEMAK_L2________________,
+                KC_LSFT, _________________COLEMAK_L3________________, TG(_GAMEPAD),
+       LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________,
+                                            ALT_T(KC_APP),   KC_LGUI,
+                                                             KC_HOME,
+                                           KC_SPACE,KC_BSPC, KC_END,
         // right hand
-             TG(_MOUS),    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(_DIABLO),  KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,          KC_BSLS,
-                          KC_H,   KC_N,   KC_E,   KC_I,   KC_O,             GUI_T(KC_QUOTE),
-             TG(_GAMEPAD),KC_K,  KC_M,   KC_COMM,KC_DOT, RCTL_T(KC_SLASH), OSM(MOD_RSFT),
-                          KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(_SYMB),
-             KC_RGUI,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_DELETE, KC_ENT
+           TG(_MOUS),    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,   KC_MINS,
+           TG(_DIABLO),  _________________COLEMAK_R1________________, KC_BSLS,
+                         _________________COLEMAK_R2________________, GUI_T(KC_QUOT),
+           TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_RSFT,
+                         ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
+           KC_RGUI,      CTL_T(KC_ESCAPE),
+           KC_PGUP,
+           KC_PGDOWN,    KC_DELETE,  KC_ENTER
     ),
 /* Keymap 0: Basic layer
  *
@@ -134,25 +134,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[_DVORAK] = LAYOUT_ergodox(  
+[_DVORAK] = LAYOUT_ergodox_wrapper(  
         // left hand
-        KC_EQL,         KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   TG(_MOUS),
-        KC_TAB,         KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(_DIABLO),
-        KC_BSPC,        KC_A,           KC_O,    KC_E,   KC_U,   KC_I,
-        KC_LSFT,  LCTL_T(KC_SCLN), KC_Q,    KC_J,   KC_K,   KC_X,   TG(_GAMEPAD),
-        LT(_SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET, KC_RBRACKET,
-                                              ALT_T(KC_APP),  KC_LEAD,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
+                KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    TG(_MOUS),
+                KC_TAB,  _________________DVORAK_L1_________________, TG(_DIABLO),
+                KC_BSPC, _________________DVORAK_L2_________________,
+                KC_LSFT, _________________DVORAK_L3_________________, TG(_GAMEPAD),
+       LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________,
+                                            ALT_T(KC_APP),   KC_LGUI,
+                                                             KC_HOME,
+                                           KC_SPACE,KC_BSPC, KC_END,
         // right hand
-             TG(_MOUS),     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,        KC_BSLS,
-             TG(_DIABLO),   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,        KC_SLSH,
-                           KC_D,   KC_H,   KC_T,   KC_N,   KC_S,        KC_MINS,
-             TG(_GAMEPAD),KC_B,   KC_M,   KC_W,   KC_V,   RCTL_T(KC_Z), OSM(MOD_RSFT),
-                                   KC_LEFT,KC_DOWN,KC_UP,  KC_RIGHT,    TT(_SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_DELETE, KC_ENT
+           TG(_MOUS),    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,   KC_BSLS,
+           TG(_DIABLO),  _________________DVORAK_R1_________________, KC_SLSH,
+                         _________________DVORAK_R2_________________, GUI_T(KC_MINS),
+           TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_RSFT,
+                         ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
+           KC_RGUI,      CTL_T(KC_ESCAPE),
+           KC_PGUP,
+           KC_PGDOWN,    KC_DELETE,  KC_ENTER
     ),
 /* Keymap 0: Basic layer
  *
@@ -177,27 +177,47 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
-[_WORKMAN] = LAYOUT_ergodox(  
+[_WORKMAN] = LAYOUT_ergodox_wrapper(  
         // left hand
-        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(_MOUS),
-        KC_TAB,         KC_Q,         KC_D,   KC_R,   KC_W,   KC_B,   TG(_DIABLO),
-        KC_BSPC,        KC_A,         KC_S,   KC_H,   KC_T,   KC_G,
-        KC_LSFT,        LCTL_T(KC_Z),  KC_X,   KC_M,   KC_C,   KC_V,   TG(_GAMEPAD),
-        LT(_SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
-                                              ALT_T(KC_APP),  KC_LEAD,
-                                                              KC_HOME,
-                                               KC_SPC,KC_BSPC,KC_END,
+                KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    TG(_MOUS),
+                KC_TAB,  _________________WORKMAN_L1________________, TG(_DIABLO),
+                KC_BSPC, _________________WORKMAN_L2________________,
+                KC_LSFT, _________________WORKMAN_L3________________, TG(_GAMEPAD),
+       LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________,
+                                            ALT_T(KC_APP),   KC_LGUI,
+                                                             KC_HOME,
+                                           KC_SPACE,KC_BSPC, KC_END,
         // right hand
-             TG(_MOUS),    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             TG(_DIABLO),  KC_J,   KC_F,   KC_U,   KC_P,   KC_SCLN,          KC_BSLS,
-                          KC_Y,   KC_N,   KC_E,   KC_O,   KC_I,             KC_QUOTE,
-             TG(_GAMEPAD),KC_K,  KC_L,   KC_COMM,KC_DOT, RCTL_T(KC_SLASH), OSM(MOD_RSFT),
-                          KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(_SYMB),
-             KC_LALT,        CTL_T(KC_ESC),
-             KC_PGUP,
-             KC_PGDN,KC_DELETE, KC_ENT
+           TG(_MOUS),    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+           TG(_DIABLO),  _________________WORKMAN_R1________________, KC_BSLS,
+                         _________________WORKMAN_R2________________, GUI_T(KC_QUOT),
+           TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_RSFT,
+                         ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
+           KC_RGUI,      CTL_T(KC_ESCAPE),
+           KC_PGUP,
+           KC_PGDOWN,    KC_DELETE,  KC_ENTER
     ),
 
+  [_MODS] = LAYOUT_ergodox(
+                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_TRNS,    KC_TRNS,      KC_TRNS,
+                OSM(MOD_LSFT),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_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_TRNS,      KC_TRNS,      KC_TRNS,
+                KC_TRNS,    KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,      OSM(MOD_RSFT),
+                                          KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS,
+                KC_TRNS,    KC_TRNS,
+                KC_TRNS,
+                KC_TRNS,    KC_TRNS,      KC_TRNS
+            ),
+
     /* Keymap 3: Symbol Layer
 *
 * ,--------------------------------------------------.           ,--------------------------------------------------.
@@ -220,11 +240,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 `--------------------'       `--------------------'
 */
   [_SYMB] = LAYOUT_ergodox(
-                EPRM,      KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_WORKMAN,
-                VRSN,           KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    KC_PIPE,    KC_DVORAK,
+                EPRM,           KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      TG(_MODS),
+                VRSN,           KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    KC_PIPE,    KC_WORKMAN,
                 KC_MAKE,        KC_HASH,    KC_DLR,     KC_LPRN,    KC_RPRN,    KC_GRAVE,
                 KC_RESET,       KC_PERC,    KC_CIRC,    KC_LBRACKET,KC_RBRACKET,KC_TILD,    KC_COLEMAK,
-                KC_TRNS,          KC_AMPR,    KC_ASTR,    KC_COLN,    KC_SCOLON,
+                KC_TRNS,        KC_AMPR,    KC_ASTR,    KC_COLN,    KC_SCOLON,
                                                                   RGB_SMOD, KC_RGB_T,
                                                                   RGB_HUI,
                                                                   RGB_M_R, RGB_M_SW, RGB_HUD,