refactor(hold-tap): pretty print decision_moment

4 years ago · 9c4c266b17
38 changed files with 78 additions and 60 deletions
--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@ -43,6 +43,14 @@ enum status {
				@@ -43,6 +43,14 @@ enum status {
    STATUS_HOLD_TIMER,
 };

+enum decision_moment {
+    HT_KEY_UP,
+    HT_OTHER_KEY_DOWN,
+    HT_OTHER_KEY_UP,
+    HT_TIMER_EVENT,
+    HT_QUICK_TAP,
+};
+
 struct behavior_hold_tap_config {
    int tapping_term_ms;
    char *hold_behavior_dev;
@ -208,14 +216,6 @@ static void clear_hold_tap(struct active_hold_tap *hold_tap) {
				@@ -208,14 +216,6 @@ static void clear_hold_tap(struct active_hold_tap *hold_tap) {
    hold_tap->work_is_cancelled = false;
 }

-enum decision_moment {
-    HT_KEY_UP = 0,
-    HT_OTHER_KEY_DOWN = 1,
-    HT_OTHER_KEY_UP = 2,
-    HT_TIMER_EVENT = 3,
-    HT_QUICK_TAP = 4,
-};
-
 static void decide_balanced(struct active_hold_tap *hold_tap, enum decision_moment event) {
    switch (event) {
    case HT_KEY_UP:
@ -296,6 +296,22 @@ static inline const char *status_str(enum status status) {
				@@ -296,6 +296,22 @@ static inline const char *status_str(enum status status) {
    return "UNKNOWN STATUS";
 }

+static inline const char *decision_moment_str(enum decision_moment decision_moment) {
+    switch (decision_moment) {
+    case HT_KEY_UP:
+        return "key-up";
+    case HT_OTHER_KEY_DOWN:
+        return "other-key-down";
+    case HT_OTHER_KEY_UP:
+        return "other-key-up";
+    case HT_QUICK_TAP:
+        return "quick-tap";
+    case HT_TIMER_EVENT:
+        return "timer";
+    }
+    return "UNKNOWN STATUS";
+}
+
 static int press_binding(struct active_hold_tap *hold_tap) {
    struct zmk_behavior_binding_event event = {
        .position = hold_tap->position,
@ -331,7 +347,8 @@ static int release_binding(struct active_hold_tap *hold_tap) {
				@@ -331,7 +347,8 @@ static int release_binding(struct active_hold_tap *hold_tap) {
    return behavior_keymap_binding_released(&binding, event);
 }

-static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_moment event_type) {
+static void decide_hold_tap(struct active_hold_tap *hold_tap,
+                            enum decision_moment decision_moment) {
    if (hold_tap->status != STATUS_UNDECIDED) {
        return;
    }
@ -343,19 +360,20 @@ static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_mome
				@@ -343,19 +360,20 @@ static void decide_hold_tap(struct active_hold_tap *hold_tap, enum decision_mome

    switch (hold_tap->config->flavor) {
    case FLAVOR_HOLD_PREFERRED:
-        decide_hold_preferred(hold_tap, event_type);
+        decide_hold_preferred(hold_tap, decision_moment);
    case FLAVOR_BALANCED:
-        decide_balanced(hold_tap, event_type);
+        decide_balanced(hold_tap, decision_moment);
    case FLAVOR_TAP_PREFERRED:
-        decide_tap_preferred(hold_tap, event_type);
+        decide_tap_preferred(hold_tap, decision_moment);
    }

    if (hold_tap->status == STATUS_UNDECIDED) {
        return;
    }

-    LOG_DBG("%d decided %s (%s event %d)", hold_tap->position, status_str(hold_tap->status),
-            flavor_str(hold_tap->config->flavor), event_type);
+    LOG_DBG("%d decided %s (%s decision moment %s)", hold_tap->position,
+            status_str(hold_tap->status), flavor_str(hold_tap->config->flavor),
+            decision_moment_str(decision_moment));
    undecided_hold_tap = NULL;
    press_binding(hold_tap);
    release_captured_events();
--- a/app/tests/hold-tap/balanced/1-dn-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/1-dn-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (balanced event 0)
+ht_decide: 0 decided tap (balanced decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/balanced/2-dn-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/2-dn-timer-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (balanced event 3)
+ht_decide: 0 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/keycode_events.snapshot
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 kp_pressed: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (balanced event 0)
+ht_decide: 0 decided tap (balanced decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 kp_pressed: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (balanced event 3)
+ht_decide: 0 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/keycode_events.snapshot
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
-ht_decide: 0 decided tap (balanced event 0)
+ht_decide: 0 decided tap (balanced decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
-ht_decide: 0 decided hold-timer (balanced event 3)
+ht_decide: 0 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
@ -1,8 +1,8 @@
				@@ -1,8 +1,8 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (balanced event 3)
+ht_decide: 0 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 1 new undecided hold_tap
-ht_decide: 1 decided tap (balanced event 0)
+ht_decide: 1 decided tap (balanced decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x0d implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x0d implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 1 cleaning up hold-tap
--- a/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (balanced event 3)
+ht_decide: 0 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-interrupt (balanced event 2)
+ht_decide: 0 decided hold-interrupt (balanced decision moment other-key-up)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-interrupt (balanced event 2)
+ht_decide: 0 decided hold-interrupt (balanced decision moment other-key-up)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (balanced event 0)
+ht_decide: 0 decided tap (balanced decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/balanced/5-quick-tap/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/5-quick-tap/keycode_events.snapshot
@ -1,10 +1,10 @@
				@@ -1,10 +1,10 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (balanced event 0)
+ht_decide: 0 decided tap (balanced decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (balanced event 4)
+ht_decide: 0 decided tap (balanced decision moment quick-tap)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/balanced/many-nested/keycode_events.snapshot
+++ b/app/tests/hold-tap/balanced/many-nested/keycode_events.snapshot
@ -1,16 +1,16 @@
				@@ -1,16 +1,16 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (balanced event 3)
+ht_decide: 0 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 1 new undecided hold_tap
-ht_decide: 1 decided hold-timer (balanced event 3)
+ht_decide: 1 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe0 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 2 new undecided hold_tap
 ht_binding_released: 0 cleaning up hold-tap
-ht_decide: 2 decided hold-timer (balanced event 3)
+ht_decide: 2 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe3 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 3 new undecided hold_tap
 ht_binding_released: 1 cleaning up hold-tap
-ht_decide: 3 decided hold-timer (balanced event 3)
+ht_decide: 3 decided hold-timer (balanced decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe2 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe0 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/hold-preferred/1-dn-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/1-dn-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (hold-preferred event 0)
+ht_decide: 0 decided tap (hold-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/hold-preferred/2-dn-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (hold-preferred event 3)
+ht_decide: 0 decided hold-timer (hold-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 kp_pressed: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (hold-preferred event 0)
+ht_decide: 0 decided tap (hold-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 kp_pressed: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (hold-preferred event 3)
+ht_decide: 0 decided hold-timer (hold-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
-ht_decide: 0 decided tap (hold-preferred event 0)
+ht_decide: 0 decided tap (hold-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
-ht_decide: 0 decided hold-timer (hold-preferred event 3)
+ht_decide: 0 decided hold-timer (hold-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
@ -1,8 +1,8 @@
				@@ -1,8 +1,8 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-interrupt (hold-preferred event 1)
+ht_decide: 0 decided hold-interrupt (hold-preferred decision moment other-key-down)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 1 new undecided hold_tap
-ht_decide: 1 decided tap (hold-preferred event 0)
+ht_decide: 1 decided tap (hold-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x0d implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x0d implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 1 cleaning up hold-tap
--- a/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-interrupt (hold-preferred event 1)
+ht_decide: 0 decided hold-interrupt (hold-preferred decision moment other-key-down)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-interrupt (hold-preferred event 1)
+ht_decide: 0 decided hold-interrupt (hold-preferred decision moment other-key-down)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-interrupt (hold-preferred event 1)
+ht_decide: 0 decided hold-interrupt (hold-preferred decision moment other-key-down)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-interrupt (hold-preferred event 1)
+ht_decide: 0 decided hold-interrupt (hold-preferred decision moment other-key-down)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/hold-preferred/5-quick-tap/keycode_events.snapshot
+++ b/app/tests/hold-tap/hold-preferred/5-quick-tap/keycode_events.snapshot
@ -1,10 +1,10 @@
				@@ -1,10 +1,10 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (hold-preferred event 0)
+ht_decide: 0 decided tap (hold-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (hold-preferred event 4)
+ht_decide: 0 decided tap (hold-preferred decision moment quick-tap)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/tap-preferred/1-dn-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/1-dn-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (tap-preferred event 0)
+ht_decide: 0 decided tap (tap-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/tap-preferred/2-dn-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (tap-preferred event 3)
+ht_decide: 0 decided hold-timer (tap-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 kp_pressed: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (tap-preferred event 0)
+ht_decide: 0 decided tap (tap-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 kp_pressed: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (tap-preferred event 3)
+ht_decide: 0 decided hold-timer (tap-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe4 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
-ht_decide: 0 decided tap (tap-preferred event 0)
+ht_decide: 0 decided tap (tap-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 0 new undecided hold_tap
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
-ht_decide: 0 decided hold-timer (tap-preferred event 3)
+ht_decide: 0 decided hold-timer (tap-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
--- a/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
@ -1,8 +1,8 @@
				@@ -1,8 +1,8 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (tap-preferred event 3)
+ht_decide: 0 decided hold-timer (tap-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_pressed: 1 new undecided hold_tap
-ht_decide: 1 decided tap (tap-preferred event 0)
+ht_decide: 1 decided tap (tap-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x0d implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x0d implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 1 cleaning up hold-tap
--- a/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (tap-preferred event 3)
+ht_decide: 0 decided hold-timer (tap-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided hold-timer (tap-preferred event 3)
+ht_decide: 0 decided hold-timer (tap-preferred decision moment timer)
 kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (tap-preferred event 0)
+ht_decide: 0 decided tap (tap-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (tap-preferred event 0)
+ht_decide: 0 decided tap (tap-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_pressed: usage_page 0x07 keycode 0x07 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
--- a/app/tests/hold-tap/tap-preferred/5-quick-tap/keycode_events.snapshot
+++ b/app/tests/hold-tap/tap-preferred/5-quick-tap/keycode_events.snapshot
@ -1,10 +1,10 @@
				@@ -1,10 +1,10 @@
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (tap-preferred event 0)
+ht_decide: 0 decided tap (tap-preferred decision moment key-up)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap
 ht_binding_pressed: 0 new undecided hold_tap
-ht_decide: 0 decided tap (tap-preferred event 4)
+ht_decide: 0 decided tap (tap-preferred decision moment quick-tap)
 kp_pressed: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 kp_released: usage_page 0x07 keycode 0x09 implicit_mods 0x00 explicit_mods 0x00
 ht_binding_released: 0 cleaning up hold-tap