diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-08-04 15:08:25 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-08-04 16:11:01 +1000 |
| commit | 254f87564f485ff44b8426cac3ac7f8efc47e681 (patch) | |
| tree | b7e247f9a5e474b088be4f727371a7298a2eba2c /src/filter.c | |
| parent | 317cd252beac6a3094d82b5758681ed00d0e9cb1 (diff) | |
filter: fix acceleration threshold assignment
The new values were in units/us and didn't make the switch back to ms in
8a6825f1602.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Diffstat (limited to 'src/filter.c')
| -rw-r--r-- | src/filter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/filter.c b/src/filter.c index 2506ee27..e11d58a9 100644 --- a/src/filter.c +++ b/src/filter.c @@ -78,6 +78,7 @@ filter_get_speed(struct motion_filter *filter) */ #define DEFAULT_THRESHOLD 0.4 /* in units/ms */ +#define MINIMUM_THRESHOLD 0.2 /* in units/ms */ #define DEFAULT_ACCELERATION 2.0 /* unitless factor */ #define DEFAULT_INCLINE 1.1 /* unitless factor */ @@ -333,9 +334,9 @@ accelerator_set_speed(struct motion_filter *filter, assert(speed >= -1.0 && speed <= 1.0); /* delay when accel kicks in */ - accel_filter->threshold = DEFAULT_THRESHOLD - speed / 4000.0; - if (accel_filter->threshold < 0.0002) - accel_filter->threshold = 0.0002; + accel_filter->threshold = DEFAULT_THRESHOLD - speed / 4.0; + if (accel_filter->threshold < MINIMUM_THRESHOLD) + accel_filter->threshold = MINIMUM_THRESHOLD; /* adjust max accel factor */ accel_filter->accel = DEFAULT_ACCELERATION + speed * 1.5; |