13 files changed, 25 insertions, 3 deletions

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) */