add auto shift and reset via leader key

qmk · noroadsleft · Mar 3, 2020 · Dec 29, 2019 · Jan 7, 2020 · Jan 7, 2020
commit 99ec959eff7cabf62e6030cee8b466ad19c5f218
diff --git a/keyboards/preonic/keymaps/alfrdmalr/config.h b/keyboards/preonic/keymaps/alfrdmalr/config.h
@@ -35,3 +35,6 @@
 
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+#define LEADER_TIMEOUT 400
+#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/preonic/keymaps/alfrdmalr/keymap.c b/keyboards/preonic/keymaps/alfrdmalr/keymap.c
@@ -38,6 +38,9 @@ enum preonic_keycodes {
   SETTINGS
 };
 
+#define NUMSPACE LT(_NUMPAD, KC_SPC)
+#define CTRLSHFT C(KC_LSFT)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
@@ -48,17 +51,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | NAV  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | SHIFT|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |SHIFT |
+ * | SHFT |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | SHFT |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | CTRL | HYPR | LGUI | LALT | SYMB |  SPACE/NUM  | SYMB | RALT | num? |mu tog| CTRL |
+ * | CTRL | C/S  | LGUI | LALT | SYMB |  SPACE/NUM  | SYMB | RALT | SETT |mu tog| LEAD |
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_preonic_grid( \
-  KC_GRV,      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_DEL,  \
-  NAVIGATION,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,               KC_H,                KC_J,    KC_K,    KC_L,    KC_SCLN,        KC_QUOT, \
-  KC_LSFT,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,               KC_N,                KC_M,    KC_COMM, KC_DOT,  KC_SLSH,        KC_RSFT,  \
-  KC_LCTL,     NUMPAD,  KC_LGUI, KC_LALT, SYMBOLS, LT(_NUMPAD, KC_SPC), LT(_NUMPAD, KC_SPC),  SYMBOLS, KC_RALT, SETTINGS,  MU_TOG, KC_RCTRL  \
+  KC_GRV,      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_DEL,  \
+  NAVIGATION,  KC_A,     KC_S,    KC_D,    KC_F,    KC_G,     KC_H,     KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, \
+  KC_LSFT,     KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,     KC_N,     KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT,  \
+  KC_LCTL,     CTRLSHFT, KC_LGUI, KC_LALT, SYMBOLS, NUMSPACE, NUMSPACE, SYMBOLS, KC_RALT, SETTINGS, MU_TOG,  KC_LEAD  \
 ),
 
 /* SYMBOLS
@@ -67,9 +70,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Tab  |   #  |   $  |   {  |   }  |      |      |   ^  |   *  |   |  |   ~  | Del  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   <  |   >  |   (  |   )  |      |      |   -  |   +  |   &  |   `  |ENTER |
+ * | Esc  |   <  |   >  |   (  |   )  |      |      |   -  |   +  |   &  |   `  | ENTR |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   @  |   !  |   [  |   ]  |      |      |   _  |   =  |   %  |   /  |SHIFT |
+ * | Shift|   @  |   !  |   [  |   ]  |      |      |   _  |   =  |   %  |   /  | SHFT |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | TRNS | TRNS | TRNS | TRNS | TRNS |    TRNS     | TRNS | TRNS | TRNS | TRNS | TRNS |
  * `-----------------------------------------------------------------------------------'
@@ -86,26 +89,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | TRNS |      |      | SPC  |  F5  |      |      | HOME | END  | TAB  |      | Del  |
+ * | TRNS |      |      | SPC  |  F5  |      | INS  | HOME | END  | TAB  |      | Del  |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | NAV  | SHIFT| CTRl | ALT  | GUI  |      | LEFT | DOWN | UP   | RIGHT|      | ENTER|
+ * | NAV  | SHIFT| CTRl | ALT  | GUI  |      | LEFT | DOWN | UP   | RIGHT|      | ENTR |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | SHIFT|      | CUT  | COPY | PASTE|      | SPC  | PGDO | PGUP |      |      | SHIFT|
+ * | SHFT | UNDO | CUT  | COPY | PASTE|      | SPC  | PGDO | PGUP |      |      | SHFT |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | TRNS | TRNS | TRNS | TRNS | TRNS |     ESC     | TRNS | TRNS | TRNS | TRNS | TRNS |
  * `-----------------------------------------------------------------------------------'
  */
 [_NAVIGATION] = LAYOUT_preonic_grid( \
   KC_GRV,  KC_1,    KC_2,     KC_3,    KC_4,     KC_5,    KC_6,    KC_7,    KC_8,    KC_9,      KC_0,    KC_BSPC, \
-  KC_TRNS, KC_NO,   KC_NO,    KC_SPC,  KC_F5,    KC_NO,   KC_NO,   KC_HOME, KC_END,  KC_TAB,    KC_NO,   KC_DEL,  \
-  KC_TRNS, KC_LSFT, KC_LCTRL, KC_LALT, KC_LGUI,  KC_NO,   KC_LEFT,   KC_DOWN, KC_UP,   KC_RIGHT,  KC_NO,   KC_ENT, \
-  KC_TRNS, KC_UNDO, KC_CUT,   KC_COPY, KC_PASTE, KC_NO,   KC_SPC,  KC_PGDN, KC_PGUP, KC_NO,     KC_NO,   KC_TRNS,  \
+  KC_TRNS, KC_NO,   KC_NO,    KC_SPC,  KC_F5,    KC_NO,   KC_INS,  KC_HOME, KC_END,  KC_TAB,    KC_NO,   KC_DEL,  \
+  KC_TRNS, KC_LSFT, KC_LCTRL, KC_LALT, KC_LGUI,  KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,  KC_NO,   KC_ENT, \
+  KC_TRNS, C(KC_Z), C(KC_X),  C(KC_C), C(KC_V),  KC_NO,   KC_SPC,  KC_PGDN, KC_PGUP, KC_NO,     KC_NO,   KC_TRNS,  \
   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_ESC,  KC_ESC,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS  \
 ),
 
 /* NUMPAD
- * By not having r5/c11 be transparent, we can soft lock the layer by using that key from the base 
- * layer to get here. can always untoggle with one of the other keys (space, r5/c2)
  * ,-----------------------------------------------------------------------------------.
  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -115,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | TRNS |  F1  |  F2  |  F3  |  F4  | ALT  | CAPS |   1  |   2  |   3  |   /  | TRNS |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- *j | TRNS | TRNS | TRNS | TRNS | TRNS |    TRNS     |   0  |   ,  |   .  |   *  | TRNS |
+ *j | TRNS | TRNS | TRNS | TRNS | TRNS |    TRNS    |   0  |   ,  |   .  |   *  | TRNS |
  * `-----------------------------------------------------------------------------------'
  */
 [_NUMPAD] = LAYOUT_preonic_grid( \
@@ -130,20 +131,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
+ * |      |      |      |      |      |      |      |      |      |      |      |  Del |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |      |Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
+ * | ASTG |Voice-|Voice+|Mus on|MusOff|MidiOn|MidOff|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
  */
 [_SETTINGS] = LAYOUT_preonic_grid( \
   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
-  _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
+  _______, _______,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL,  \
   _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  _______, _______,  _______, _______, \
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
+  KC_ASTG, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
 )
 };
