From faddb574824b4181aa02c0e385b177487a75e1e5 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 9 Oct 2009 23:27:38 +0000 Subject: Fuze/e200v2: Fix inaccuracy when moving the wheel slowly (fixes FS#10667). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23059 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/button-e200v2-fuze.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/firmware/target/arm/as3525/button-e200v2-fuze.c b/firmware/target/arm/as3525/button-e200v2-fuze.c index edb2aa4a47..ef343b5514 100644 --- a/firmware/target/arm/as3525/button-e200v2-fuze.c +++ b/firmware/target/arm/as3525/button-e200v2-fuze.c @@ -93,7 +93,7 @@ static void scrollwheel(unsigned short dbop_din) * clicks of the wheel */ static int counter = 0; /* Read wheel - * Bits 13 and 14 of DBOP_DIN change as follows: + * Bits 13 and 14 of DBOP_DIN change as follows (Gray Code): * Clockwise rotation 00 -> 01 -> 11 -> 10 -> 00 * Counter-clockwise 00 -> 10 -> 11 -> 01 -> 00 * @@ -118,18 +118,16 @@ static void scrollwheel(unsigned short dbop_din) btn = BUTTON_SCROLL_FWD; else if (old_wheel_value == wheel_tbl[1][wheel_value]) btn = BUTTON_SCROLL_BACK; - else if (old_btn != BUTTON_NONE) - { /* if no button is read, assume old_btn, but only once to not have - * wrong readings */ + else if (old_wheel_value != wheel_value && accel > ACCEL_INCREMENT) + { /* if no button is read and wheel_value changed, assume old_btn */ btn = old_btn; - old_btn = BUTTON_NONE; } /* else btn = BUTTON_NONE */ if (btn != BUTTON_NONE) { - if (btn != old_btn && old_btn != BUTTON_NONE) - { /* don't do this if we assumned old_btn */ + if (btn != old_btn) + { /* direction reversals nullify acceleration and counters */ old_btn = btn; accel = counter = 0; -- cgit v1.2.3