diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/button.c | 4 | ||||
-rw-r--r-- | firmware/export/button.h | 2 | ||||
-rw-r--r-- | firmware/export/config-e200.h | 2 | ||||
-rw-r--r-- | firmware/export/config-e200v2.h | 2 | ||||
-rw-r--r-- | firmware/export/config-fuze.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipod1g2g.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipod3g.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipod4g.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipodcolor.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipodmini.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipodmini2g.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipodnano.h | 2 | ||||
-rw-r--r-- | firmware/export/config-ipodvideo.h | 2 |
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) | |||
549 | 549 | ||
550 | #endif /* SIMULATOR */ | 550 | #endif /* SIMULATOR */ |
551 | 551 | ||
552 | #ifdef HAVE_SCROLLWHEEL | 552 | #ifdef HAVE_WHEEL_ACCELERATION |
553 | /* WHEEL_ACCEL_FACTOR = 2^16 / WHEEL_ACCEL_START */ | 553 | /* WHEEL_ACCEL_FACTOR = 2^16 / WHEEL_ACCEL_START */ |
554 | #define WHEEL_ACCEL_FACTOR (1<<16)/WHEEL_ACCEL_START | 554 | #define WHEEL_ACCEL_FACTOR (1<<16)/WHEEL_ACCEL_START |
555 | /** | 555 | /** |
@@ -591,4 +591,4 @@ int button_apply_acceleration(const unsigned int data) | |||
591 | 591 | ||
592 | return delta; | 592 | return delta; |
593 | } | 593 | } |
594 | #endif /* HAVE_SCROLLWHEEL */ | 594 | #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); | |||
56 | void wheel_send_events(bool send); | 56 | void wheel_send_events(bool send); |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | #ifdef HAVE_SCROLLWHEEL | 59 | #ifdef HAVE_WHEEL_ACCELERATION |
60 | int button_apply_acceleration(const unsigned int data); | 60 | int button_apply_acceleration(const unsigned int data); |
61 | #endif | 61 | #endif |
62 | 62 | ||
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 @@ | |||
106 | 106 | ||
107 | /* define this if the unit uses a scrollwheel for navigation */ | 107 | /* define this if the unit uses a scrollwheel for navigation */ |
108 | #define HAVE_SCROLLWHEEL | 108 | #define HAVE_SCROLLWHEEL |
109 | /* define to activate advanced wheel acceleration code */ | ||
110 | #define HAVE_WHEEL_ACCELERATION | ||
109 | /* define from which rotation speed [degree/sec] on the acceleration starts */ | 111 | /* define from which rotation speed [degree/sec] on the acceleration starts */ |
110 | #define WHEEL_ACCEL_START 540 | 112 | #define WHEEL_ACCEL_START 540 |
111 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ | 113 | /* 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 @@ | |||
116 | 116 | ||
117 | /* define this if the unit uses a scrollwheel for navigation */ | 117 | /* define this if the unit uses a scrollwheel for navigation */ |
118 | #define HAVE_SCROLLWHEEL | 118 | #define HAVE_SCROLLWHEEL |
119 | /* define to activate advanced wheel acceleration code */ | ||
120 | #define HAVE_WHEEL_ACCELERATION | ||
119 | /* define from which rotation speed [degree/sec] on the acceleration starts */ | 121 | /* define from which rotation speed [degree/sec] on the acceleration starts */ |
120 | #define WHEEL_ACCEL_START 540 | 122 | #define WHEEL_ACCEL_START 540 |
121 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ | 123 | /* 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 @@ | |||
116 | 116 | ||
117 | /* define this if the unit uses a scrollwheel for navigation */ | 117 | /* define this if the unit uses a scrollwheel for navigation */ |
118 | #define HAVE_SCROLLWHEEL | 118 | #define HAVE_SCROLLWHEEL |
119 | /* define to activate advanced wheel acceleration code */ | ||
120 | #define HAVE_WHEEL_ACCELERATION | ||
119 | /* define from which rotation speed [degree/sec] on the acceleration starts */ | 121 | /* define from which rotation speed [degree/sec] on the acceleration starts */ |
120 | #define WHEEL_ACCEL_START 540 | 122 | #define WHEEL_ACCEL_START 540 |
121 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ | 123 | /* 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 @@ | |||
69 | 69 | ||
70 | #define CONFIG_KEYPAD IPOD_1G2G_PAD | 70 | #define CONFIG_KEYPAD IPOD_1G2G_PAD |
71 | 71 | ||
72 | #define HAVE_SCROLLWHEEL | ||
73 | |||
72 | /* Define this if you do software codec */ | 74 | /* Define this if you do software codec */ |
73 | #define CONFIG_CODEC SWCODEC | 75 | #define CONFIG_CODEC SWCODEC |
74 | 76 | ||
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 @@ | |||
70 | 70 | ||
71 | #define CONFIG_KEYPAD IPOD_3G_PAD | 71 | #define CONFIG_KEYPAD IPOD_3G_PAD |
72 | 72 | ||
73 | #define HAVE_SCROLLWHEEL | ||
74 | |||
73 | /* Define this if you do software codec */ | 75 | /* Define this if you do software codec */ |
74 | #define CONFIG_CODEC SWCODEC | 76 | #define CONFIG_CODEC SWCODEC |
75 | 77 | ||
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 @@ | |||
106 | 106 | ||
107 | /* define this if the unit uses a scrollwheel for navigation */ | 107 | /* define this if the unit uses a scrollwheel for navigation */ |
108 | #define HAVE_SCROLLWHEEL | 108 | #define HAVE_SCROLLWHEEL |
109 | /* define to activate advanced wheel acceleration code */ | ||
110 | #define HAVE_WHEEL_ACCELERATION | ||
109 | /* define from which rotation speed [degree/sec] on the acceleration starts */ | 111 | /* define from which rotation speed [degree/sec] on the acceleration starts */ |
110 | #define WHEEL_ACCEL_START 270 | 112 | #define WHEEL_ACCEL_START 270 |
111 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ | 113 | /* 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 @@ | |||
90 | 90 | ||
91 | /* define this if the unit uses a scrollwheel for navigation */ | 91 | /* define this if the unit uses a scrollwheel for navigation */ |
92 | #define HAVE_SCROLLWHEEL | 92 | #define HAVE_SCROLLWHEEL |
93 | /* define to activate advanced wheel acceleration code */ | ||
94 | #define HAVE_WHEEL_ACCELERATION | ||
93 | /* define from which rotation speed [degree/sec] on the acceleration starts */ | 95 | /* define from which rotation speed [degree/sec] on the acceleration starts */ |
94 | #define WHEEL_ACCEL_START 270 | 96 | #define WHEEL_ACCEL_START 270 |
95 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ | 97 | /* 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 @@ | |||
69 | 69 | ||
70 | #define CONFIG_KEYPAD IPOD_4G_PAD | 70 | #define CONFIG_KEYPAD IPOD_4G_PAD |
71 | 71 | ||
72 | #define HAVE_SCROLLWHEEL | ||
73 | |||
72 | /* Define this if you do software codec */ | 74 | /* Define this if you do software codec */ |
73 | #define CONFIG_CODEC SWCODEC | 75 | #define CONFIG_CODEC SWCODEC |
74 | 76 | ||
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 @@ | |||
111 | 111 | ||
112 | /* define this if the unit uses a scrollwheel for navigation */ | 112 | /* define this if the unit uses a scrollwheel for navigation */ |
113 | #define HAVE_SCROLLWHEEL | 113 | #define HAVE_SCROLLWHEEL |
114 | /* define to activate advanced wheel acceleration code */ | ||
115 | #define HAVE_WHEEL_ACCELERATION | ||
114 | /* define from which rotation speed [degree/sec] on the acceleration starts */ | 116 | /* define from which rotation speed [degree/sec] on the acceleration starts */ |
115 | #define WHEEL_ACCEL_START 270 | 117 | #define WHEEL_ACCEL_START 270 |
116 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ | 118 | /* 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 @@ | |||
94 | 94 | ||
95 | /* define this if the unit uses a scrollwheel for navigation */ | 95 | /* define this if the unit uses a scrollwheel for navigation */ |
96 | #define HAVE_SCROLLWHEEL | 96 | #define HAVE_SCROLLWHEEL |
97 | /* define to activate advanced wheel acceleration code */ | ||
98 | #define HAVE_WHEEL_ACCELERATION | ||
97 | /* define from which rotation speed [degree/sec] on the acceleration starts */ | 99 | /* define from which rotation speed [degree/sec] on the acceleration starts */ |
98 | #define WHEEL_ACCEL_START 270 | 100 | #define WHEEL_ACCEL_START 270 |
99 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ | 101 | /* 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 @@ | |||
100 | 100 | ||
101 | /* define this if the unit uses a scrollwheel for navigation */ | 101 | /* define this if the unit uses a scrollwheel for navigation */ |
102 | #define HAVE_SCROLLWHEEL | 102 | #define HAVE_SCROLLWHEEL |
103 | /* define to activate advanced wheel acceleration code */ | ||
104 | #define HAVE_WHEEL_ACCELERATION | ||
103 | /* define from which rotation speed [degree/sec] on the acceleration starts */ | 105 | /* define from which rotation speed [degree/sec] on the acceleration starts */ |
104 | #define WHEEL_ACCEL_START 270 | 106 | #define WHEEL_ACCEL_START 270 |
105 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ | 107 | /* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ |