From fd14cac7c2feb471f8bf546d10e15f1336657064 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 2 Mar 2009 19:25:50 +0000 Subject: Split HAVE_SCROLLWHEEL into HAVE_SCROLLWHEEL and HAVE_WHEEL_ACCELERATION, where the latter now activates the wheel acceleration code. HAVE_SCROLLWHEEL plainly indicates the existence of a scrollwheel, thus all ipods define it now (in addition to the ones and some sansas which did before). Same applies to the manual. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20177 a1c6a512-1295-4272-9138-f99709370657 --- apps/debug_menu.c | 4 ++-- apps/features.txt | 4 ++++ apps/gui/list.c | 6 +++--- apps/gui/option_select.c | 3 --- apps/lang/bulgarian.lang | 12 ++++++------ apps/lang/catala.lang | 12 ++++++------ apps/lang/chinese-simp.lang | 12 ++++++------ apps/lang/chinese-trad.lang | 12 ++++++------ apps/lang/czech.lang | 12 ++++++------ apps/lang/dansk.lang | 12 ++++++------ apps/lang/deutsch.lang | 12 ++++++------ apps/lang/english.lang | 12 ++++++------ apps/lang/espanol.lang | 12 ++++++------ apps/lang/finnish.lang | 12 ++++++------ apps/lang/francais.lang | 12 ++++++------ apps/lang/greek.lang | 12 ++++++------ apps/lang/hebrew.lang | 12 ++++++------ apps/lang/italiano.lang | 12 ++++++------ apps/lang/japanese.lang | 12 ++++++------ apps/lang/korean.lang | 12 ++++++------ apps/lang/magyar.lang | 12 ++++++------ apps/lang/nederlands.lang | 12 ++++++------ apps/lang/norsk-nynorsk.lang | 12 ++++++------ apps/lang/norsk.lang | 12 ++++++------ apps/lang/polski.lang | 12 ++++++------ apps/lang/portugues-brasileiro.lang | 12 ++++++------ apps/lang/portugues.lang | 12 ++++++------ apps/lang/romaneste.lang | 12 ++++++------ apps/lang/russian.lang | 12 ++++++------ apps/lang/srpski.lang | 12 ++++++------ apps/lang/svenska.lang | 12 ++++++------ apps/lang/tagalog.lang | 12 ++++++------ apps/lang/thai.lang | 12 ++++++------ apps/lang/walon.lang | 12 ++++++------ apps/menus/display_menu.c | 6 +++--- apps/settings.h | 2 +- apps/settings_list.c | 6 +++--- firmware/drivers/button.c | 4 ++-- firmware/export/button.h | 2 +- firmware/export/config-e200.h | 2 ++ firmware/export/config-e200v2.h | 2 ++ firmware/export/config-fuze.h | 2 ++ firmware/export/config-ipod1g2g.h | 2 ++ firmware/export/config-ipod3g.h | 2 ++ firmware/export/config-ipod4g.h | 2 ++ firmware/export/config-ipodcolor.h | 2 ++ firmware/export/config-ipodmini.h | 2 ++ firmware/export/config-ipodmini2g.h | 2 ++ firmware/export/config-ipodnano.h | 2 ++ firmware/export/config-ipodvideo.h | 2 ++ manual/appendix/config_file_options.tex | 2 +- manual/plugins/calculator.tex | 2 +- manual/plugins/pictureflow.tex | 12 +++++------- manual/plugins/rockblox.tex | 2 +- 54 files changed, 229 insertions(+), 208 deletions(-) diff --git a/apps/debug_menu.c b/apps/debug_menu.c index b944ff3aa1..3fc0363297 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -2522,7 +2522,7 @@ static bool cpu_boost_log(void) } #endif -#if (defined(HAVE_SCROLLWHEEL) && (CONFIG_KEYPAD==IPOD_4G_PAD) && !defined(SIMULATOR)) +#if (defined(HAVE_WHEEL_ACCELERATION) && (CONFIG_KEYPAD==IPOD_4G_PAD) && !defined(SIMULATOR)) extern bool wheel_is_touched; extern int old_wheel_value; extern int new_wheel_value; @@ -2724,7 +2724,7 @@ static const struct the_menu_item menuitems[] = { #ifdef CPU_BOOST_LOGGING {"cpu_boost log",cpu_boost_log}, #endif -#if (defined(HAVE_SCROLLWHEEL) && (CONFIG_KEYPAD==IPOD_4G_PAD) && !defined(SIMULATOR)) +#if (defined(HAVE_WHEEL_ACCELERATION) && (CONFIG_KEYPAD==IPOD_4G_PAD) && !defined(SIMULATOR)) {"Debug scrollwheel", dbg_scrollwheel}, #endif }; diff --git a/apps/features.txt b/apps/features.txt index 2f743b84a8..c323c1cf55 100644 --- a/apps/features.txt +++ b/apps/features.txt @@ -143,6 +143,10 @@ rtc scrollwheel #endif +#if defined(HAVE_WHEEL_ACCELERATION) +wheel_acceleration +#endif + #if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER) soft_shutdown #endif diff --git a/apps/gui/list.c b/apps/gui/list.c index 2923ec33c4..8df0a29d52 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -588,7 +588,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, static bool scrolling_left = false; #endif -#ifdef HAVE_SCROLLWHEEL +#ifdef HAVE_WHEEL_ACCELERATION int next_item_modifier = button_apply_acceleration(get_action_data()); #else static int next_item_modifier = 1; @@ -659,7 +659,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, case ACTION_STD_PREV: case ACTION_STD_PREVREPEAT: gui_list_select_at_offset(lists, -next_item_modifier); -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION if (button_queue_count() < FRAMEDROP_TRIGGER) #endif gui_synclist_draw(lists); @@ -673,7 +673,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, case ACTION_STD_NEXT: case ACTION_STD_NEXTREPEAT: gui_list_select_at_offset(lists, next_item_modifier); -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION if (button_queue_count() < FRAMEDROP_TRIGGER) #endif gui_synclist_draw(lists); diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 30df8ea6ec..7223197fcc 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c @@ -38,9 +38,6 @@ #include "quickscreen.h" #if defined (HAVE_SCROLLWHEEL) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \ (CONFIG_KEYPAD == PLAYER_PAD) /* Define this if your target makes sense to have smaller values at the top of the list increasing down the list */ diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang index eb6532b405..b783cd5498 100644 --- a/apps/lang/bulgarian.lang +++ b/apps/lang/bulgarian.lang @@ -4561,15 +4561,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Скорост на ускоряване в списъците" - scrollwheel: none + wheel_acceleration: none *: "" - scrollwheel: "" + wheel_acceleration: "" @@ -9566,15 +9566,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Начално задържане на ускоряването на списъците" - scrollwheel: none + wheel_acceleration: none *: "" - scrollwheel: "" + wheel_acceleration: "" diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang index 24b823673d..872b78ea1d 100644 --- a/apps/lang/catala.lang +++ b/apps/lang/catala.lang @@ -3260,15 +3260,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Retard abans d'acceleració de llista" - scrollwheel: none + wheel_acceleration: none *: "Retard abans d'acceleració de llista" - scrollwheel: none + wheel_acceleration: none @@ -3277,15 +3277,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Velocitat d'acceleració" - scrollwheel: none + wheel_acceleration: none *: "Velocitat d'acceleració" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang index f3c4f93a07..dd48c6afc1 100644 --- a/apps/lang/chinese-simp.lang +++ b/apps/lang/chinese-simp.lang @@ -9208,15 +9208,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "列表加速度" - scrollwheel: none + wheel_acceleration: none *: "列表加速度" - scrollwheel: none + wheel_acceleration: none @@ -10537,15 +10537,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "列表加速前时滞" - scrollwheel: none + wheel_acceleration: none *: "列表加速前时滞" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang index 0910d4a037..ade47b5624 100644 --- a/apps/lang/chinese-trad.lang +++ b/apps/lang/chinese-trad.lang @@ -9183,15 +9183,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "列表加速速度" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none @@ -10520,15 +10520,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "列表加速緩沖" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang index 0aee1c92ec..42d7945dd7 100644 --- a/apps/lang/czech.lang +++ b/apps/lang/czech.lang @@ -3264,15 +3264,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Prodleva před zrychlením" - scrollwheel: none + wheel_acceleration: none *: "Prodleva před zrychlením" - scrollwheel: none + wheel_acceleration: none @@ -3281,15 +3281,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Zrychlení seznamu" - scrollwheel: none + wheel_acceleration: none *: "Zrychlení seznamu" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang index 7b699f8cfe..9ebed65c6f 100644 --- a/apps/lang/dansk.lang +++ b/apps/lang/dansk.lang @@ -10087,15 +10087,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Liste acceleration hastighed" - scrollwheel: none + wheel_acceleration: none *: "Liste acceleration hastighed" - scrollwheel: none + wheel_acceleration: none @@ -10267,15 +10267,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Pause før listeacceleration" - scrollwheel: none + wheel_acceleration: none *: "Pause før listeacceleration" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index bc91c81c68..beb672c589 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang @@ -3279,15 +3279,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Listenbeschleunigungs-Verzögerung" - scrollwheel: none + wheel_acceleration: none *: "Listenbeschleunigungs-Verzögerung" - scrollwheel: none + wheel_acceleration: none @@ -3296,15 +3296,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Listenbeschleunigung" - scrollwheel: none + wheel_acceleration: none *: "Listenbeschleunigung" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/english.lang b/apps/lang/english.lang index b7f186deb6..803c34340d 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -3352,15 +3352,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none @@ -3369,15 +3369,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang index fdef71523a..e659cfd839 100644 --- a/apps/lang/espanol.lang +++ b/apps/lang/espanol.lang @@ -9778,15 +9778,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Velocidad de aceleración de lista" - scrollwheel: none + wheel_acceleration: none *: "Velocidad de aceleración de lista" - scrollwheel: none + wheel_acceleration: none @@ -11019,15 +11019,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Retraso para comenzar la aceleración de la lista" - scrollwheel: none + wheel_acceleration: none *: "Retraso para comenzar la aceleración de la lista" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang index 7a87291a9e..a0536d88be 100644 --- a/apps/lang/finnish.lang +++ b/apps/lang/finnish.lang @@ -10220,15 +10220,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Listan kiihdytyksen aloitusviive" - scrollwheel: none + wheel_acceleration: none *: "Listan kiihdytyksen aloitusviive" - scrollwheel: none + wheel_acceleration: none @@ -10237,15 +10237,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Listan kiihdytysnopeus" - scrollwheel: none + wheel_acceleration: none *: "Listan kiihdytysnopeus" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang index 0b93680082..e90ff3fed9 100644 --- a/apps/lang/francais.lang +++ b/apps/lang/francais.lang @@ -3309,15 +3309,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Délais avant accélération liste" - scrollwheel: none + wheel_acceleration: none *: "Délais avant accélération de la liste" - scrollwheel: none + wheel_acceleration: none @@ -3326,15 +3326,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Vitesse d'accélération liste" - scrollwheel: none + wheel_acceleration: none *: "Vitesse d'accélération de la liste" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang index 75ecb62421..f0cab245f2 100644 --- a/apps/lang/greek.lang +++ b/apps/lang/greek.lang @@ -3266,15 +3266,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Καθυστέρηση εκκίνησης επιτάχυνσης λίστας" - scrollwheel: none + wheel_acceleration: none *: "Καθυστέρηση εκκίνησης επιτάχυνσης λίστας" - scrollwheel: none + wheel_acceleration: none @@ -3283,15 +3283,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Ταχύτητα επιτάχυνσης λίστας" - scrollwheel: none + wheel_acceleration: none *: "Ταχύτητα επιτάχυνσης λίστας" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang index 034e63f634..1b021e4b00 100644 --- a/apps/lang/hebrew.lang +++ b/apps/lang/hebrew.lang @@ -3260,15 +3260,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "השהיה לפי האצה בגלילת רשימות" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none @@ -3277,15 +3277,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "מהירות האצה בגלילת רשימות" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index af30a2531f..016b41410a 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang @@ -3281,15 +3281,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Ritardo Iniziale Accelerazione Lista" - scrollwheel: none + wheel_acceleration: none *: "Ritardo Iniziale Accelerazione Lista" - scrollwheel: none + wheel_acceleration: none @@ -3298,15 +3298,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Velocità Accelerazione Lista" - scrollwheel: none + wheel_acceleration: none *: "Velocità Accelerazione Lista" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang index dbe12a6ea7..8bbf2134d7 100644 --- a/apps/lang/japanese.lang +++ b/apps/lang/japanese.lang @@ -3285,15 +3285,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "加速するまでの時間" - scrollwheel: none + wheel_acceleration: none *: "加速するまでの時間" - scrollwheel: none + wheel_acceleration: none @@ -3302,15 +3302,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "加速度" - scrollwheel: none + wheel_acceleration: none *: "加速度" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang index 6e8df92c93..6c5ff12f58 100644 --- a/apps/lang/korean.lang +++ b/apps/lang/korean.lang @@ -10531,15 +10531,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "목록 가속 속도" - scrollwheel: none + wheel_acceleration: none *: "목록 가속 속도" - scrollwheel: none + wheel_acceleration: none @@ -11715,15 +11715,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "목록 가속 시작 지연시간" - scrollwheel: none + wheel_acceleration: none *: "목록 가속 시작 지연시간" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang index 0358def91b..820c074799 100644 --- a/apps/lang/magyar.lang +++ b/apps/lang/magyar.lang @@ -3255,15 +3255,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Lista gyorsítás késleltetése" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none @@ -3272,15 +3272,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Lista gyorsítás sebessége" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index 6c89f3af07..4dfe05b5e6 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang @@ -10022,15 +10022,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Lijst Acceleratie Snelheid" - scrollwheel: none + wheel_acceleration: none *: "Lijst Acceleratie Snelheid" - scrollwheel: none + wheel_acceleration: none @@ -10202,15 +10202,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Lijst Acceleratie Start Vertraging" - scrollwheel: none + wheel_acceleration: none *: "Lijst Acceleratie Start Vertraging" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang index 6ad2b9365e..c944493710 100644 --- a/apps/lang/norsk-nynorsk.lang +++ b/apps/lang/norsk-nynorsk.lang @@ -10090,15 +10090,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Vis akselereringsfart" - scrollwheel: none + wheel_acceleration: none *: "Vis akselereringsfart" - scrollwheel: none + wheel_acceleration: none @@ -10831,15 +10831,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Pause før listeakselerering" - scrollwheel: none + wheel_acceleration: none *: "Pause før listeakselerering" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index 14b5310675..64f60d7a3d 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang @@ -10366,15 +10366,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Aksellerasjonshastighet i lister" - scrollwheel: none + wheel_acceleration: none *: "Aksellerasjonshastighet i lister" - scrollwheel: none + wheel_acceleration: none @@ -11193,15 +11193,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Listeaksellerasjon startforsinkelse" - scrollwheel: none + wheel_acceleration: none *: "Listeaksellerasjon startforsinkelse" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang index 012d39b9db..6b8e724a5d 100644 --- a/apps/lang/polski.lang +++ b/apps/lang/polski.lang @@ -3269,15 +3269,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Opóźnienie przyspiesznie przy przeglądaniu list" - scrollwheel: none + wheel_acceleration: none *: "Opóźnienie przyspiesznie przy przeglądaniu list" - scrollwheel: none + wheel_acceleration: none @@ -3286,15 +3286,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Przyspieszenie przeglądania list" - scrollwheel: none + wheel_acceleration: none *: "Przyspieszenie przeglądania list" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang index ead5c3dc69..345eecc702 100644 --- a/apps/lang/portugues-brasileiro.lang +++ b/apps/lang/portugues-brasileiro.lang @@ -3279,15 +3279,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Demora para Início da Aceleração da Lista" - scrollwheel: none + wheel_acceleration: none *: "Demora para Início da Aceleração da Lista" - scrollwheel: none + wheel_acceleration: none @@ -3296,15 +3296,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Velocidade da Aceleração da Lista" - scrollwheel: none + wheel_acceleration: none *: "Velocidade da Aceleração da Lista" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang index aac8a9925f..c2b5ab9d52 100644 --- a/apps/lang/portugues.lang +++ b/apps/lang/portugues.lang @@ -8176,15 +8176,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Velocidade de Aceleração da Lista" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none @@ -10022,15 +10022,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Atraso no Início da Acelaração da Lista" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang index 8eed2297f4..7d71499029 100644 --- a/apps/lang/romaneste.lang +++ b/apps/lang/romaneste.lang @@ -4820,15 +4820,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Viteza accelerare lista" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none @@ -9693,15 +9693,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Intarzierea accelerarii startului listei" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index 9815f51922..e75addaa1b 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang @@ -8725,15 +8725,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Ускорение списка" - scrollwheel: none + wheel_acceleration: none *: "Ускорение списка" - scrollwheel: none + wheel_acceleration: none @@ -10755,15 +10755,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Задержка начала списка" - scrollwheel: none + wheel_acceleration: none *: "Задержка начала списка" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang index bb80cdc4f4..37b37af10e 100644 --- a/apps/lang/srpski.lang +++ b/apps/lang/srpski.lang @@ -3269,15 +3269,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Кашњење до почетка скроловања листе" - scrollwheel: none + wheel_acceleration: none *: "Кашњење до почетка скроловања листе" - scrollwheel: none + wheel_acceleration: none @@ -3286,15 +3286,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Брзина скроловања листе" - scrollwheel: none + wheel_acceleration: none *: "Брзина скроловања листе" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang index c54e08931b..857bca584c 100644 --- a/apps/lang/svenska.lang +++ b/apps/lang/svenska.lang @@ -3285,15 +3285,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Listaccelerationsstart" - scrollwheel: none + wheel_acceleration: none *: "Listaccelerationsstart" - scrollwheel: none + wheel_acceleration: none @@ -3302,15 +3302,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Listaccelerationssteg" - scrollwheel: none + wheel_acceleration: none *: "Listaccelerationssteg" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang index 6c2bd51714..6c0f40da6d 100644 --- a/apps/lang/tagalog.lang +++ b/apps/lang/tagalog.lang @@ -3269,15 +3269,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Bilisihan ng listahan umpisahan abala" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none @@ -3286,15 +3286,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Bilisihan ng listahan tulin" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang index f0ea6f1c70..2d94c6e693 100644 --- a/apps/lang/thai.lang +++ b/apps/lang/thai.lang @@ -3263,15 +3263,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "หน่วงเวลาการเร่งรายการเริ่มต้น" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none @@ -3280,15 +3280,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "ความเร็วของการเร่งรายการ" - scrollwheel: none + wheel_acceleration: none *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang index c2aa2c669e..b824dd8e49 100644 --- a/apps/lang/walon.lang +++ b/apps/lang/walon.lang @@ -3284,15 +3284,15 @@ user: *: "List Acceleration Start Delay" - scrollwheel: none + wheel_acceleration: none *: "Tårdjaedje divant acceleråcion djivêye" - scrollwheel: none + wheel_acceleration: none *: "Tårdjaedje divant l'acceleråcion del djivêye" - scrollwheel: none + wheel_acceleration: none @@ -3301,15 +3301,15 @@ user: *: "List Acceleration Speed" - scrollwheel: none + wheel_acceleration: none *: "Radisté d'acceleråcion djivêye" - scrollwheel: none + wheel_acceleration: none *: "Radisté d'acceleråcion del djivêye" - scrollwheel: none + wheel_acceleration: none diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index dbc7206b91..d70cf37687 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -251,11 +251,11 @@ MENUITEM_SETTING(jump_scroll, &global_settings.jump_scroll, NULL); MENUITEM_SETTING(jump_scroll_delay, &global_settings.jump_scroll_delay, NULL); #endif /* list acceleration */ -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION MENUITEM_SETTING(list_accel_start_delay, &global_settings.list_accel_start_delay, NULL); MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); -#endif /* HAVE_SCROLLWHEEL */ +#endif /* HAVE_WHEEL_ACCELERATION */ #ifdef HAVE_LCD_BITMAP static int screenscroll_callback(int action,const struct menu_item_ex *this_item) { @@ -290,7 +290,7 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, &offset_out_of_view, &screen_scroll_step, #endif &scroll_paginated, -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION &list_accel_start_delay, &list_accel_wait #endif ); diff --git a/apps/settings.h b/apps/settings.h index 201cd8f772..3ea9ee96e1 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -478,7 +478,7 @@ struct user_settings #endif /* misc options */ -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION int list_accel_start_delay; /* ms before we start increaseing step size */ int list_accel_wait; /* ms between increases */ #endif diff --git a/apps/settings_list.c b/apps/settings_list.c index f5b49f3447..2d9be0873c 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -319,7 +319,7 @@ static int32_t backlight_getlang(int value, int unit) } #endif -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION static void scanaccel_formatter(char *buffer, size_t buffer_size, int val, const char *unit) { @@ -1420,14 +1420,14 @@ const struct settings_list settings[] = { MAX_BRIGHTNESS_SETTING, 1, NULL, NULL, buttonlight_set_brightness), #endif -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION INT_SETTING(0, list_accel_start_delay, LANG_LISTACCEL_START_DELAY, 2, "list_accel_start_delay", UNIT_MS, 0, 10, 1, formatter_unit_0_is_off, getlang_unit_0_is_off, NULL), INT_SETTING(0, list_accel_wait, LANG_LISTACCEL_ACCEL_SPEED, 3, "list_accel_wait", UNIT_SEC, 1, 10, 1, scanaccel_formatter, getlang_unit_0_is_off, NULL), -#endif /* HAVE_SCROLLWHEEL */ +#endif /* HAVE_WHEEL_ACCELERATION */ #if CONFIG_CODEC == SWCODEC /* keyclick */ CHOICE_SETTING(0, keyclick, LANG_KEYCLICK, 0, diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 2a9428565c..7d4daafdc2 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -549,7 +549,7 @@ void button_clear_queue(void) #endif /* SIMULATOR */ -#ifdef HAVE_SCROLLWHEEL +#ifdef HAVE_WHEEL_ACCELERATION /* WHEEL_ACCEL_FACTOR = 2^16 / WHEEL_ACCEL_START */ #define WHEEL_ACCEL_FACTOR (1<<16)/WHEEL_ACCEL_START /** @@ -591,4 +591,4 @@ int button_apply_acceleration(const unsigned int data) return delta; } -#endif /* HAVE_SCROLLWHEEL */ +#endif /* HAVE_WHEEL_ACCELERATION */ diff --git a/firmware/export/button.h b/firmware/export/button.h index eb2435bed0..d5a8001fb7 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h @@ -56,7 +56,7 @@ int wheel_status(void); void wheel_send_events(bool send); #endif -#ifdef HAVE_SCROLLWHEEL +#ifdef HAVE_WHEEL_ACCELERATION int button_apply_acceleration(const unsigned int data); #endif diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 3fb491f723..e4d4b739bc 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h @@ -106,6 +106,8 @@ /* define this if the unit uses a scrollwheel for navigation */ #define HAVE_SCROLLWHEEL +/* define to activate advanced wheel acceleration code */ +#define HAVE_WHEEL_ACCELERATION /* define from which rotation speed [degree/sec] on the acceleration starts */ #define WHEEL_ACCEL_START 540 /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h index e8bc3db63d..5d2fa81df7 100644 --- a/firmware/export/config-e200v2.h +++ b/firmware/export/config-e200v2.h @@ -116,6 +116,8 @@ /* define this if the unit uses a scrollwheel for navigation */ #define HAVE_SCROLLWHEEL +/* define to activate advanced wheel acceleration code */ +#define HAVE_WHEEL_ACCELERATION /* define from which rotation speed [degree/sec] on the acceleration starts */ #define WHEEL_ACCEL_START 540 /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h index 32a7a00bcb..c52298f442 100644 --- a/firmware/export/config-fuze.h +++ b/firmware/export/config-fuze.h @@ -116,6 +116,8 @@ /* define this if the unit uses a scrollwheel for navigation */ #define HAVE_SCROLLWHEEL +/* define to activate advanced wheel acceleration code */ +#define HAVE_WHEEL_ACCELERATION /* define from which rotation speed [degree/sec] on the acceleration starts */ #define WHEEL_ACCEL_START 540 /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h index 1cd9ee2166..b4acd38b5b 100644 --- a/firmware/export/config-ipod1g2g.h +++ b/firmware/export/config-ipod1g2g.h @@ -69,6 +69,8 @@ #define CONFIG_KEYPAD IPOD_1G2G_PAD +#define HAVE_SCROLLWHEEL + /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 0a8ae5766b..57773750f2 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -70,6 +70,8 @@ #define CONFIG_KEYPAD IPOD_3G_PAD +#define HAVE_SCROLLWHEEL + /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index 47a7bd9711..7cbe2145f2 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h @@ -106,6 +106,8 @@ /* define this if the unit uses a scrollwheel for navigation */ #define HAVE_SCROLLWHEEL +/* define to activate advanced wheel acceleration code */ +#define HAVE_WHEEL_ACCELERATION /* define from which rotation speed [degree/sec] on the acceleration starts */ #define WHEEL_ACCEL_START 270 /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index 476ebf983d..adb0f0ba1c 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h @@ -90,6 +90,8 @@ /* define this if the unit uses a scrollwheel for navigation */ #define HAVE_SCROLLWHEEL +/* define to activate advanced wheel acceleration code */ +#define HAVE_WHEEL_ACCELERATION /* define from which rotation speed [degree/sec] on the acceleration starts */ #define WHEEL_ACCEL_START 270 /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index b168901a1e..76c81bd86d 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -69,6 +69,8 @@ #define CONFIG_KEYPAD IPOD_4G_PAD +#define HAVE_SCROLLWHEEL + /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index cf042b4e45..3f37ce940f 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -111,6 +111,8 @@ /* define this if the unit uses a scrollwheel for navigation */ #define HAVE_SCROLLWHEEL +/* define to activate advanced wheel acceleration code */ +#define HAVE_WHEEL_ACCELERATION /* define from which rotation speed [degree/sec] on the acceleration starts */ #define WHEEL_ACCEL_START 270 /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index 92f9dc03c0..7947997ee0 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h @@ -94,6 +94,8 @@ /* define this if the unit uses a scrollwheel for navigation */ #define HAVE_SCROLLWHEEL +/* define to activate advanced wheel acceleration code */ +#define HAVE_WHEEL_ACCELERATION /* define from which rotation speed [degree/sec] on the acceleration starts */ #define WHEEL_ACCEL_START 270 /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index 3812b44943..0ad3b5c7f2 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -100,6 +100,8 @@ /* define this if the unit uses a scrollwheel for navigation */ #define HAVE_SCROLLWHEEL +/* define to activate advanced wheel acceleration code */ +#define HAVE_WHEEL_ACCELERATION /* define from which rotation speed [degree/sec] on the acceleration starts */ #define WHEEL_ACCEL_START 270 /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index 4230113183..7f7e225007 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex @@ -134,7 +134,7 @@ \opt{radio}{radio, } bookmarks & N/A\\ playlist catalog directory & /path/to/dir & N/A\\ - \opt{scrollwheel}{ + \opt{wheel_acceleration}{ list\_accel\_start\_delay & 0 to 10 & ms\\ list\_accel\_wait & 1 to 10 & seconds\\ } diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex index 5ff277993f..e6980899da 100644 --- a/manual/plugins/calculator.tex +++ b/manual/plugins/calculator.tex @@ -12,7 +12,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown} \opt{SANSA_E200_PAD}{/} - \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack} + \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack} \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown} & Move around the keypad\\ % diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex index 056c5e89ad..da7f8726cb 100644 --- a/manual/plugins/pictureflow.tex +++ b/manual/plugins/pictureflow.tex @@ -23,23 +23,21 @@ play music.} \subsubsection{Keys} \begin{table} \begin{btnmap}{}{} - \opt{scrollwheel,ipodmini,IPOD_1G2G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{ - \opt{scrollwheel,ipodmini,IPOD_1G2G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack} + \opt{scrollwheel,IRIVER_H10_PAD}{ + \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack} \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown} & Scroll through albums / track list\\} - \nopt{scrollwheel,ipodmini,IPOD_1G2G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight + \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight & Scroll through albums\\} - \nopt{scrollwheel,ipodmini,IPOD_1G2G_PAD,IPOD_3G_PAD,SANSA_C200_PAD,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown + \nopt{scrollwheel,SANSA_C200_PAD,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown & Scroll through track list\\} \opt{SANSA_C200_PAD}{\ButtonUp & Scroll up through track list\\} - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,% - GIGABEATS_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD,% - IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonSelect} + \nopt{IRIVER_H10_PAD}{\ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonRew} & Switch between cover view and track list\\ diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex index 3dc98b524a..19542f9b7d 100644 --- a/manual/plugins/rockblox.tex +++ b/manual/plugins/rockblox.tex @@ -32,7 +32,7 @@ making the blocks fall faster. If the pile of blocks reaches the ceiling, the ga \opt{RECORDER_PAD}{\ButtonPlay} \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect} - \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd} + \opt{scrollwheel}{\ButtonScrollFwd} \opt{IAUDIO_X5_PAD}{\ButtonPower} \opt{IRIVER_H10_PAD}{\ButtonRew} \opt{SANSA_C200_PAD}{\ButtonVolDown} -- cgit v1.2.3