kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TD immediately resolves when max count is reached

Browse source
This commit is contained in:
kurtis-lew 2021-05-24 18:52:06 -07:00
parent 3489355ca2
commit a7d3611970
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/behaviors/behavior_tap_dance.c
View file

@ -46,14 +46,14 @@ struct active_tap_dance {
struct active_tap_dance active_tap_dances[ZMK_BHV_TAP_DANCE_MAX_HELD] = {}; struct active_tap_dance active_tap_dances[ZMK_BHV_TAP_DANCE_MAX_HELD] = {};
static int stop_timer(struct active_tap_dance *tap_dance);
static struct active_tap_dance *store_tap_dance(uint32_t position, static struct active_tap_dance *store_tap_dance(uint32_t position,
const struct behavior_tap_dance_config *config) { const struct behavior_tap_dance_config *config) {
LOG_DBG("Position Detected at %d", position); LOG_DBG("Position Detected at %d", position);
for (int i = 0; i < ZMK_BHV_TAP_DANCE_MAX_HELD; i++) { for (int i = 0; i < ZMK_BHV_TAP_DANCE_MAX_HELD; i++) {
struct active_tap_dance *const tap_dance = &active_tap_dances[i]; struct active_tap_dance *const tap_dance = &active_tap_dances[i];
if (tap_dance->position != ZMK_BHV_TAP_DANCE_POSITION_FREE || tap_dance->timer_cancelled) { if (tap_dance->position != ZMK_BHV_TAP_DANCE_POSITION_FREE || tap_dance->timer_cancelled) {
tap_dance->counter++;
LOG_DBG("Counter balue currently at: %d", tap_dance->counter);
continue; continue;
} }
tap_dance->counter = 1; tap_dance->counter = 1;
@ -93,7 +93,6 @@ static int stop_timer(struct active_tap_dance *tap_dance) {
static inline int release_tap_dance_behavior(struct active_tap_dance *tap_dance, static inline int release_tap_dance_behavior(struct active_tap_dance *tap_dance,
int64_t timestamp) { int64_t timestamp) {
LOG_DBG("Release Tap Dance Behavior"); LOG_DBG("Release Tap Dance Behavior");
LOG_DBG("Counter finally value: %d", tap_dance->counter);
struct zmk_behavior_binding binding = tap_dance->config->behaviors[(tap_dance->counter) - 1]; struct zmk_behavior_binding binding = tap_dance->config->behaviors[(tap_dance->counter) - 1];
struct zmk_behavior_binding_event event = { struct zmk_behavior_binding_event event = {
.position = tap_dance->position, .position = tap_dance->position,
@ -109,6 +108,7 @@ static inline int release_tap_dance_behavior(struct active_tap_dance *tap_dance,
return 0; return 0;
} }
static int on_tap_dance_binding_pressed(struct zmk_behavior_binding *binding, static int on_tap_dance_binding_pressed(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) { struct zmk_behavior_binding_event event) {
LOG_DBG("On Binding Pressed"); LOG_DBG("On Binding Pressed");
@ -118,13 +118,17 @@ static int on_tap_dance_binding_pressed(struct zmk_behavior_binding *binding,
tap_dance = find_tap_dance(event.position); tap_dance = find_tap_dance(event.position);
if (tap_dance != NULL) { if (tap_dance != NULL) {
stop_timer(tap_dance); stop_timer(tap_dance);
// release_tap_dance_behavior(tap_dance, event.timestamp); if (++tap_dance->counter >= cfg->behavior_count){
release_tap_dance_behavior(tap_dance, event.timestamp);
}
} }
tap_dance = store_tap_dance(event.position, cfg); else{
if (tap_dance == NULL) { tap_dance = store_tap_dance(event.position, cfg);
LOG_ERR("unable to store tap dance, did you press more than %d tap_dance?", if (tap_dance == NULL) {
ZMK_BHV_TAP_DANCE_MAX_HELD); LOG_ERR("unable to store tap dance, did you press more than %d tap_dance?",
return ZMK_BEHAVIOR_OPAQUE; ZMK_BHV_TAP_DANCE_MAX_HELD);
return ZMK_BEHAVIOR_OPAQUE;
}
} }
return ZMK_BEHAVIOR_OPAQUE; return ZMK_BEHAVIOR_OPAQUE;
} }