diff options
| author | Alec Berg <alecaberg@chromium.org> | 2014-10-30 10:05:23 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-10-31 04:29:16 +0000 |
| commit | 13579c3570df0b7f3535d8c5499468761a482734 (patch) | |
| tree | 5ceac79613cf40a66c30336f8197dfb291e14271 | |
| parent | 1e7d66eabc26879d6e5c934b368fe08795939d34 (diff) | |
| download | chrome-ec-13579c3570df0b7f3535d8c5499468761a482734.tar.gz | |
samus: accel: fix initialization bug in tap gesture
Fix bug in tap gesture. When turning on tap detection, don't
clear the history circular array index. This was causing inconsitent
tap for battery recognition because the inner window sum of z-axis
data (sum_z_inner) was relying on subtracting out old historical
data and adding in the new data, but when the array index changed,
it was subtracting out the wrong old data. This really only came in
to play if there was significant z motion before the last wakeup.
BUG=none
BRANCH=samus
TEST=keep going to sleep and waking up and test that tap for
battery works every time.
Change-Id: I55e00c805d504dd6d257a81f2cd25fe384a53257
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/226591
Reviewed-by: Sheng-liang Song <ssl@chromium.org>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
| -rw-r--r-- | common/gesture.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/common/gesture.c b/common/gesture.c index 6c5572cd44..246d848484 100644 --- a/common/gesture.c +++ b/common/gesture.c @@ -36,11 +36,6 @@ * which to check for relatively calm periods. In between the two impulses * there is a minimum and maximum interstice time allowed. */ -#define OUTER_WINDOW_T 200 -#define INNER_WINDOW_T 30 -#define MIN_INTERSTICE_T 120 -#define MAX_INTERSTICE_T 500 - #define OUTER_WINDOW \ (CONFIG_GESTURE_TAP_OUTER_WINDOW_T / \ CONFIG_GESTURE_SAMPLING_INTERVAL_MS) @@ -80,7 +75,7 @@ static struct motion_sensor_t *sensor = static int history_z[MAX_WINDOW]; /* Changes in Z */ static int history_xy[MAX_WINDOW]; /* Changes in X and Y */ static int state, history_idx; -static int history_initialized; +static int history_initialized, history_init_index; static int tap_debug; /* Tap detection flag */ @@ -157,7 +152,7 @@ static int gesture_tap_for_battery(void) /* Ignore data until we fill history buffer and wrap around */ if (history_idx == 0) history_initialized = 1; - if (history_initialized == 0) + if (history_initialized == history_init_index) return 0; /* @@ -262,12 +257,13 @@ static int gesture_tap_for_battery(void) CPRINTS("tap st %d->%d, error div by 0", state_p, state); else - CPRINTS("tap st %d->%d, st_cnt %-3d", + CPRINTF("[%T tap st %d->%d, st_cnt %-3d ", state_p, state, state_cnt); - CPRINTS("Z_in:Z_out %-3d, Z_in:XY_in %-3d", + CPRINTF("Z_in:Z_out %-3d, Z_in:XY_in %-3d ", delta_z_inner / delta_z_outer, delta_z_inner / delta_xy_inner); - CPRINTS("dZ_in %-8.3d, dZ_in_max %-8.3d, dZ_out %-8.3d", + CPRINTF("dZ_in %-8.3d, dZ_in_max %-8.3d, " + "dZ_out %-8.3d]\n", delta_z_inner, delta_z_inner_max, delta_z_outer); } @@ -289,12 +285,12 @@ static void gesture_chipset_suspend(void) sensor->drv->set_data_rate(sensor, TAP_ODR, 1); /* - * Clear tap init and history index so that we have to + * Clear tap init and history initialized so that we have to * record a whole new set of data, and enable tap detection */ history_initialized = 0; + history_init_index = history_idx; state = TAP_IDLE; - history_idx = 0; tap_detection = 1; } DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, gesture_chipset_suspend, |