@@ -228,49 +229,7 @@ uint16_t muse_counter = 0;
 uint8_t muse_offset = 70;
 uint16_t muse_tempo = 50;
 
-// void encoder_update_user(uint8_t index, bool clockwise) {
-//   if (muse_mode) {
-//     if (IS_LAYER_ON(_RAISE)) {
-//       if (clockwise) {
-//         muse_offset++;
-//       } else {
-//         muse_offset--;
-//       }
-//     } else {
-//       if (clockwise) {
-//         muse_tempo+=1;
-//       } else {
-//         muse_tempo-=1;
-//       }
-//     }
-//   } else {
-//     if (clockwise) {
-//       register_code(KC_PGDN);
-//       unregister_code(KC_PGDN);
-//     } else {
-//       register_code(KC_PGUP);
-//       unregister_code(KC_PGUP);
-//     }
-//   }
-// }
-
-void dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            // if (active) {
-            //     layer_on(_ADJUST);
-            // } else {
-            //     layer_off(_ADJUST);
-            // }
-            break;
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-}
+LEADER_EXTERNS();
 
 void matrix_scan_user(void) {
 #ifdef AUDIO_ENABLE
@@ -291,6 +250,14 @@ void matrix_scan_user(void) {
         }
     }
 #endif
+
+  LEADER_DICTIONARY() {
+    leading = false;
+    SEQ_FIVE_KEYS(KC_R, KC_E, KC_S, KC_E, KC_T) {
+      reset_keyboard();
+    }
+    leader_end(); 
+  }
 }
 
 bool music_mask_user(uint16_t keycode) {

diff --git a/keyboards/preonic/keymaps/alfrdmalr/rules.mk b/keyboards/preonic/keymaps/alfrdmalr/rules.mk
@@ -1 +1,3 @@
 SRC += muse.c
+AUTO_SHIFT_ENABLE = yes
+LEADER_ENABLE = yes