diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2012-01-09 03:26:03 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2012-01-09 03:26:03 +0000 |
commit | 36613d57fadbd7204bba6dbc7962976ad039655d (patch) | |
tree | eea3813cde0de6c682a399da937ed9333b922ed1 | |
parent | 307cb049485cc20140b85aa78f8e2677e8df5851 (diff) | |
download | rockbox-36613d57fadbd7204bba6dbc7962976ad039655d.tar.gz rockbox-36613d57fadbd7204bba6dbc7962976ad039655d.zip |
Commit FS#12454 - Faster line scroll speed by Martin Sagmuller.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31643 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings_list.c | 4 | ||||
-rw-r--r-- | firmware/scroll_engine.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 7c74a592ee..44295ac5aa 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -967,7 +967,7 @@ const struct settings_list settings[] = { | |||
967 | #endif | 967 | #endif |
968 | #endif /* HAVE_BACKLIGHT */ | 968 | #endif /* HAVE_BACKLIGHT */ |
969 | INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed", | 969 | INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed", |
970 | UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed), | 970 | UNIT_INT, 0, 17, 1, NULL, NULL, lcd_scroll_speed), |
971 | INT_SETTING(F_PADTITLE, scroll_delay, LANG_SCROLL_DELAY, 1000, | 971 | INT_SETTING(F_PADTITLE, scroll_delay, LANG_SCROLL_DELAY, 1000, |
972 | "scroll delay", UNIT_MS, 0, 2500, 100, NULL, | 972 | "scroll delay", UNIT_MS, 0, 2500, 100, NULL, |
973 | NULL, lcd_scroll_delay), | 973 | NULL, lcd_scroll_delay), |
@@ -975,7 +975,7 @@ const struct settings_list settings[] = { | |||
975 | UNIT_PERCENT, 0, 200, 25, NULL, NULL, lcd_bidir_scroll), | 975 | UNIT_PERCENT, 0, 200, 25, NULL, NULL, lcd_bidir_scroll), |
976 | #ifdef HAVE_REMOTE_LCD | 976 | #ifdef HAVE_REMOTE_LCD |
977 | INT_SETTING(0, remote_scroll_speed, LANG_SCROLL_SPEED, 9, | 977 | INT_SETTING(0, remote_scroll_speed, LANG_SCROLL_SPEED, 9, |
978 | "remote scroll speed", UNIT_INT, 0,15, 1, | 978 | "remote scroll speed", UNIT_INT, 0,17, 1, |
979 | NULL, NULL, lcd_remote_scroll_speed), | 979 | NULL, NULL, lcd_remote_scroll_speed), |
980 | INT_SETTING(0, remote_scroll_step, LANG_SCROLL_STEP, 6, | 980 | INT_SETTING(0, remote_scroll_step, LANG_SCROLL_STEP, 6, |
981 | "remote scroll step", UNIT_PIXEL, 1, LCD_REMOTE_WIDTH, 1, NULL, | 981 | "remote scroll step", UNIT_PIXEL, 1, LCD_REMOTE_WIDTH, 1, NULL, |
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c index 5dd80f1a07..bc356a8281 100644 --- a/firmware/scroll_engine.c +++ b/firmware/scroll_engine.c | |||
@@ -35,10 +35,10 @@ | |||
35 | #endif | 35 | #endif |
36 | #include "scroll_engine.h" | 36 | #include "scroll_engine.h" |
37 | 37 | ||
38 | static const char scroll_tick_table[16] = { | 38 | static const char scroll_tick_table[18] = { |
39 | /* Hz values: | 39 | /* Hz values [f(x)=100.8/(x+.048)]: |
40 | 1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */ | 40 | 1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33, 49.2, 96.2 */ |
41 | 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3 | 41 | 100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3, 2, 1 |
42 | }; | 42 | }; |
43 | 43 | ||
44 | static void scroll_thread(void); | 44 | static void scroll_thread(void); |