diff options
| author | Stephen Tudor <smt@smt.io> | 2017-03-20 07:43:45 -0400 |
|---|---|---|
| committer | Stephen Tudor <smt@smt.io> | 2017-03-20 07:43:45 -0400 |
| commit | 34c5f8094e3a07dfff344f95b29407c9efaa0e4c (patch) | |
| tree | aa45ab42017b200715c7d0379b5813f3e6006b5d | |
| parent | b10d95070831dde5801e930c615612dec3a6fd11 (diff) | |
| download | qmk_firmware-34c5f8094e3a07dfff344f95b29407c9efaa0e4c.tar.gz qmk_firmware-34c5f8094e3a07dfff344f95b29407c9efaa0e4c.zip | |
Remove tap-dance. Raise will be accessed via holding shift while lower is active
| -rw-r--r-- | keyboards/satan/keymaps/smt/Makefile | 1 | ||||
| -rw-r--r-- | keyboards/satan/keymaps/smt/keymap.c | 32 |
2 files changed, 11 insertions, 22 deletions
diff --git a/keyboards/satan/keymaps/smt/Makefile b/keyboards/satan/keymaps/smt/Makefile index afcd025e1..0c9ae824f 100644 --- a/keyboards/satan/keymaps/smt/Makefile +++ b/keyboards/satan/keymaps/smt/Makefile | |||
| @@ -15,7 +15,6 @@ UNICODE_ENABLE = no # Unicode | |||
| 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. |
| 17 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 17 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 18 | TAP_DANCE_ENABLE = yes # Enable tap dance | ||
| 19 | 18 | ||
| 20 | ifndef QUANTUM_DIR | 19 | ifndef QUANTUM_DIR |
| 21 | include ../../../../Makefile | 20 | include ../../../../Makefile |
diff --git a/keyboards/satan/keymaps/smt/keymap.c b/keyboards/satan/keymaps/smt/keymap.c index 1a2bc9769..a21d3eb86 100644 --- a/keyboards/satan/keymaps/smt/keymap.c +++ b/keyboards/satan/keymaps/smt/keymap.c | |||
| @@ -17,11 +17,9 @@ | |||
| 17 | enum planck_keycodes { | 17 | enum planck_keycodes { |
| 18 | QWERTY = SAFE_RANGE, | 18 | QWERTY = SAFE_RANGE, |
| 19 | COLEMAK, | 19 | COLEMAK, |
| 20 | DVORAK | 20 | DVORAK, |
| 21 | }; | 21 | LOWER, |
| 22 | 22 | RAISE | |
| 23 | enum { | ||
| 24 | TD_SHIFT_RAISE = 0 | ||
| 25 | }; | 23 | }; |
| 26 | 24 | ||
| 27 | #define _______ KC_TRNS | 25 | #define _______ KC_TRNS |
| @@ -32,7 +30,6 @@ enum { | |||
| 32 | #define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl | 30 | #define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl |
| 33 | #define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt) | 31 | #define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt) |
| 34 | #define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift | 32 | #define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift |
| 35 | #define SFT_RSE TD(TD_SHIFT_RAISE) // Double-tap for RAISE one-shot, otherwise Left Shift | ||
| 36 | 33 | ||
| 37 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 38 | /* Keymap _QWERTY: (Base Layer) Default Layer | 35 | /* Keymap _QWERTY: (Base Layer) Default Layer |
| @@ -52,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 52 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 49 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 53 | HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,KC_BSLS, \ | 50 | HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,KC_BSLS, \ |
| 54 | CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \ | 51 | CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \ |
| 55 | SFT_RSE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, SFT_ENT, \ | 52 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, SFT_ENT, \ |
| 56 | KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL), | 53 | KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL), |
| 57 | 54 | ||
| 58 | /* Keymap _COLEMAK: (Base Layer) Default Layer | 55 | /* Keymap _COLEMAK: (Base Layer) Default Layer |
| @@ -72,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 72 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 69 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 73 | HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,KC_LBRC, KC_RBRC,KC_BSLS, \ | 70 | HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,KC_LBRC, KC_RBRC,KC_BSLS, \ |
| 74 | CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O ,KC_QUOT, KC_ENT, \ | 71 | CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O ,KC_QUOT, KC_ENT, \ |
| 75 | SFT_RSE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM,KC_DOT, KC_SLSH, SFT_ENT, \ | 72 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM,KC_DOT, KC_SLSH, SFT_ENT, \ |
| 76 | KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL), | 73 | KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL), |
| 77 | 74 | ||
| 78 | /* Keymap _DVORAK: (Base Layer) Default Layer | 75 | /* Keymap _DVORAK: (Base Layer) Default Layer |
| @@ -92,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 92 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC,KC_BSPC, \ | 89 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC,KC_BSPC, \ |
| 93 | HPR_TAB, KC_QUOT,KC_COMM,KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, \ | 90 | HPR_TAB, KC_QUOT,KC_COMM,KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, \ |
| 94 | CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, \ | 91 | CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, \ |
| 95 | SFT_RSE, KC_SCLN,KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT, \ | 92 | KC_LSFT, KC_SCLN,KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT, \ |
| 96 | KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL), | 93 | KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,MO(_LOWER),KC_RCTL), |
| 97 | 94 | ||
| 98 | /* Keymap _LOWER: Function Layer | 95 | /* Keymap _LOWER: Function Layer |
| @@ -112,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 112 | _______,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_DEL, \ | 109 | _______,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_DEL, \ |
| 113 | _______,KC_HOME,KC_UP ,KC_END ,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \ | 110 | _______,KC_HOME,KC_UP ,KC_END ,_______,_______,_______,_______,_______,_______,_______,BL_DEC ,BL_INC ,BL_TOGG, \ |
| 114 | _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP ,KC_RGHT,KC_VOLU,KC_PGUP ,_______, \ | 111 | _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,KC_LEFT,KC_DOWN,KC_UP ,KC_RGHT,KC_VOLU,KC_PGUP ,_______, \ |
| 115 | KC_LSFT ,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_VOLD,KC_PGDN ,_______, \ | 112 | RAISE ,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,KC_VOLD,KC_PGDN ,_______, \ |
| 116 | _______,_______,_______ ,_______ ,_______,_______,_______,_______), | 113 | _______,_______,_______ ,_______ ,_______,_______,_______,_______), |
| 117 | 114 | ||
| 118 | /* Keymap _RAISE: Function Layer | 115 | /* Keymap _RAISE: Function Layer |
| @@ -133,14 +130,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 133 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET , \ | 130 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET , \ |
| 134 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ | 131 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ |
| 135 | _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______ ,_______, \ | 132 | _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______ ,_______, \ |
| 136 | KC_LSFT ,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______ ,_______, \ | 133 | _______ ,RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,_______,_______ ,_______, \ |
| 137 | _______,_______,_______ ,_______ ,_______,_______,XXXXXXX,_______ | 134 | _______,_______,_______ ,_______ ,_______,_______,_______,_______ |
| 138 | #else | 135 | #else |
| 139 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET , \ | 136 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RESET , \ |
| 140 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ | 137 | _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ |
| 141 | _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______ ,_______, \ | 138 | _______,_______,_______,_______,_______,_______,_______,QWERTY ,COLEMAK,DVORAK ,_______,_______ ,_______, \ |
| 142 | KC_LSFT ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______ ,_______, \ | 139 | _______ ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______ ,_______, \ |
| 143 | _______,_______,_______ ,_______ ,_______,_______,XXXXXXX,_______ | 140 | _______,_______,_______ ,_______ ,_______,_______,_______,_______ |
| 144 | #endif | 141 | #endif |
| 145 | ) | 142 | ) |
| 146 | }; | 143 | }; |
| @@ -173,10 +170,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 173 | } | 170 | } |
| 174 | return true; | 171 | return true; |
| 175 | } | 172 | } |
| 176 | |||
| 177 | // Tap Dance Definitions | ||
| 178 | qk_tap_dance_action_t tap_dance_actions[] = { | ||
| 179 | // Tap/hold once for Shift, tap twice for raise layer | ||
| 180 | [TD_SHIFT_RAISE] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, _RAISE) | ||
| 181 | // Other declarations would go here, separated by commas, if you have them | ||
| 182 | }; | ||
