summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/SOURCES4
-rw-r--r--apps/keymaps/keymap-zenxfi2.c184
-rw-r--r--apps/keymaps/keymap-zenxfi3.c327
-rw-r--r--apps/lang/english.lang6
-rw-r--r--apps/plugins/battery_bench.c6
-rw-r--r--apps/plugins/lib/pluginlib_actions.c7
6 files changed, 531 insertions, 3 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index 1fe66f93a3..8749c36c87 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -236,6 +236,10 @@ keymaps/keymap-meizu-m6sp.c
236keymaps/keymap-creativezvm.c 236keymaps/keymap-creativezvm.c
237#elif CONFIG_KEYPAD == CREATIVEZV_PAD 237#elif CONFIG_KEYPAD == CREATIVEZV_PAD
238keymaps/keymap-creativezv.c 238keymaps/keymap-creativezv.c
239#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
240keymaps/keymap-zenxfi2.c
241#elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
242keymaps/keymap-zenxfi3.c
239#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD 243#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
240keymaps/keymap-sa9200.c 244keymaps/keymap-sa9200.c
241#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD 245#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
diff --git a/apps/keymaps/keymap-zenxfi2.c b/apps/keymaps/keymap-zenxfi2.c
new file mode 100644
index 0000000000..7bffa10a33
--- /dev/null
+++ b/apps/keymaps/keymap-zenxfi2.c
@@ -0,0 +1,184 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2012 Amaury Pouly
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21
22/* Button Code Definitions for the Creative ZEN X-Fi2 target */
23/* NB: Up/Down/Left/Right are not physical buttons - touchscreen emulation */
24
25#include <stdio.h>
26#include <string.h>
27#include <stdlib.h>
28
29#include "config.h"
30#include "action.h"
31#include "button.h"
32#include "settings.h"
33
34/*
35 * The format of the list is as follows
36 * { Action Code, Button code, Prereq button code }
37 * if there's no need to check the previous button's value, use BUTTON_NONE
38 * Insert LAST_ITEM_IN_LIST at the end of each mapping
39 */
40
41static const struct button_mapping button_context_standard[] = {
42 { ACTION_STD_OK, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
43 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
44
45 { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
46
47 LAST_ITEM_IN_LIST
48}; /* button_context_standard */
49
50
51static const struct button_mapping button_context_wps[] = {
52 { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
53 { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
54
55 LAST_ITEM_IN_LIST
56}; /* button_context_wps */
57
58static const struct button_mapping button_context_list[] = {
59 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
60}; /* button_context_list */
61
62static const struct button_mapping button_context_tree[] = {
63
64 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
65}; /* button_context_tree */
66
67static const struct button_mapping button_context_listtree_scroll_with_combo[] = {
68 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
69};
70
71static const struct button_mapping button_context_listtree_scroll_without_combo[] = {
72 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
73};
74
75static const struct button_mapping button_context_settings[] = {
76 { ACTION_STD_OK, BUTTON_MENU, BUTTON_NONE },
77 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
78
79 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
80}; /* button_context_settings */
81
82static const struct button_mapping button_context_settings_right_is_inc[] = {
83
84 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
85}; /* button_context_settingsgraphical */
86
87static const struct button_mapping button_context_yesno[] = {
88 { ACTION_YESNO_ACCEPT, BUTTON_MENU, BUTTON_NONE },
89
90 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
91}; /* button_context_settings_yesno */
92
93static const struct button_mapping button_context_colorchooser[] = {
94 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
95}; /* button_context_colorchooser */
96
97static const struct button_mapping button_context_eq[] = {
98 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
99}; /* button_context_eq */
100
101/** Bookmark Screen **/
102static const struct button_mapping button_context_bmark[] = {
103 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
104}; /* button_context_bmark */
105
106static const struct button_mapping button_context_time[] = {
107 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
108}; /* button_context_time */
109
110static const struct button_mapping button_context_quickscreen[] = {
111 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
112 { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
113
114 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
115}; /* button_context_quickscreen */
116
117static const struct button_mapping button_context_pitchscreen[] = {
118 { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE },
119 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
120}; /* button_context_pitchcreen */
121
122static const struct button_mapping button_context_keyboard[] = {
123 { ACTION_KBD_PAGE_FLIP, BUTTON_MENU, BUTTON_NONE },
124
125 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
126}; /* button_context_keyboard */
127
128static const struct button_mapping button_context_radio[] = {
129 { ACTION_FM_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
130 { ACTION_FM_PRESET, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
131 { ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE },
132
133 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
134}; /* button_context_radio */
135
136const struct button_mapping* target_get_context_mapping(int context)
137{
138 switch (context)
139 {
140 case CONTEXT_STD:
141 return button_context_standard;
142 case CONTEXT_WPS:
143 return button_context_wps;
144
145 case CONTEXT_LIST:
146 return button_context_list;
147 case CONTEXT_MAINMENU:
148 case CONTEXT_TREE:
149 if (global_settings.hold_lr_for_scroll_in_list)
150 return button_context_listtree_scroll_without_combo;
151 else
152 return button_context_listtree_scroll_with_combo;
153 case CONTEXT_CUSTOM|CONTEXT_TREE:
154 return button_context_tree;
155
156 case CONTEXT_SETTINGS:
157 return button_context_settings;
158 case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
159 case CONTEXT_SETTINGS_RECTRIGGER:
160 return button_context_settings_right_is_inc;
161
162 case CONTEXT_SETTINGS_COLOURCHOOSER:
163 return button_context_colorchooser;
164 case CONTEXT_SETTINGS_EQ:
165 return button_context_eq;
166
167 case CONTEXT_SETTINGS_TIME:
168 return button_context_time;
169
170 case CONTEXT_YESNOSCREEN:
171 return button_context_yesno;
172 case CONTEXT_FM:
173 return button_context_radio;
174 case CONTEXT_BOOKMARKSCREEN:
175 return button_context_bmark;
176 case CONTEXT_QUICKSCREEN:
177 return button_context_quickscreen;
178 case CONTEXT_PITCHSCREEN:
179 return button_context_pitchscreen;
180 case CONTEXT_KEYBOARD:
181 return button_context_keyboard;
182 }
183 return button_context_standard;
184}
diff --git a/apps/keymaps/keymap-zenxfi3.c b/apps/keymaps/keymap-zenxfi3.c
new file mode 100644
index 0000000000..1a9be54a06
--- /dev/null
+++ b/apps/keymaps/keymap-zenxfi3.c
@@ -0,0 +1,327 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2012 Amaury Pouly
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21
22/* Button Code Definitions for the Creative ZEN X-Fi3 target */
23
24#include <stdio.h>
25#include <string.h>
26#include <stdlib.h>
27
28#include "config.h"
29#include "action.h"
30#include "button.h"
31#include "settings.h"
32
33/*
34 * The format of the list is as follows
35 * { Action Code, Button code, Prereq button code }
36 * if there's no need to check the previous button's value, use BUTTON_NONE
37 * Insert LAST_ITEM_IN_LIST at the end of each mapping
38 */
39
40static const struct button_mapping button_context_standard[] = {
41 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
42 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
43 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
44 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
45
46 { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
47
48 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
49 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
50 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
51
52 { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE },
53
54 LAST_ITEM_IN_LIST
55}; /* button_context_standard */
56
57static const struct button_mapping button_context_wps[] = {
58 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
59 { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
60
61 { ACTION_WPS_SKIPNEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
62 { ACTION_WPS_SEEKFWD, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
63 { ACTION_WPS_SKIPPREV, BUTTON_UP|BUTTON_REL, BUTTON_UP },
64 { ACTION_WPS_SEEKBACK, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
65 { ACTION_WPS_STOPSEEK, BUTTON_UP|BUTTON_REL, BUTTON_UP|BUTTON_REPEAT },
66 { ACTION_WPS_STOPSEEK, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN|BUTTON_REPEAT },
67
68 { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },
69 { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
70
71 { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
72 { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
73
74 { ACTION_WPS_MENU, BUTTON_BACK, BUTTON_NONE },
75
76 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
77}; /* button_context_wps */
78
79static const struct button_mapping button_context_keyboard[] = {
80 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
81 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
82 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
83 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
84 { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE },
85 { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
86 { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE },
87 { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
88
89 { ACTION_KBD_SELECT, BUTTON_MENU, BUTTON_NONE },
90 { ACTION_KBD_DONE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
91 { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE },
92
93 { ACTION_KBD_MORSE_INPUT, BUTTON_VOL_UP, BUTTON_NONE },
94 { ACTION_KBD_MORSE_SELECT, BUTTON_VOL_DOWN|BUTTON_REL, BUTTON_NONE },
95
96 LAST_ITEM_IN_LIST
97}; /* button_context_keyboard */
98
99static const struct button_mapping button_context_quickscreen[] = {
100 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
101 { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE },
102 { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
103 { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
104 { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
105 { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
106
107 LAST_ITEM_IN_LIST
108}; /* button_context_quickscreen */
109
110static const struct button_mapping button_context_tree[] = {
111
112 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
113}; /* button_context_tree */
114
115static const struct button_mapping button_context_list[] = {
116#ifdef HAVE_VOLUME_IN_LIST
117 { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },
118 { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
119 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
120 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
121#endif
122
123 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
124}; /* button_context_list */
125
126#ifdef CONFIG_TUNER
127static const struct button_mapping button_context_radio[] = {
128 { ACTION_FM_MENU, BUTTON_MENU, BUTTON_NONE },
129 { ACTION_FM_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
130 { ACTION_FM_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
131
132 { ACTION_FM_EXIT, BUTTON_BACK, BUTTON_NONE },
133
134 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
135}; /* button_context_radio */
136#endif
137
138#ifdef HAVE_RECORDING
139static const struct button_mapping button_context_recscreen[] = {
140 { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
141 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
142 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
143 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
144 { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
145
146 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
147}; /* button_context_recscreen */
148#endif
149
150static const struct button_mapping button_context_settings[] = {
151 /* we overwrite this to avoid select from std */
152 { ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
153
154 { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE },
155 { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
156 { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE },
157 { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
158
159 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
160 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
161 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
162 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
163
164 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
165 { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
166
167 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
168}; /* button_context_settings */
169
170static const struct button_mapping button_context_time[] = {
171
172 { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE },
173 { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE },
174
175 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
176}; /* button_context_time */
177
178static const struct button_mapping button_context_colorchooser[] = {
179 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
180 { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE },
181
182 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
183}; /* button_context_colorchooser */
184
185static const struct button_mapping button_context_eq[] = {
186 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
187
188 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
189}; /* button_context_eq */
190
191/* Bookmark Screen */
192static const struct button_mapping button_context_bmark[] = {
193 { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
194
195 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
196}; /* button_context_bmark */
197
198static const struct button_mapping button_context_pitchscreen[] = {
199
200 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
201 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
202 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
203 { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
204
205 { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE },
206 { ACTION_PS_EXIT, BUTTON_BACK, BUTTON_NONE },
207
208 LAST_ITEM_IN_LIST
209}; /* button_context_pitchcreen */
210
211static const struct button_mapping button_context_yesno[] = {
212 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
213
214 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
215}; /* button_context_yesno */
216
217#ifdef USB_ENABLE_HID
218static const struct button_mapping button_context_usb_hid[] = {
219 { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
220 { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER },
221
222 LAST_ITEM_IN_LIST
223}; /* button_context_usb_hid */
224
225static const struct button_mapping button_context_usb_hid_mode_multimedia[] = {
226
227 { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
228 { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
229 { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_VOL_UP, BUTTON_NONE },
230 { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
231 { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE, BUTTON_BACK|BUTTON_REL, BUTTON_BACK },
232 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
233 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
234 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_UP|BUTTON_REL, BUTTON_UP },
235 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
236
237 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
238}; /* button_context_usb_hid_mode_multimedia */
239
240
241static const struct button_mapping button_context_usb_hid_mode_presentation[] = {
242 { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
243 { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
244 { ACTION_USB_HID_PRESENTATION_SLIDE_PREV, BUTTON_UP|BUTTON_REL, BUTTON_UP },
245 { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
246
247 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
248}; /* button_context_usb_hid_mode_presentation */
249
250static const struct button_mapping button_context_usb_hid_mode_browser[] = {
251
252 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
253}; /* button_context_usb_hid_mode_browser */
254
255#ifdef HAVE_USB_HID_MOUSE
256static const struct button_mapping button_context_usb_hid_mode_mouse[] = {
257
258 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
259}; /* button_context_usb_hid_mode_mouse */
260#endif
261#endif
262
263/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
264const struct button_mapping* get_context_mapping(int context)
265{
266 switch (context)
267 {
268 case CONTEXT_STD:
269 return button_context_standard;
270 case CONTEXT_MAINMENU:
271 return button_context_tree;
272 case CONTEXT_SETTINGS:
273 return button_context_settings;
274 case CONTEXT_WPS:
275 return button_context_wps;
276 case CONTEXT_YESNOSCREEN:
277 return button_context_yesno;
278 case CONTEXT_SETTINGS_TIME:
279 return button_context_time;
280 case CONTEXT_KEYBOARD:
281 case CONTEXT_MORSE_INPUT:
282 return button_context_keyboard;
283#ifdef CONFIG_TUNER
284 case CONTEXT_FM:
285 return button_context_radio;
286#endif
287 case CONTEXT_LIST:
288 return button_context_list;
289 case CONTEXT_TREE:
290 return button_context_tree;
291 case CONTEXT_SETTINGS_EQ:
292 return button_context_eq;
293#ifdef HAVE_RECORDING
294 case CONTEXT_RECSCREEN:
295 return button_context_recscreen;
296#endif
297 case CONTEXT_QUICKSCREEN:
298 return button_context_quickscreen;
299 case CONTEXT_BOOKMARKSCREEN:
300 return button_context_bmark;
301 case CONTEXT_PITCHSCREEN:
302 return button_context_pitchscreen;
303 case CONTEXT_SETTINGS_COLOURCHOOSER:
304 return button_context_colorchooser;
305 case CONTEXT_SETTINGS_RECTRIGGER:
306 return button_context_settings;
307 case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
308 return button_context_settings;
309#ifdef USB_ENABLE_HID
310 case CONTEXT_USB_HID:
311 return button_context_usb_hid;
312 case CONTEXT_USB_HID_MODE_MULTIMEDIA:
313 return button_context_usb_hid_mode_multimedia;
314 case CONTEXT_USB_HID_MODE_PRESENTATION:
315 return button_context_usb_hid_mode_presentation;
316 case CONTEXT_USB_HID_MODE_BROWSER:
317 return button_context_usb_hid_mode_browser;
318#ifdef HAVE_USB_HID_MOUSE
319 case CONTEXT_USB_HID_MODE_MOUSE:
320 return button_context_usb_hid_mode_mouse;
321#endif
322#endif
323 default:
324 return button_context_standard;
325 }
326 return button_context_standard;
327}
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index a70bb8b923..fc575a3764 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12465,15 +12465,15 @@
12465 user: core 12465 user: core
12466 <source> 12466 <source>
12467 *: none 12467 *: none
12468 gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement" 12468 gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
12469 </source> 12469 </source>
12470 <dest> 12470 <dest>
12471 *: none 12471 *: none
12472 gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement" 12472 gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
12473 </dest> 12473 </dest>
12474 <voice> 12474 <voice>
12475 *: none 12475 *: none
12476 gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement" 12476 gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
12477 </voice> 12477 </voice>
12478</phrase> 12478</phrase>
12479<phrase> 12479<phrase>
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index cd863fafcb..8a5ff2fcdf 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -240,10 +240,16 @@
240#define BATTERY_ON_TXT "SELECT - start" 240#define BATTERY_ON_TXT "SELECT - start"
241#define BATTERY_OFF_TXT "POWER" 241#define BATTERY_OFF_TXT "POWER"
242 242
243#elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
244#define BATTERY_ON BUTTON_PLAY
245#define BATTERY_OFF BUTTON_POWER
246#define BATTERY_ON_TXT "PLAY - start"
247
243#elif (CONFIG_KEYPAD == HM60X_PAD) || (CONFIG_KEYPAD == HM801_PAD) 248#elif (CONFIG_KEYPAD == HM60X_PAD) || (CONFIG_KEYPAD == HM801_PAD)
244#define BATTERY_ON BUTTON_SELECT 249#define BATTERY_ON BUTTON_SELECT
245#define BATTERY_OFF BUTTON_POWER 250#define BATTERY_OFF BUTTON_POWER
246#define BATTERY_ON_TXT "SELECT - start" 251#define BATTERY_ON_TXT "SELECT - start"
252
247#define BATTERY_OFF_TXT "POWER" 253#define BATTERY_OFF_TXT "POWER"
248 254
249#else 255#else
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 9505668d7f..b351955e9c 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -118,6 +118,7 @@ const struct button_mapping pla_main_ctx[] =
118 || (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) \ 118 || (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) \
119 || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \ 119 || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \
120 || (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) \ 120 || (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) \
121 || (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) \
121 || (CONFIG_KEYPAD == HM60X_PAD) \ 122 || (CONFIG_KEYPAD == HM60X_PAD) \
122 || (CONFIG_KEYPAD == HM801_PAD)) 123 || (CONFIG_KEYPAD == HM801_PAD))
123 { PLA_UP, BUTTON_UP, BUTTON_NONE }, 124 { PLA_UP, BUTTON_UP, BUTTON_NONE },
@@ -417,6 +418,12 @@ const struct button_mapping pla_main_ctx[] =
417 {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, 418 {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE},
418 {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, 419 {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
419 {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, 420 {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
421#elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD)
422 {PLA_CANCEL, BUTTON_VOL_DOWN, BUTTON_NONE},
423 {PLA_EXIT, BUTTON_POWER, BUTTON_NONE},
424 {PLA_SELECT, BUTTON_VOL_UP, BUTTON_NONE},
425 {PLA_SELECT_REL, BUTTON_VOL_UP|BUTTON_REL, BUTTON_VOL_UP},
426 {PLA_SELECT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE},
420#else 427#else
421# ifndef HAVE_TOUCHSCREEN 428# ifndef HAVE_TOUCHSCREEN
422# error pluginlib_actions: No actions defined 429# error pluginlib_actions: No actions defined
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 08:26:09 +0000