diff --git a/keyboards/massdrop/alt/keymaps/drashna/config.h b/keyboards/massdrop/alt/keymaps/drashna/config.h index 252f5448..6bc3a1fb 100644 --- a/keyboards/massdrop/alt/keymaps/drashna/config.h +++ b/keyboards/massdrop/alt/keymaps/drashna/config.h @@ -21,5 +21,6 @@ // place overrides here #define LEADER_PER_KEY_TIMING #define LEADER_TIMEOUT 350 +#define TAPPING_TERM 175 #define DROP_ALT \ No newline at end of file diff --git a/keyboards/massdrop/alt/keymaps/drashna/keymap.c b/keyboards/massdrop/alt/keymaps/drashna/keymap.c index 0abbb089..78fa336a 100644 --- a/keyboards/massdrop/alt/keymaps/drashna/keymap.c +++ b/keyboards/massdrop/alt/keymaps/drashna/keymap.c @@ -10,12 +10,11 @@ LAYOUT_wrapper( \ KC_ESC , 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, KC_DEL , \ KC_TAB , K01 , K02 , K03 , K04 , K05 , K06 , K07 , K08 , K09 , K0A , KC_LBRC, KC_RBRC, KC_BSLS, RGB_TOG, \ - KC_CAPS, K11 , K12 , K13 , K14 , K15 , K16 , K17 , K18 , K19 , K1A , KC_QUOT, KC_ENT , KC_HOME, \ + KC_CAPS, K11 , K12 , K13 , K14 , K15 , K16 , K17 , K18 , K19 , K1A , KC_SCLN, KC_ENT , KC_HOME, \ KC_LSFT, K21 , K22 , K23 , K24 , K25 , K26 , K27 , K28 , K29 , K2A , KC_RSFT, KC_UP , KC_END , \ KC_LCTL, KC_LGUI, KC_LALT, LT(_NAV, KC_SPC), KC_RALT, KC_LEAD, KC_LEFT, KC_DOWN, KC_RIGHT \ ) - /* Re-pass though to allow templates to be used */ #define LAYOUT_dropALT_base_wrapper(...) LAYOUT_dropALT_base(__VA_ARGS__) diff --git a/keyboards/massdrop/alt/keymaps/drashna/rules.mk b/keyboards/massdrop/alt/keymaps/drashna/rules.mk index 108339a7..f9a76b0f 100644 --- a/keyboards/massdrop/alt/keymaps/drashna/rules.mk +++ b/keyboards/massdrop/alt/keymaps/drashna/rules.mk @@ -1,5 +1,6 @@ LEADER_ENABLE = yes DROP_ALT = yes +TAP_DANCE_ENABLE = no #For platform and packs ARM_ATSAM = SAMD51J18A diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index d7002d63..3bb1e3da 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c @@ -165,8 +165,11 @@ void matrix_scan_user(void) { startup_user(); } -#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. - run_diablo_macro_check(); +#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. + //Skip on Drop ALT + #if !(defined DROP_ALT) + run_diablo_macro_check(); + #endif #endif // TAP_DANCE_ENABLE #if defined(RGBLIGHT_ENABLE) diff --git a/users/drashna/process_records.c b/users/drashna/process_records.c index e31781d2..0440c852 100644 --- a/users/drashna/process_records.c +++ b/users/drashna/process_records.c @@ -82,11 +82,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case KC_DIABLO_CLEAR: // reset all Diablo timers, disabling them #ifdef TAP_DANCE_ENABLE + #if !(defined DROP_ALT) + if (record->event.pressed) { for (uint8_t index = 0; index < 4; index++) { diablo_timer[index].key_interval = 0; } } + #endif #endif // TAP_DANCE_ENABLE break; diff --git a/users/drashna/wrappers.h b/users/drashna/wrappers.h index 9fd96025..c3636ccb 100644 --- a/users/drashna/wrappers.h +++ b/users/drashna/wrappers.h @@ -87,10 +87,9 @@ NOTE: These are all the same length. If you do a search/replace #define ___________________NAV_L2__________________ _______, _______, KC_UP , _______, _______ #define ___________________NAV_L3__________________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______ -#define ___________________NAV_R1__________________ KC_PGUP, KC_HOME, KC_UP, KC_END, _______ -#define ___________________NAV_R2__________________ KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______ -#define ___________________NAV_R3__________________ _______, _______, _______, _______, _______ +#define ___________________NAV_R1__________________ KC_PGUP, KC_HOME, KC_UP, KC_END, aa +#define ___________________NAV_R2__________________ KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, ae +#define ___________________NAV_R3__________________ _______, _______, _______, _______, oe -// clang-format on - +// clang-format on \ No newline at end of file