]> git.donarmstrong.com Git - qmk_firmware.git/blobdiff - keyboards/ergodox/keymaps/common-nighthawk/keymap.c
Merge branch 'master' of https://github.com/qmk/qmk_firmware
[qmk_firmware.git] / keyboards / ergodox / keymaps / common-nighthawk / keymap.c
index 974431370035062fc9f860fb85c6b1078939aeae..debf384f3d0d4ec931ac2db769ef16a351a7ae91 100644 (file)
@@ -9,16 +9,14 @@
 
 //Tap Dance Declarations
 enum {
-  TD_J_LBRC = 0,
-  TD_K_RBRC,
-  TD_Y_ESC,
+  TD_U_LBRC = 0,
+  TD_I_RBRC,
 };
 
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_J_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_J, KC_LBRC),
-  [TD_K_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_K, KC_RBRC),
-  [TD_Y_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_Y, KC_ESC)
+  [TD_U_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_U, KC_LBRC),
+  [TD_I_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_RBRC)
 };
 
 //Macro Declarations
@@ -28,54 +26,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   x  |   x  |   x  |   _  | Hypr | Home |           | End  | Hypr |  Esc |   x  |   x  |   x  |   `~   |
+ * |  _     |   x  |   x  |   _  |  Esc | Hypr | Home |           | End  | Hypr |   [  |   ]  |  `~  |  `~  |  Bks   |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |Tab/Ctrl|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |Y 2Esc|   U  |   I  |   O  |   P  |Bks/Ctrl|
+ * |Ctrl/Tab|   Q  |   W  |   E  |   R  |   T  |  Up  |           | PgUp |   Y  |   U  |   I  |   O  |   P  |  Ctrl  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | '"/Cmd |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  | J 2[ | K 2] |   L  |  ;:  |Entr/Cmd|
+ * | Cmd/"' |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;:  |Cmd/Entr|
  * |--------+------+------+------+------+------| Down |           | PgDn |------+------+------+------+------+--------|
- * | _/Shft |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  | _/Shft |
+ * |  Shft  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  ,<  |  .>  |  /?  |  Shft  |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |   x  |   x  |   x  |  Alt |
+ *   | Alt  |   x  |   x  |   x  | Left |                                       |Right |  Bks |   x  |   x  |  Alt |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
- *                                        | Mute | VolUp|       | Play |  Del   |
+ *                                        |Teensy| VolUp|       | Play |  Del   |
  *                                 ,------|------|------|       |------+--------+------.
  *                                 |      |      | VolDn|       | Next |        |      |
- *                                 |Sp/~L1|  L2  |------|       |------|   L2   |Sp/~L1|
- *                                 |      |      |Teensy|       | Prev |        |      |
+ *                                 |Sp/~L1|  L2  |------|       |------|   L2   |'"/~L1|
+ *                                 |      |      | Mute |       | Prev |        |      |
  *                                 `--------------------'       `----------------------'
  */
 [BASE] = KEYMAP(  // layer 0 : default
         // left hand
-        KC_ESC,          KC_1,          KC_1,          KC_1,            KC_UNDS,  ALL_T(KC_NO),      KC_HOME,
+        KC_UNDS,         KC_1,          KC_1,          KC_UNDS,         KC_ESC,   ALL_T(KC_NO),      KC_HOME,
         CTL_T(KC_TAB),   KC_Q,          KC_W,          KC_E,            KC_R,     KC_T,              KC_UP,
-        GUI_T(KC_QUOT),  KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
-        M(1),            KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
+        M(1),            KC_A,          KC_S,          KC_D,            KC_F,     KC_G,
+        KC_LSFT,         KC_Z,          KC_X,          KC_C,            KC_V,     KC_B,              KC_DOWN,
         KC_LALT,         KC_1,          KC_1,          KC_1,            KC_LEFT,
-                                                                        KC_MUTE,  KC_VOLU,
+                                                                        RESET,    KC_VOLU,
                                                                         KC_VOLD,
-                                                                        LT(SYMB, KC_SPC),  TG(MDIA),  RESET,
+                                                                        LT(SYMB, KC_SPC),  TG(MDIA), KC_MUTE,
         // right hand
-        KC_END,          ALL_T(KC_NO),  KC_ESC,         KC_1,           KC_1,     KC_1,              KC_GRV,
-        KC_PGUP,         TD(TD_Y_ESC),  KC_U,           KC_I,           KC_O,     KC_P,              CTL_T(KC_BSPC),
-                         KC_H,          TD(TD_J_LBRC),  TD(TD_K_RBRC),  KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
-        KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           M(1),
-                                        KC_RGHT,        KC_1,           KC_1,     KC_1,              KC_RALT,
+        KC_END,          ALL_T(KC_NO),  KC_LBRC,        KC_RBRC,        KC_GRV,   KC_GRV,            KC_BSPC,
+        KC_PGUP,         KC_Y,          KC_U,           KC_I,           KC_O,     KC_P,              KC_LCTRL,
+                         KC_H,          KC_J,           KC_K,           KC_L,     KC_SCOLON,         GUI_T(KC_ENT),
+        KC_PGDN,         KC_N,          KC_M,           KC_COMM,        KC_DOT,   KC_SLSH,           KC_RSFT,
+                                        KC_RGHT,        KC_BSPC,        KC_1,     KC_1,              KC_RALT,
         KC_MPLY,         KC_DEL,
         KC_MNXT,
-        KC_MPRV,         TG(MDIA),      LT(SYMB, KC_SPC)
+        KC_MPRV,         TG(MDIA),      LT(SYMB, KC_QUOT)
     ),
 /* Keymap 1: Symbol Layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   ^  |   {  |   (  |   [  |      |           |      |   =  |   7  |   8  |   9  |   0  |        |
+ * |        |   !  |   ^  |   [  |   (  |   {  |      |           |      |   =  |   7  |   8  |   9  |   0  |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   &  |   $  |   }  |   )  |   ]  |------|           |------|   +  |   4  |   5  |   6  |   *  |        |
+ * |        |   &  |   $  |   ]  |   )  |   }  |------|           |------|   +  |   4  |   5  |   6  |   *  |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   \  |   #  |   @  |   %  |   |  |      |           |      |   -  |   1  |   2  |   3  |   /  |        |
+ * |        |   \  |   @  |   #  |   %  |   |  |      |           |      |   -  |   1  |   2  |   3  |   /  |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |      |      |      |      |      |                                       |   0  |   0  |   .  |      |      |
  *   `----------------------------------'                                       `----------------------------------'
@@ -91,9 +89,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [SYMB] = KEYMAP(
        // left hand
        KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_TRNS,
-       KC_TRNS,  KC_EXLM,  KC_CIRC,  KC_LCBR,  KC_LPRN,  KC_LBRC,  KC_TRNS,
-       KC_TRNS,  KC_AMPR,  KC_DLR,   KC_RCBR,  KC_RPRN,  KC_RBRC,
-       KC_TRNS,  KC_BSLS,  KC_HASH,  KC_AT,    KC_PERC,  KC_PIPE,  KC_TRNS,
+       KC_TRNS,  KC_EXLM,  KC_CIRC,  KC_LBRC,  KC_LPRN,  KC_LCBR,  KC_TRNS,
+       KC_TRNS,  KC_AMPR,  KC_DLR,   KC_RBRC,  KC_RPRN,  KC_RCBR,
+       KC_TRNS,  KC_BSLS,  KC_AT,    KC_HASH,  KC_PERC,  KC_PIPE,  KC_TRNS,
        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
                                                KC_TRNS,  KC_TRNS,
                                                KC_TRNS,
@@ -168,13 +166,17 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         case 1:
           if (record->event.pressed) {
             sunds_timer = timer_read();
-            register_code (KC_LSFT);
+            register_code (KC_LGUI);
           } else {
             if (timer_elapsed (sunds_timer) < TAPPING_TERM) {
-              register_code (KC_MINS);
-              unregister_code (KC_MINS);
+              unregister_code (KC_LGUI);
+              register_code (KC_LSFT);
+              register_code (KC_QUOT);
+              unregister_code (KC_QUOT);
+              unregister_code (KC_LSFT);
+              register_code (KC_LGUI);
             }
-            unregister_code (KC_LSFT);
+            unregister_code (KC_LGUI);
           }
           break;