summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/debug_menu.c4
-rw-r--r--apps/features.txt4
-rw-r--r--apps/gui/list.c6
-rw-r--r--apps/gui/option_select.c3
-rw-r--r--apps/lang/bulgarian.lang12
-rw-r--r--apps/lang/catala.lang12
-rw-r--r--apps/lang/chinese-simp.lang12
-rw-r--r--apps/lang/chinese-trad.lang12
-rw-r--r--apps/lang/czech.lang12
-rw-r--r--apps/lang/dansk.lang12
-rw-r--r--apps/lang/deutsch.lang12
-rw-r--r--apps/lang/english.lang12
-rw-r--r--apps/lang/espanol.lang12
-rw-r--r--apps/lang/finnish.lang12
-rw-r--r--apps/lang/francais.lang12
-rw-r--r--apps/lang/greek.lang12
-rw-r--r--apps/lang/hebrew.lang12
-rw-r--r--apps/lang/italiano.lang12
-rw-r--r--apps/lang/japanese.lang12
-rw-r--r--apps/lang/korean.lang12
-rw-r--r--apps/lang/magyar.lang12
-rw-r--r--apps/lang/nederlands.lang12
-rw-r--r--apps/lang/norsk-nynorsk.lang12
-rw-r--r--apps/lang/norsk.lang12
-rw-r--r--apps/lang/polski.lang12
-rw-r--r--apps/lang/portugues-brasileiro.lang12
-rw-r--r--apps/lang/portugues.lang12
-rw-r--r--apps/lang/romaneste.lang12
-rw-r--r--apps/lang/russian.lang12
-rw-r--r--apps/lang/srpski.lang12
-rw-r--r--apps/lang/svenska.lang12
-rw-r--r--apps/lang/tagalog.lang12
-rw-r--r--apps/lang/thai.lang12
-rw-r--r--apps/lang/walon.lang12
-rw-r--r--apps/menus/display_menu.c6
-rw-r--r--apps/settings.h2
-rw-r--r--apps/settings_list.c6
-rw-r--r--firmware/drivers/button.c4
-rw-r--r--firmware/export/button.h2
-rw-r--r--firmware/export/config-e200.h2
-rw-r--r--firmware/export/config-e200v2.h2
-rw-r--r--firmware/export/config-fuze.h2
-rw-r--r--firmware/export/config-ipod1g2g.h2
-rw-r--r--firmware/export/config-ipod3g.h2
-rw-r--r--firmware/export/config-ipod4g.h2
-rw-r--r--firmware/export/config-ipodcolor.h2
-rw-r--r--firmware/export/config-ipodmini.h2
-rw-r--r--firmware/export/config-ipodmini2g.h2
-rw-r--r--firmware/export/config-ipodnano.h2
-rw-r--r--firmware/export/config-ipodvideo.h2
-rw-r--r--manual/appendix/config_file_options.tex2
-rw-r--r--manual/plugins/calculator.tex2
-rw-r--r--manual/plugins/pictureflow.tex12
-rw-r--r--manual/plugins/rockblox.tex2
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Скорост на ускоряване в списъците"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: ""
- scrollwheel: ""
+ wheel_acceleration: ""
</voice>
</phrase>
<phrase>
@@ -9566,15 +9566,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Начално задържане на ускоряването на списъците"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: ""
- scrollwheel: ""
+ wheel_acceleration: ""
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Retard abans d'acceleració de llista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Retard abans d'acceleració de llista"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3277,15 +3277,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Velocitat d'acceleració"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Velocitat d'acceleració"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "列表加速度"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "列表加速度"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -10537,15 +10537,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "列表加速前时滞"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "列表加速前时滞"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "列表加速速度"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -10520,15 +10520,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "列表加速緩沖"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Prodleva před zrychlením"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Prodleva před zrychlením"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3281,15 +3281,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Zrychlení seznamu"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Zrychlení seznamu"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Liste acceleration hastighed"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Liste acceleration hastighed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -10267,15 +10267,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Pause før listeacceleration"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Pause før listeacceleration"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Listenbeschleunigungs-Verzögerung"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Listenbeschleunigungs-Verzögerung"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3296,15 +3296,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Listenbeschleunigung"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Listenbeschleunigung"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3369,15 +3369,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Velocidad de aceleración de lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Velocidad de aceleración de lista"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -11019,15 +11019,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Retraso para comenzar la aceleración de la lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Retraso para comenzar la aceleración de la lista"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Listan kiihdytyksen aloitusviive"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Listan kiihdytyksen aloitusviive"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -10237,15 +10237,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Listan kiihdytysnopeus"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Listan kiihdytysnopeus"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Délais avant accélération liste"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Délais avant accélération de la liste"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3326,15 +3326,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Vitesse d'accélération liste"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Vitesse d'accélération de la liste"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Καθυστέρηση εκκίνησης επιτάχυνσης λίστας"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Καθυστέρηση εκκίνησης επιτάχυνσης λίστας"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3283,15 +3283,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Ταχύτητα επιτάχυνσης λίστας"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Ταχύτητα επιτάχυνσης λίστας"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "השהיה לפי האצה בגלילת רשימות"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3277,15 +3277,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "מהירות האצה בגלילת רשימות"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Ritardo Iniziale Accelerazione Lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Ritardo Iniziale Accelerazione Lista"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3298,15 +3298,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Velocità Accelerazione Lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Velocità Accelerazione Lista"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "加速するまでの時間"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "加速するまでの時間"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3302,15 +3302,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "加速度"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "加速度"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "목록 가속 속도"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "목록 가속 속도"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -11715,15 +11715,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "목록 가속 시작 지연시간"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "목록 가속 시작 지연시간"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Lista gyorsítás késleltetése"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3272,15 +3272,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Lista gyorsítás sebessége"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Lijst Acceleratie Snelheid"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Lijst Acceleratie Snelheid"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -10202,15 +10202,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Lijst Acceleratie Start Vertraging"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Lijst Acceleratie Start Vertraging"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Vis akselereringsfart"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Vis akselereringsfart"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -10831,15 +10831,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Pause før listeakselerering"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Pause før listeakselerering"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Aksellerasjonshastighet i lister"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Aksellerasjonshastighet i lister"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -11193,15 +11193,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Listeaksellerasjon startforsinkelse"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Listeaksellerasjon startforsinkelse"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Opóźnienie przyspiesznie przy przeglądaniu list"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Opóźnienie przyspiesznie przy przeglądaniu list"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3286,15 +3286,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Przyspieszenie przeglądania list"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Przyspieszenie przeglądania list"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Demora para Início da Aceleração da Lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Demora para Início da Aceleração da Lista"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3296,15 +3296,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Velocidade da Aceleração da Lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Velocidade da Aceleração da Lista"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Velocidade de Aceleração da Lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -10022,15 +10022,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Atraso no Início da Acelaração da Lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Viteza accelerare lista"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -9693,15 +9693,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Intarzierea accelerarii startului listei"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Ускорение списка"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Ускорение списка"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -10755,15 +10755,15 @@
user:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Задержка начала списка"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Задержка начала списка"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Кашњење до почетка скроловања листе"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Кашњење до почетка скроловања листе"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3286,15 +3286,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Брзина скроловања листе"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Брзина скроловања листе"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Listaccelerationsstart"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Listaccelerationsstart"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3302,15 +3302,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Listaccelerationssteg"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Listaccelerationssteg"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Bilisihan ng listahan umpisahan abala"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3286,15 +3286,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Bilisihan ng listahan tulin"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "หน่วงเวลาการเร่งรายการเริ่มต้น"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3280,15 +3280,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "ความเร็วของการเร่งรายการ"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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:
<source>
*: "List Acceleration Start Delay"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Tårdjaedje divant acceleråcion djivêye"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Tårdjaedje divant l'acceleråcion del djivêye"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
@@ -3301,15 +3301,15 @@
user:
<source>
*: "List Acceleration Speed"
- scrollwheel: none
+ wheel_acceleration: none
</source>
<dest>
*: "Radisté d'acceleråcion djivêye"
- scrollwheel: none
+ wheel_acceleration: none
</dest>
<voice>
*: "Radisté d'acceleråcion del djivêye"
- scrollwheel: none
+ wheel_acceleration: none
</voice>
</phrase>
<phrase>
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}