On-each-release tap dance function (#20255)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
This commit is contained in:
parent
821db155f2
commit
2c70d38910
6 changed files with 159 additions and 7 deletions
|
@ -187,13 +187,35 @@ void x_reset(tap_dance_state_t *state, void *user_data) {
|
|||
xtap_state.state = TD_NONE;
|
||||
}
|
||||
|
||||
static void release_press(tap_dance_state_t *state, void *user_data) {
|
||||
tap_code16(KC_P);
|
||||
}
|
||||
|
||||
static void release_unpress(tap_dance_state_t *state, void *user_data) {
|
||||
tap_code16(KC_U);
|
||||
}
|
||||
|
||||
static void release_unpress_mark_finished(tap_dance_state_t *state, void *user_data) {
|
||||
tap_code16(KC_U);
|
||||
state->finished = true;
|
||||
}
|
||||
|
||||
static void release_finished(tap_dance_state_t *state, void *user_data) {
|
||||
tap_code16(KC_F);
|
||||
}
|
||||
|
||||
static void release_reset(tap_dance_state_t *state, void *user_data) {
|
||||
tap_code16(KC_R);
|
||||
}
|
||||
|
||||
tap_dance_action_t tap_dance_actions[] = {
|
||||
[TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
|
||||
[CT_EGG] = ACTION_TAP_DANCE_FN(dance_egg),
|
||||
[CT_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED(dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
|
||||
[CT_CLN] = ACTION_TAP_DANCE_TAP_HOLD(KC_COLN, KC_SCLN),
|
||||
[X_CTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset)
|
||||
[X_CTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset),
|
||||
[TD_RELEASE] = ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(release_press, release_unpress, release_finished, release_reset),
|
||||
[TD_RELEASE_AND_FINISH] = ACTION_TAP_DANCE_FN_ADVANCED_WITH_RELEASE(release_press, release_unpress_mark_finished, release_finished, release_reset),
|
||||
};
|
||||
|
||||
// clang-format on
|
||||
|
|
|
@ -26,6 +26,8 @@ enum {
|
|||
CT_FLSH,
|
||||
CT_CLN,
|
||||
X_CTL,
|
||||
TD_RELEASE,
|
||||
TD_RELEASE_AND_FINISH,
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -316,3 +316,119 @@ TEST_F(TapDance, QuadFunction) {
|
|||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
}
|
||||
|
||||
TEST_F(TapDance, DanceFnAdvancedWithRelease) {
|
||||
TestDriver driver;
|
||||
InSequence s;
|
||||
auto key_rls = KeymapKey(0, 1, 0, TD(TD_RELEASE));
|
||||
|
||||
set_keymap({key_rls});
|
||||
|
||||
/* Single press and unpress */
|
||||
key_rls.press();
|
||||
EXPECT_REPORT(driver, (KC_P));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
key_rls.release();
|
||||
EXPECT_REPORT(driver, (KC_U));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
EXPECT_REPORT(driver, (KC_F));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
EXPECT_REPORT(driver, (KC_R));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
idle_for(TAPPING_TERM);
|
||||
run_one_scan_loop();
|
||||
|
||||
/* Double press and unpress */
|
||||
key_rls.press();
|
||||
EXPECT_REPORT(driver, (KC_P));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
key_rls.release();
|
||||
EXPECT_REPORT(driver, (KC_U));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
key_rls.press();
|
||||
EXPECT_REPORT(driver, (KC_P));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
key_rls.release();
|
||||
EXPECT_REPORT(driver, (KC_U));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
EXPECT_REPORT(driver, (KC_F));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
EXPECT_REPORT(driver, (KC_R));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
idle_for(TAPPING_TERM);
|
||||
run_one_scan_loop();
|
||||
|
||||
/* Unpress after tapping term has elapsed (key is registered as held) */
|
||||
key_rls.press();
|
||||
EXPECT_REPORT(driver, (KC_P));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
EXPECT_REPORT(driver, (KC_F));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
idle_for(TAPPING_TERM);
|
||||
run_one_scan_loop();
|
||||
|
||||
key_rls.release();
|
||||
EXPECT_REPORT(driver, (KC_U));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
EXPECT_REPORT(driver, (KC_R));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
}
|
||||
|
||||
TEST_F(TapDance, DanceFnAdvancedWithReleaseAndFinish) {
|
||||
TestDriver driver;
|
||||
InSequence s;
|
||||
auto key_rls = KeymapKey(0, 1, 0, TD(TD_RELEASE_AND_FINISH));
|
||||
|
||||
set_keymap({key_rls});
|
||||
|
||||
/* Single press and unpress */
|
||||
key_rls.press();
|
||||
EXPECT_REPORT(driver, (KC_P));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
key_rls.release();
|
||||
EXPECT_REPORT(driver, (KC_U));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
EXPECT_REPORT(driver, (KC_R));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
// Verify the finished and/or reset functions aren't called
|
||||
// after the tapping term elapses
|
||||
idle_for(TAPPING_TERM);
|
||||
run_one_scan_loop();
|
||||
|
||||
/* Unpress after tapping term has elapsed (key is registered as held) */
|
||||
key_rls.press();
|
||||
EXPECT_REPORT(driver, (KC_P));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
|
||||
EXPECT_REPORT(driver, (KC_F));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
idle_for(TAPPING_TERM);
|
||||
run_one_scan_loop();
|
||||
|
||||
key_rls.release();
|
||||
EXPECT_REPORT(driver, (KC_U));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
EXPECT_REPORT(driver, (KC_R));
|
||||
EXPECT_EMPTY_REPORT(driver);
|
||||
run_one_scan_loop();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue