diff options
33 files changed, 141 insertions, 88 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 918fa5d3b9..84f2eecbe2 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -212,4 +212,6 @@ keymaps/keymap-hdd1630.c | |||
212 | keymaps/keymap-iaudio67.c | 212 | keymaps/keymap-iaudio67.c |
213 | #elif CONFIG_KEYPAD == LOGIK_DAX_PAD | 213 | #elif CONFIG_KEYPAD == LOGIK_DAX_PAD |
214 | keymaps/keymap-logikdax.c | 214 | keymaps/keymap-logikdax.c |
215 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
216 | keymaps/keymap-fuze.c | ||
215 | #endif | 217 | #endif |
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang index 349c382c81..f598563faf 100644 --- a/apps/lang/bulgarian.lang +++ b/apps/lang/bulgarian.lang | |||
@@ -10221,17 +10221,17 @@ | |||
10221 | <source> | 10221 | <source> |
10222 | *: none | 10222 | *: none |
10223 | button_light: "Button Light Timeout" | 10223 | button_light: "Button Light Timeout" |
10224 | e200*: "Wheel Light Timeout" | 10224 | fuze,e200*: "Wheel Light Timeout" |
10225 | </source> | 10225 | </source> |
10226 | <dest> | 10226 | <dest> |
10227 | *: none | 10227 | *: none |
10228 | button_light: "Изключване на осветяването на бутоните" | 10228 | button_light: "Изключване на осветяването на бутоните" |
10229 | e200*: "Изключване на осветяването на колелото" | 10229 | fuze,e200*: "Изключване на осветяването на колелото" |
10230 | </dest> | 10230 | </dest> |
10231 | <voice> | 10231 | <voice> |
10232 | *: none | 10232 | *: none |
10233 | button_light: "" | 10233 | button_light: "" |
10234 | e200*: "" | 10234 | fuze,e200*: "" |
10235 | </voice> | 10235 | </voice> |
10236 | </phrase> | 10236 | </phrase> |
10237 | <phrase> | 10237 | <phrase> |
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang index ae60e44e98..f4ccec9408 100644 --- a/apps/lang/catala.lang +++ b/apps/lang/catala.lang | |||
@@ -3828,17 +3828,17 @@ | |||
3828 | <source> | 3828 | <source> |
3829 | *: none | 3829 | *: none |
3830 | button_light: "Button Light Timeout" | 3830 | button_light: "Button Light Timeout" |
3831 | e200*: "Wheel Light Timeout" | 3831 | fuze,e200*: "Wheel Light Timeout" |
3832 | </source> | 3832 | </source> |
3833 | <dest> | 3833 | <dest> |
3834 | *: none | 3834 | *: none |
3835 | button_light: "Apagat de llum de botons" | 3835 | button_light: "Apagat de llum de botons" |
3836 | e200*: "Apagat de llum de roda" | 3836 | fuze,e200*: "Apagat de llum de roda" |
3837 | </dest> | 3837 | </dest> |
3838 | <voice> | 3838 | <voice> |
3839 | *: none | 3839 | *: none |
3840 | button_light: "Apagat de llum de botons" | 3840 | button_light: "Apagat de llum de botons" |
3841 | e200*: "Apagat de llum de roda" | 3841 | fuze,e200*: "Apagat de llum de roda" |
3842 | </voice> | 3842 | </voice> |
3843 | </phrase> | 3843 | </phrase> |
3844 | <phrase> | 3844 | <phrase> |
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang index eee223ef07..dcaedd8ac0 100644 --- a/apps/lang/chinese-simp.lang +++ b/apps/lang/chinese-simp.lang | |||
@@ -10687,17 +10687,17 @@ | |||
10687 | <source> | 10687 | <source> |
10688 | *: none | 10688 | *: none |
10689 | button_light: "Button Light Timeout" | 10689 | button_light: "Button Light Timeout" |
10690 | e200*: "Wheel Light Timeout" | 10690 | fuze,e200*: "Wheel Light Timeout" |
10691 | </source> | 10691 | </source> |
10692 | <dest> | 10692 | <dest> |
10693 | *: none | 10693 | *: none |
10694 | button_light: "按键背光自动关闭时滞" | 10694 | button_light: "按键背光自动关闭时滞" |
10695 | e200*: "转盘背光自动关闭时滞" | 10695 | fuze,e200*: "转盘背光自动关闭时滞" |
10696 | </dest> | 10696 | </dest> |
10697 | <voice> | 10697 | <voice> |
10698 | *: none | 10698 | *: none |
10699 | button_light: "按键背光自动关闭时滞" | 10699 | button_light: "按键背光自动关闭时滞" |
10700 | e200*: "转盘背光自动关闭时滞" | 10700 | fuze,e200*: "转盘背光自动关闭时滞" |
10701 | </voice> | 10701 | </voice> |
10702 | </phrase> | 10702 | </phrase> |
10703 | <phrase> | 10703 | <phrase> |
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang index 153f368b6a..3c5b3d9ecc 100644 --- a/apps/lang/chinese-trad.lang +++ b/apps/lang/chinese-trad.lang | |||
@@ -10704,15 +10704,15 @@ | |||
10704 | user: | 10704 | user: |
10705 | <source> | 10705 | <source> |
10706 | *: none | 10706 | *: none |
10707 | e200*: "Wheel Light Timeout" | 10707 | fuze,e200*: "Wheel Light Timeout" |
10708 | </source> | 10708 | </source> |
10709 | <dest> | 10709 | <dest> |
10710 | *: none | 10710 | *: none |
10711 | e200*: "轉盤燈自動關時間" | 10711 | fuze,e200*: "轉盤燈自動關時間" |
10712 | </dest> | 10712 | </dest> |
10713 | <voice> | 10713 | <voice> |
10714 | *: none | 10714 | *: none |
10715 | e200*: "Wheel Light Timeout" | 10715 | fuze,e200*: "Wheel Light Timeout" |
10716 | </voice> | 10716 | </voice> |
10717 | </phrase> | 10717 | </phrase> |
10718 | <phrase> | 10718 | <phrase> |
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang index c852813a11..db023d44e0 100644 --- a/apps/lang/czech.lang +++ b/apps/lang/czech.lang | |||
@@ -3835,15 +3835,15 @@ | |||
3835 | user: | 3835 | user: |
3836 | <source> | 3836 | <source> |
3837 | *: none | 3837 | *: none |
3838 | e200*: "Wheel Light Timeout" | 3838 | fuze,e200*: "Wheel Light Timeout" |
3839 | </source> | 3839 | </source> |
3840 | <dest> | 3840 | <dest> |
3841 | *: none | 3841 | *: none |
3842 | e200*: "Časový limit osvětlení kolečka" | 3842 | fuze,e200*: "Časový limit osvětlení kolečka" |
3843 | </dest> | 3843 | </dest> |
3844 | <voice> | 3844 | <voice> |
3845 | *: none | 3845 | *: none |
3846 | e200*: "Časový limit osvětlení kolečka" | 3846 | fuze,e200*: "Časový limit osvětlení kolečka" |
3847 | </voice> | 3847 | </voice> |
3848 | </phrase> | 3848 | </phrase> |
3849 | <phrase> | 3849 | <phrase> |
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang index bd201da686..c96c6b4046 100644 --- a/apps/lang/dansk.lang +++ b/apps/lang/dansk.lang | |||
@@ -9933,17 +9933,17 @@ | |||
9933 | <source> | 9933 | <source> |
9934 | *: none | 9934 | *: none |
9935 | button_light: "Button Light Timeout" | 9935 | button_light: "Button Light Timeout" |
9936 | e200*: "Wheel Light Timeout" | 9936 | fuze,e200*: "Wheel Light Timeout" |
9937 | </source> | 9937 | </source> |
9938 | <dest> | 9938 | <dest> |
9939 | *: none | 9939 | *: none |
9940 | button_light: "Knap-lys sluk" | 9940 | button_light: "Knap-lys sluk" |
9941 | e200*: "Hjul-lys sluk" | 9941 | fuze,e200*: "Hjul-lys sluk" |
9942 | </dest> | 9942 | </dest> |
9943 | <voice> | 9943 | <voice> |
9944 | *: none | 9944 | *: none |
9945 | button_light: "Knap-lys sluk" | 9945 | button_light: "Knap-lys sluk" |
9946 | e200*: "Hjul-lys sluk" | 9946 | fuze,e200*: "Hjul-lys sluk" |
9947 | </voice> | 9947 | </voice> |
9948 | </phrase> | 9948 | </phrase> |
9949 | <phrase> | 9949 | <phrase> |
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index b05342d4c7..fb3ef520ec 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang | |||
@@ -3850,17 +3850,17 @@ | |||
3850 | <source> | 3850 | <source> |
3851 | *: none | 3851 | *: none |
3852 | button_light: "Button Light Timeout" | 3852 | button_light: "Button Light Timeout" |
3853 | e200*: "Wheel Light Timeout" | 3853 | fuze,e200*: "Wheel Light Timeout" |
3854 | </source> | 3854 | </source> |
3855 | <dest> | 3855 | <dest> |
3856 | *: none | 3856 | *: none |
3857 | button_light: "Tastenbeleuchtungsdauer" | 3857 | button_light: "Tastenbeleuchtungsdauer" |
3858 | e200*: "Scrollradbeleuchtungsdauer" | 3858 | fuze,e200*: "Scrollradbeleuchtungsdauer" |
3859 | </dest> | 3859 | </dest> |
3860 | <voice> | 3860 | <voice> |
3861 | *: none | 3861 | *: none |
3862 | button_light: "Tastenbeleuchtungsdauer" | 3862 | button_light: "Tastenbeleuchtungsdauer" |
3863 | e200*: "Scrollradbeleuchtungsdauer" | 3863 | fuze,e200*: "Scrollradbeleuchtungsdauer" |
3864 | </voice> | 3864 | </voice> |
3865 | </phrase> | 3865 | </phrase> |
3866 | <phrase> | 3866 | <phrase> |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 6b8e0850a4..a7b5ef72ed 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3924,17 +3924,17 @@ | |||
3924 | <source> | 3924 | <source> |
3925 | *: none | 3925 | *: none |
3926 | button_light: "Button Light Timeout" | 3926 | button_light: "Button Light Timeout" |
3927 | e200*: "Wheel Light Timeout" | 3927 | fuze,e200*: "Wheel Light Timeout" |
3928 | </source> | 3928 | </source> |
3929 | <dest> | 3929 | <dest> |
3930 | *: none | 3930 | *: none |
3931 | button_light: "Button Light Timeout" | 3931 | button_light: "Button Light Timeout" |
3932 | e200*: "Wheel Light Timeout" | 3932 | fuze,e200*: "Wheel Light Timeout" |
3933 | </dest> | 3933 | </dest> |
3934 | <voice> | 3934 | <voice> |
3935 | *: none | 3935 | *: none |
3936 | button_light: "Button Light Timeout" | 3936 | button_light: "Button Light Timeout" |
3937 | e200*: "Wheel Light Timeout" | 3937 | fuze,e200*: "Wheel Light Timeout" |
3938 | </voice> | 3938 | </voice> |
3939 | </phrase> | 3939 | </phrase> |
3940 | <phrase> | 3940 | <phrase> |
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang index 365c635da2..8afa06239a 100644 --- a/apps/lang/espanol.lang +++ b/apps/lang/espanol.lang | |||
@@ -11181,17 +11181,17 @@ | |||
11181 | <source> | 11181 | <source> |
11182 | *: none | 11182 | *: none |
11183 | button_light: "Button Light Timeout" | 11183 | button_light: "Button Light Timeout" |
11184 | e200*: "Wheel Light Timeout" | 11184 | fuze,e200*: "Wheel Light Timeout" |
11185 | </source> | 11185 | </source> |
11186 | <dest> | 11186 | <dest> |
11187 | *: none | 11187 | *: none |
11188 | button_light: "Tiempo de espera en la luz del botón" | 11188 | button_light: "Tiempo de espera en la luz del botón" |
11189 | e200*: "Tiempo de espera en la luz de la rueda" | 11189 | fuze,e200*: "Tiempo de espera en la luz de la rueda" |
11190 | </dest> | 11190 | </dest> |
11191 | <voice> | 11191 | <voice> |
11192 | *: none | 11192 | *: none |
11193 | button_light: "Tiempo de espera en la luz del botón" | 11193 | button_light: "Tiempo de espera en la luz del botón" |
11194 | e200*: "Tiempo de espera en la luz de la rueda" | 11194 | fuze,e200*: "Tiempo de espera en la luz de la rueda" |
11195 | </voice> | 11195 | </voice> |
11196 | </phrase> | 11196 | </phrase> |
11197 | <phrase> | 11197 | <phrase> |
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang index 267f0d3930..2754970634 100644 --- a/apps/lang/finnish.lang +++ b/apps/lang/finnish.lang | |||
@@ -9974,17 +9974,17 @@ | |||
9974 | <source> | 9974 | <source> |
9975 | *: none | 9975 | *: none |
9976 | button_light: "Button Light Timeout" | 9976 | button_light: "Button Light Timeout" |
9977 | e200*: "Wheel Light Timeout" | 9977 | fuze,e200*: "Wheel Light Timeout" |
9978 | </source> | 9978 | </source> |
9979 | <dest> | 9979 | <dest> |
9980 | *: none | 9980 | *: none |
9981 | button_light: "Painikevalon aikakatkaisu" | 9981 | button_light: "Painikevalon aikakatkaisu" |
9982 | e200*: "Rullavalon aikakatkaisu" | 9982 | fuze,e200*: "Rullavalon aikakatkaisu" |
9983 | </dest> | 9983 | </dest> |
9984 | <voice> | 9984 | <voice> |
9985 | *: none | 9985 | *: none |
9986 | button_light: "Painikevalon aikakatkaisu" | 9986 | button_light: "Painikevalon aikakatkaisu" |
9987 | e200*: "Rullavalon aikakatkaisu" | 9987 | fuze,e200*: "Rullavalon aikakatkaisu" |
9988 | </voice> | 9988 | </voice> |
9989 | </phrase> | 9989 | </phrase> |
9990 | <phrase> | 9990 | <phrase> |
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang index ba6a456817..56d95ce9a4 100644 --- a/apps/lang/francais.lang +++ b/apps/lang/francais.lang | |||
@@ -3880,17 +3880,17 @@ | |||
3880 | <source> | 3880 | <source> |
3881 | *: none | 3881 | *: none |
3882 | button_light: "Button Light Timeout" | 3882 | button_light: "Button Light Timeout" |
3883 | e200*: "Wheel Light Timeout" | 3883 | fuze,e200*: "Wheel Light Timeout" |
3884 | </source> | 3884 | </source> |
3885 | <dest> | 3885 | <dest> |
3886 | *: none | 3886 | *: none |
3887 | button_light: "Durée de l'éclairage des touches" | 3887 | button_light: "Durée de l'éclairage des touches" |
3888 | e200*: "Durée de l'éclairage de la molette" | 3888 | fuze,e200*: "Durée de l'éclairage de la molette" |
3889 | </dest> | 3889 | </dest> |
3890 | <voice> | 3890 | <voice> |
3891 | *: none | 3891 | *: none |
3892 | button_light: "Durée de l'éclairage des touches" | 3892 | button_light: "Durée de l'éclairage des touches" |
3893 | e200*: "Durée de l'éclairage de la molette" | 3893 | fuze,e200*: "Durée de l'éclairage de la molette" |
3894 | </voice> | 3894 | </voice> |
3895 | </phrase> | 3895 | </phrase> |
3896 | <phrase> | 3896 | <phrase> |
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang index c5ba1f23e5..032f648f17 100644 --- a/apps/lang/greek.lang +++ b/apps/lang/greek.lang | |||
@@ -3838,17 +3838,17 @@ | |||
3838 | <source> | 3838 | <source> |
3839 | *: none | 3839 | *: none |
3840 | button_light: "Button Light Timeout" | 3840 | button_light: "Button Light Timeout" |
3841 | e200*: "Wheel Light Timeout" | 3841 | fuze,e200*: "Wheel Light Timeout" |
3842 | </source> | 3842 | </source> |
3843 | <dest> | 3843 | <dest> |
3844 | *: none | 3844 | *: none |
3845 | button_light: "Χρόνος σβησίματος πλήκτρων" | 3845 | button_light: "Χρόνος σβησίματος πλήκτρων" |
3846 | e200*: "Χρόνος σβησίματος τροχού" | 3846 | fuze,e200*: "Χρόνος σβησίματος τροχού" |
3847 | </dest> | 3847 | </dest> |
3848 | <voice> | 3848 | <voice> |
3849 | *: none | 3849 | *: none |
3850 | button_light: "Χρόνος σβησίματος πλήκτρων" | 3850 | button_light: "Χρόνος σβησίματος πλήκτρων" |
3851 | e200*: "Χρόνος σβησίματος τροχού" | 3851 | fuze,e200*: "Χρόνος σβησίματος τροχού" |
3852 | </voice> | 3852 | </voice> |
3853 | </phrase> | 3853 | </phrase> |
3854 | <phrase> | 3854 | <phrase> |
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang index b33c081a14..b8e67ad51d 100644 --- a/apps/lang/hebrew.lang +++ b/apps/lang/hebrew.lang | |||
@@ -3832,17 +3832,17 @@ | |||
3832 | <source> | 3832 | <source> |
3833 | *: none | 3833 | *: none |
3834 | button_light: "Button Light Timeout" | 3834 | button_light: "Button Light Timeout" |
3835 | e200*: "Wheel Light Timeout" | 3835 | fuze,e200*: "Wheel Light Timeout" |
3836 | </source> | 3836 | </source> |
3837 | <dest> | 3837 | <dest> |
3838 | *: none | 3838 | *: none |
3839 | button_light: "זמן תאורת כפתור" | 3839 | button_light: "זמן תאורת כפתור" |
3840 | e200*: "זמן תאורת הגלגל" | 3840 | fuze,e200*: "זמן תאורת הגלגל" |
3841 | </dest> | 3841 | </dest> |
3842 | <voice> | 3842 | <voice> |
3843 | *: none | 3843 | *: none |
3844 | button_light: "Button Light Timeout" | 3844 | button_light: "Button Light Timeout" |
3845 | e200*: "Wheel Light Timeout" | 3845 | fuze,e200*: "Wheel Light Timeout" |
3846 | </voice> | 3846 | </voice> |
3847 | </phrase> | 3847 | </phrase> |
3848 | <phrase> | 3848 | <phrase> |
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index 38daa868a7..22e88b263f 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang | |||
@@ -3853,17 +3853,17 @@ | |||
3853 | <source> | 3853 | <source> |
3854 | *: none | 3854 | *: none |
3855 | button_light: "Button Light Timeout" | 3855 | button_light: "Button Light Timeout" |
3856 | e200*: "Wheel Light Timeout" | 3856 | fuze,e200*: "Wheel Light Timeout" |
3857 | </source> | 3857 | </source> |
3858 | <dest> | 3858 | <dest> |
3859 | *: none | 3859 | *: none |
3860 | button_light: "Tempo di spegnimento illuminazione tasti" | 3860 | button_light: "Tempo di spegnimento illuminazione tasti" |
3861 | e200*: "Tempo di spegnimento illuminazione rotella" | 3861 | fuze,e200*: "Tempo di spegnimento illuminazione rotella" |
3862 | </dest> | 3862 | </dest> |
3863 | <voice> | 3863 | <voice> |
3864 | *: none | 3864 | *: none |
3865 | button_light: "Tempo di spegnimento illuminazione tasti" | 3865 | button_light: "Tempo di spegnimento illuminazione tasti" |
3866 | e200*: "Tempo di spegnimento illuminazione rotella" | 3866 | fuze,e200*: "Tempo di spegnimento illuminazione rotella" |
3867 | </voice> | 3867 | </voice> |
3868 | </phrase> | 3868 | </phrase> |
3869 | <phrase> | 3869 | <phrase> |
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang index 7eee5026db..f190c9bf95 100644 --- a/apps/lang/japanese.lang +++ b/apps/lang/japanese.lang | |||
@@ -3834,17 +3834,17 @@ | |||
3834 | <source> | 3834 | <source> |
3835 | *: none | 3835 | *: none |
3836 | button_light: "Button Light Timeout" | 3836 | button_light: "Button Light Timeout" |
3837 | e200*: "Wheel Light Timeout" | 3837 | fuze,e200*: "Wheel Light Timeout" |
3838 | </source> | 3838 | </source> |
3839 | <dest> | 3839 | <dest> |
3840 | *: none | 3840 | *: none |
3841 | button_light: "ボタンライトのタイムアウト" | 3841 | button_light: "ボタンライトのタイムアウト" |
3842 | e200*: "ホイールライトのタイムアウト" | 3842 | fuze,e200*: "ホイールライトのタイムアウト" |
3843 | </dest> | 3843 | </dest> |
3844 | <voice> | 3844 | <voice> |
3845 | *: none | 3845 | *: none |
3846 | button_light: "ボタンライトのタイムアウト" | 3846 | button_light: "ボタンライトのタイムアウト" |
3847 | e200*: "ホイールライトのタイムアウト" | 3847 | fuze,e200*: "ホイールライトのタイムアウト" |
3848 | </voice> | 3848 | </voice> |
3849 | </phrase> | 3849 | </phrase> |
3850 | <phrase> | 3850 | <phrase> |
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang index c381c74510..f652efff67 100644 --- a/apps/lang/magyar.lang +++ b/apps/lang/magyar.lang | |||
@@ -3826,18 +3826,18 @@ | |||
3826 | user: | 3826 | user: |
3827 | <source> | 3827 | <source> |
3828 | *: none | 3828 | *: none |
3829 | e200*: "Wheel Light Timeout" | 3829 | button_light: "Button Light Timeout" |
3830 | clip,c200,gigabeatf,mrobe100: "Button Light Timeout" | 3830 | fuze,e200*: "Wheel Light Timeout" |
3831 | </source> | 3831 | </source> |
3832 | <dest> | 3832 | <dest> |
3833 | *: none | 3833 | *: none |
3834 | e200*: "Kerék világításának hossza" | 3834 | button_light: "Gomb világításának hossza" |
3835 | clip,c200,gigabeatf,mrobe100: "Gomb világításának hossza" | 3835 | fuze,e200*: "Kerék világításának hossza" |
3836 | </dest> | 3836 | </dest> |
3837 | <voice> | 3837 | <voice> |
3838 | *: none | 3838 | *: none |
3839 | e200*: "Wheel Light Timeout" | 3839 | button_light: "Button Light Timeout" |
3840 | clip,c200,gigabeatf,mrobe100: "Button Light Timeout" | 3840 | fuze,e200*: "Wheel Light Timeout" |
3841 | </voice> | 3841 | </voice> |
3842 | </phrase> | 3842 | </phrase> |
3843 | <phrase> | 3843 | <phrase> |
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index 98738c8fe5..faab19376a 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang | |||
@@ -10276,17 +10276,17 @@ | |||
10276 | <source> | 10276 | <source> |
10277 | *: none | 10277 | *: none |
10278 | button_light: "Button Light Timeout" | 10278 | button_light: "Button Light Timeout" |
10279 | e200*: "Wheel Light Timeout" | 10279 | fuze,e200*: "Wheel Light Timeout" |
10280 | </source> | 10280 | </source> |
10281 | <dest> | 10281 | <dest> |
10282 | *: none | 10282 | *: none |
10283 | button_light: "Knoppen Licht Vertraging" | 10283 | button_light: "Knoppen Licht Vertraging" |
10284 | e200*: "Wiel Licht Vertraging" | 10284 | fuze,e200*: "Wiel Licht Vertraging" |
10285 | </dest> | 10285 | </dest> |
10286 | <voice> | 10286 | <voice> |
10287 | *: none | 10287 | *: none |
10288 | button_light: "Knoppen Licht Vertraging" | 10288 | button_light: "Knoppen Licht Vertraging" |
10289 | e200*: "Wiel Licht Vertraging" | 10289 | fuze,e200*: "Wiel Licht Vertraging" |
10290 | </voice> | 10290 | </voice> |
10291 | </phrase> | 10291 | </phrase> |
10292 | <phrase> | 10292 | <phrase> |
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang index 41bae369fd..bb0add89fd 100644 --- a/apps/lang/norsk-nynorsk.lang +++ b/apps/lang/norsk-nynorsk.lang | |||
@@ -9871,17 +9871,17 @@ | |||
9871 | <source> | 9871 | <source> |
9872 | *: none | 9872 | *: none |
9873 | button_light: "Button Light Timeout" | 9873 | button_light: "Button Light Timeout" |
9874 | e200*: "Wheel Light Timeout" | 9874 | fuze,e200*: "Wheel Light Timeout" |
9875 | </source> | 9875 | </source> |
9876 | <dest> | 9876 | <dest> |
9877 | *: none | 9877 | *: none |
9878 | button_light: "Avbrotstid for knappelys" | 9878 | button_light: "Avbrotstid for knappelys" |
9879 | e200*: "Avbrotstid for hjullys" | 9879 | fuze,e200*: "Avbrotstid for hjullys" |
9880 | </dest> | 9880 | </dest> |
9881 | <voice> | 9881 | <voice> |
9882 | *: none | 9882 | *: none |
9883 | button_light: "Avbrotstid for knappelys" | 9883 | button_light: "Avbrotstid for knappelys" |
9884 | e200*: "Avbrotstid for hjullys" | 9884 | fuze,e200*: "Avbrotstid for hjullys" |
9885 | </voice> | 9885 | </voice> |
9886 | </phrase> | 9886 | </phrase> |
9887 | <phrase> | 9887 | <phrase> |
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index e4027e6f2f..ee366360fe 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang | |||
@@ -10023,17 +10023,17 @@ | |||
10023 | <source> | 10023 | <source> |
10024 | *: none | 10024 | *: none |
10025 | button_light: "Button Light Timeout" | 10025 | button_light: "Button Light Timeout" |
10026 | e200*: "Wheel Light Timeout" | 10026 | fuze,e200*: "Wheel Light Timeout" |
10027 | </source> | 10027 | </source> |
10028 | <dest> | 10028 | <dest> |
10029 | *: none | 10029 | *: none |
10030 | button_light: "Slukketid for knapplys" | 10030 | button_light: "Slukketid for knapplys" |
10031 | e200*: "Slukketid for hjullys" | 10031 | fuze,e200*: "Slukketid for hjullys" |
10032 | </dest> | 10032 | </dest> |
10033 | <voice> | 10033 | <voice> |
10034 | *: none | 10034 | *: none |
10035 | button_light: "Tid før lys på knapper slukker" | 10035 | button_light: "Tid før lys på knapper slukker" |
10036 | e200*: "Tid før lys på hjul slukker" | 10036 | fuze,e200*: "Tid før lys på hjul slukker" |
10037 | </voice> | 10037 | </voice> |
10038 | </phrase> | 10038 | </phrase> |
10039 | <phrase> | 10039 | <phrase> |
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang index f2e1ae1855..ee426df897 100644 --- a/apps/lang/polski.lang +++ b/apps/lang/polski.lang | |||
@@ -3841,17 +3841,17 @@ | |||
3841 | <source> | 3841 | <source> |
3842 | *: none | 3842 | *: none |
3843 | button_light: "Button Light Timeout" | 3843 | button_light: "Button Light Timeout" |
3844 | e200*: "Wheel Light Timeout" | 3844 | fuze,e200*: "Wheel Light Timeout" |
3845 | </source> | 3845 | </source> |
3846 | <dest> | 3846 | <dest> |
3847 | *: none | 3847 | *: none |
3848 | button_light: "Wygaszanie klawiszy" | 3848 | button_light: "Wygaszanie klawiszy" |
3849 | e200*: "Wygaszanie koła sterującego" | 3849 | fuze,e200*: "Wygaszanie koła sterującego" |
3850 | </dest> | 3850 | </dest> |
3851 | <voice> | 3851 | <voice> |
3852 | *: none | 3852 | *: none |
3853 | button_light: "Wygaszanie klawiszy" | 3853 | button_light: "Wygaszanie klawiszy" |
3854 | e200*: "Wygaszanie koła sterującego" | 3854 | fuze,e200*: "Wygaszanie koła sterującego" |
3855 | </voice> | 3855 | </voice> |
3856 | </phrase> | 3856 | </phrase> |
3857 | <phrase> | 3857 | <phrase> |
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang index c1e256bdb7..82cec23368 100644 --- a/apps/lang/portugues-brasileiro.lang +++ b/apps/lang/portugues-brasileiro.lang | |||
@@ -3851,17 +3851,17 @@ | |||
3851 | <source> | 3851 | <source> |
3852 | *: none | 3852 | *: none |
3853 | button_light: "Button Light Timeout" | 3853 | button_light: "Button Light Timeout" |
3854 | e200*: "Wheel Light Timeout" | 3854 | fuze,e200*: "Wheel Light Timeout" |
3855 | </source> | 3855 | </source> |
3856 | <dest> | 3856 | <dest> |
3857 | *: none | 3857 | *: none |
3858 | button_light: "Duração da Luz do Botão" | 3858 | button_light: "Duração da Luz do Botão" |
3859 | e200*: "Duração da Luz da Roda" | 3859 | fuze,e200*: "Duração da Luz da Roda" |
3860 | </dest> | 3860 | </dest> |
3861 | <voice> | 3861 | <voice> |
3862 | *: none | 3862 | *: none |
3863 | button_light: "Duração da Luz do Botão" | 3863 | button_light: "Duração da Luz do Botão" |
3864 | e200*: "Duração da Luz da Roda" | 3864 | fuze,e200*: "Duração da Luz da Roda" |
3865 | </voice> | 3865 | </voice> |
3866 | </phrase> | 3866 | </phrase> |
3867 | <phrase> | 3867 | <phrase> |
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang index f0b63543a1..322dc115cb 100644 --- a/apps/lang/romaneste.lang +++ b/apps/lang/romaneste.lang | |||
@@ -10303,17 +10303,17 @@ | |||
10303 | <source> | 10303 | <source> |
10304 | *: none | 10304 | *: none |
10305 | button_light: "Button Light Timeout" | 10305 | button_light: "Button Light Timeout" |
10306 | e200*: "Wheel Light Timeout" | 10306 | fuze,e200*: "Wheel Light Timeout" |
10307 | </source> | 10307 | </source> |
10308 | <dest> | 10308 | <dest> |
10309 | *: none | 10309 | *: none |
10310 | button_light: "Timp iluminare butoane" | 10310 | button_light: "Timp iluminare butoane" |
10311 | e200*: "Timp iluminare rotita" | 10311 | fuze,e200*: "Timp iluminare rotita" |
10312 | </dest> | 10312 | </dest> |
10313 | <voice> | 10313 | <voice> |
10314 | *: none | 10314 | *: none |
10315 | button_light: "Timp iluminare butoane" | 10315 | button_light: "Timp iluminare butoane" |
10316 | e200*: "Timp iluminare rotita" | 10316 | fuze,e200*: "Timp iluminare rotita" |
10317 | </voice> | 10317 | </voice> |
10318 | </phrase> | 10318 | </phrase> |
10319 | <phrase> | 10319 | <phrase> |
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index 5f2f265b7b..e489503d17 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang | |||
@@ -10945,17 +10945,17 @@ | |||
10945 | <source> | 10945 | <source> |
10946 | *: none | 10946 | *: none |
10947 | button_light: "Button Light Timeout" | 10947 | button_light: "Button Light Timeout" |
10948 | e200*: "Wheel Light Timeout" | 10948 | fuze,e200*: "Wheel Light Timeout" |
10949 | </source> | 10949 | </source> |
10950 | <dest> | 10950 | <dest> |
10951 | *: none | 10951 | *: none |
10952 | button_light: "Таймаут подсветки клавиш" | 10952 | button_light: "Таймаут подсветки клавиш" |
10953 | e200*: "Таймаут подсветки колёсика" | 10953 | fuze,e200*: "Таймаут подсветки колёсика" |
10954 | </dest> | 10954 | </dest> |
10955 | <voice> | 10955 | <voice> |
10956 | *: none | 10956 | *: none |
10957 | button_light: "Таймаут подсветки клавиш" | 10957 | button_light: "Таймаут подсветки клавиш" |
10958 | e200*: "Таймаут подсветки колёсика" | 10958 | fuze,e200*: "Таймаут подсветки колёсика" |
10959 | </voice> | 10959 | </voice> |
10960 | </phrase> | 10960 | </phrase> |
10961 | <phrase> | 10961 | <phrase> |
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang index d779dd9f41..03312ecf3e 100644 --- a/apps/lang/svenska.lang +++ b/apps/lang/svenska.lang | |||
@@ -3852,17 +3852,17 @@ | |||
3852 | <source> | 3852 | <source> |
3853 | *: none | 3853 | *: none |
3854 | button_light: "Button Light Timeout" | 3854 | button_light: "Button Light Timeout" |
3855 | e200*: "Wheel Light Timeout" | 3855 | fuze,e200*: "Wheel Light Timeout" |
3856 | </source> | 3856 | </source> |
3857 | <dest> | 3857 | <dest> |
3858 | *: none | 3858 | *: none |
3859 | button_light: "Knappbelysning" | 3859 | button_light: "Knappbelysning" |
3860 | e200*: "Hjulbelysning" | 3860 | fuze,e200*: "Hjulbelysning" |
3861 | </dest> | 3861 | </dest> |
3862 | <voice> | 3862 | <voice> |
3863 | *: none | 3863 | *: none |
3864 | button_light: "Knappbelysning" | 3864 | button_light: "Knappbelysning" |
3865 | e200*: "Hjulbelysning" | 3865 | fuze,e200*: "Hjulbelysning" |
3866 | </voice> | 3866 | </voice> |
3867 | </phrase> | 3867 | </phrase> |
3868 | <phrase> | 3868 | <phrase> |
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang index 17c85ac68d..103afdf1f5 100644 --- a/apps/lang/tagalog.lang +++ b/apps/lang/tagalog.lang | |||
@@ -3841,17 +3841,17 @@ | |||
3841 | <source> | 3841 | <source> |
3842 | *: none | 3842 | *: none |
3843 | button_light: "Button Light Timeout" | 3843 | button_light: "Button Light Timeout" |
3844 | e200*: "Wheel Light Timeout" | 3844 | fuze,e200*: "Wheel Light Timeout" |
3845 | </source> | 3845 | </source> |
3846 | <dest> | 3846 | <dest> |
3847 | *: none | 3847 | *: none |
3848 | button_light: "Pahintuin buttones sa ilaw" | 3848 | button_light: "Pahintuin buttones sa ilaw" |
3849 | e200*: "Pahintuin gulong sa ilaw" | 3849 | fuze,e200*: "Pahintuin gulong sa ilaw" |
3850 | </dest> | 3850 | </dest> |
3851 | <voice> | 3851 | <voice> |
3852 | *: none | 3852 | *: none |
3853 | button_light: "" | 3853 | button_light: "" |
3854 | e200*: "Wheel Light Timeout" | 3854 | fuze,e200*: "Wheel Light Timeout" |
3855 | </voice> | 3855 | </voice> |
3856 | </phrase> | 3856 | </phrase> |
3857 | <phrase> | 3857 | <phrase> |
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang index 2d13ffa09e..a8d1a6f407 100644 --- a/apps/lang/thai.lang +++ b/apps/lang/thai.lang | |||
@@ -3834,15 +3834,15 @@ | |||
3834 | user: | 3834 | user: |
3835 | <source> | 3835 | <source> |
3836 | *: none | 3836 | *: none |
3837 | e200*: "Wheel Light Timeout" | 3837 | fuze,e200*: "Wheel Light Timeout" |
3838 | </source> | 3838 | </source> |
3839 | <dest> | 3839 | <dest> |
3840 | *: none | 3840 | *: none |
3841 | e200*: "เวลาเปิดไฟล้อหมุน" | 3841 | fuze,e200*: "เวลาเปิดไฟล้อหมุน" |
3842 | </dest> | 3842 | </dest> |
3843 | <voice> | 3843 | <voice> |
3844 | *: none | 3844 | *: none |
3845 | e200*: "Wheel Light Timeout" | 3845 | fuze,e200*: "Wheel Light Timeout" |
3846 | </voice> | 3846 | </voice> |
3847 | </phrase> | 3847 | </phrase> |
3848 | <phrase> | 3848 | <phrase> |
diff --git a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h index db2cecc07a..ddaa7f2094 100644 --- a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h | |||
@@ -26,7 +26,8 @@ void _backlight_on(void); | |||
26 | void _backlight_off(void); | 26 | void _backlight_off(void); |
27 | void _backlight_set_brightness(int brightness); | 27 | void _backlight_set_brightness(int brightness); |
28 | int __backlight_is_on(void); | 28 | int __backlight_is_on(void); |
29 | 29 | #ifdef HAVE_BUTTON_LIGHT | |
30 | void _buttonlight_on(void); | 30 | void _buttonlight_on(void); |
31 | void _buttonlight_off(void); | 31 | void _buttonlight_off(void); |
32 | #endif | 32 | #endif |
33 | #endif | ||
diff --git a/firmware/target/arm/as3525/sansa-fuze/button-target.h b/firmware/target/arm/as3525/sansa-fuze/button-target.h index c818c602d0..be72e1a35e 100644 --- a/firmware/target/arm/as3525/sansa-fuze/button-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/button-target.h | |||
@@ -37,12 +37,12 @@ void button_int(void); | |||
37 | 37 | ||
38 | /* Sandisk Sansa Fuze button codes */ | 38 | /* Sandisk Sansa Fuze button codes */ |
39 | 39 | ||
40 | /* TODO: These are just a copy of the E200 */ | ||
41 | |||
42 | /* Main unit's buttons */ | 40 | /* Main unit's buttons */ |
43 | #define BUTTON_REC 0x00000001 | 41 | #define BUTTON_HOME 0x00000001 |
42 | |||
44 | #define BUTTON_DOWN 0x00000002 | 43 | #define BUTTON_DOWN 0x00000002 |
45 | #define BUTTON_RIGHT 0x00000004 | 44 | #define BUTTON_RIGHT 0x00000004 |
45 | |||
46 | #define BUTTON_LEFT 0x00000008 | 46 | #define BUTTON_LEFT 0x00000008 |
47 | #define BUTTON_SELECT 0x00000010 | 47 | #define BUTTON_SELECT 0x00000010 |
48 | #define BUTTON_UP 0x00000020 | 48 | #define BUTTON_UP 0x00000020 |
@@ -51,7 +51,11 @@ void button_int(void); | |||
51 | #define BUTTON_SCROLL_BACK 0x00000080 | 51 | #define BUTTON_SCROLL_BACK 0x00000080 |
52 | #define BUTTON_SCROLL_FWD 0x00000100 | 52 | #define BUTTON_SCROLL_FWD 0x00000100 |
53 | 53 | ||
54 | #define BUTTON_MAIN 0x00000fff | 54 | #define BUTTON_HOLD 0x00000200 |
55 | |||
56 | #define BUTTON_MAIN (BUTTON_HOME|BUTTON_DOWN|BUTTON_RIGHT|BUTTON_LEFT \ | ||
57 | |BUTTON_SELECT|BUTTON_UP|BUTTON_POWER \ | ||
58 | |BUTTON_SCROLLBACK|BUTTON_SCROLL_FWD|BUTTON_HOLD) | ||
55 | 59 | ||
56 | /* No Remote control */ | 60 | /* No Remote control */ |
57 | #define BUTTON_REMOTE 0 | 61 | #define BUTTON_REMOTE 0 |
diff --git a/tools/configure b/tools/configure index 244a29d84c..42015df145 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1751,7 +1751,7 @@ fi | |||
1751 | output="rockbox.sansa" | 1751 | output="rockbox.sansa" |
1752 | bootoutput="bootloader-fuze.sansa" | 1752 | bootoutput="bootloader-fuze.sansa" |
1753 | appextra="recorder:gui" | 1753 | appextra="recorder:gui" |
1754 | plugins="yes" | 1754 | plugins="" |
1755 | swcodec="yes" | 1755 | swcodec="yes" |
1756 | toolset=$scramblebitmaptools | 1756 | toolset=$scramblebitmaptools |
1757 | t_cpu="arm" | 1757 | t_cpu="arm" |
diff --git a/uisimulator/sdl/UI-fuze.bmp b/uisimulator/sdl/UI-fuze.bmp new file mode 100644 index 0000000000..02b07b61ba --- /dev/null +++ b/uisimulator/sdl/UI-fuze.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 840a599aac..614308a070 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -950,7 +950,43 @@ void button_event(int key, bool pressed) | |||
950 | case SDLK_SPACE: | 950 | case SDLK_SPACE: |
951 | new_btn = BUTTON_SELECT; | 951 | new_btn = BUTTON_SELECT; |
952 | break; | 952 | break; |
953 | 953 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | |
954 | case SDLK_KP4: | ||
955 | case SDLK_LEFT: | ||
956 | new_btn = BUTTON_LEFT; | ||
957 | break; | ||
958 | case SDLK_KP6: | ||
959 | case SDLK_RIGHT: | ||
960 | new_btn = BUTTON_RIGHT; | ||
961 | break; | ||
962 | case SDLK_KP8: | ||
963 | case SDLK_UP: | ||
964 | new_btn = BUTTON_SCROLL_BACK; | ||
965 | break; | ||
966 | case SDLK_KP2: | ||
967 | case SDLK_DOWN: | ||
968 | new_btn = BUTTON_SCROLL_FWD; | ||
969 | break; | ||
970 | case SDLK_PAGEUP: | ||
971 | case SDLK_KP9: | ||
972 | new_btn = BUTTON_UP; | ||
973 | break; | ||
974 | case SDLK_PAGEDOWN: | ||
975 | case SDLK_KP3: | ||
976 | new_btn = BUTTON_DOWN; | ||
977 | break; | ||
978 | case SDLK_KP_MINUS: | ||
979 | new_btn = BUTTON_POWER; | ||
980 | break; | ||
981 | case SDLK_KP_MULTIPLY: | ||
982 | new_btn = BUTTON_HOME; | ||
983 | break; | ||
984 | case SDLK_KP5: | ||
985 | case SDLK_SPACE: | ||
986 | case SDLK_KP_ENTER: | ||
987 | case SDLK_RETURN: | ||
988 | new_btn = BUTTON_SELECT; | ||
989 | break; | ||
954 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD | 990 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD |
955 | case SDLK_KP4: | 991 | case SDLK_KP4: |
956 | case SDLK_LEFT: | 992 | case SDLK_LEFT: |
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h index 4332426963..5b0f944d3f 100644 --- a/uisimulator/sdl/uisdl.h +++ b/uisimulator/sdl/uisdl.h | |||
@@ -436,6 +436,16 @@ | |||
436 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ | 436 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
437 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | 437 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ |
438 | 438 | ||
439 | #elif defined(SANSA_FUZE) | ||
440 | #define UI_TITLE "Sansa Fuze" | ||
441 | #define UI_WIDTH 279 /* width of GUI window */ | ||
442 | #define UI_HEIGHT 449 /* height of GUI window */ | ||
443 | /* high-colour */ | ||
444 | #define UI_LCD_POSX 30 /* x position of lcd */ | ||
445 | #define UI_LCD_POSY 31 /* y position of lcd */ | ||
446 | #define UI_LCD_WIDTH LCD_WIDTH | ||
447 | #define UI_LCD_HEIGHT LCD_HEIGHT | ||
448 | |||
439 | #elif defined(SANSA_CLIP) | 449 | #elif defined(SANSA_CLIP) |
440 | #define UI_TITLE "Sansa Clip" | 450 | #define UI_TITLE "Sansa Clip" |
441 | #define UI_WIDTH 205 /* width of GUI window */ | 451 | #define UI_WIDTH 205 /* width of GUI window */ |