summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMartin Scarratt <mmmm@rockbox.org>2006-08-20 13:35:01 +0000
committerMartin Scarratt <mmmm@rockbox.org>2006-08-20 13:35:01 +0000
commitd1ee44ae59ac4764d9fe0fcf503857787ac349a9 (patch)
treebdcb350b928974c656475f7ae4e4c063f4cdd37a /apps
parent9272dfd34c71fc8c0eeef2afc8405a595f660c39 (diff)
downloadrockbox-d1ee44ae59ac4764d9fe0fcf503857787ac349a9.tar.gz
rockbox-d1ee44ae59ac4764d9fe0fcf503857787ac349a9.zip
fix H1xx remote in filebrowser and some H3xx oddities, also TREE_OFF works now
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10664 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/keymaps/keymap-h1x0_h3x0.c118
1 files changed, 59 insertions, 59 deletions
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 42ba9fbafb..5a6f823d53 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -100,7 +100,8 @@ const struct button_mapping button_context_list[] = {
100}; /* button_context_list */ 100}; /* button_context_list */
101 101
102const struct button_mapping button_context_tree[] = { 102const struct button_mapping button_context_tree[] = {
103 { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, 103 { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON },
104 { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE },
104 { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, 105 { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF },
105 { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE }, 106 { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE },
106 107
@@ -287,61 +288,63 @@ const struct button_mapping *button_context_list_h300lcdremote =
287 288
288 289
289const struct button_mapping button_context_tree_h100remote[] = { 290const struct button_mapping button_context_tree_h100remote[] = {
290 { ACTION_TREE_WPS, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, 291 { ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE },
291 { ACTION_TREE_STOP, BUTTON_RC_STOP|BUTTON_REL, BUTTON_RC_STOP },
292 { ACTION_TREE_STOP, BUTTON_RC_STOP|BUTTON_REPEAT, BUTTON_NONE },
293 292
294 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE) 293 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE)
295}; /* button_context_tree_h100remote */ 294}; /* button_context_tree_h100remote */
296 295
297const struct button_mapping *button_context_tree_h300lcdremote = 296const struct button_mapping button_context_tree_h300lcdremote[] = {
298 button_context_tree_h100remote; 297 { ACTION_TREE_STOP, BUTTON_RC_STOP, BUTTON_NONE },
298 { ACTION_TREE_WPS, BUTTON_RC_ON, BUTTON_NONE },
299 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE)
300}; /* button_context_tree_h300lcdremote */
301
299 302
300const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] = { 303const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] = {
301 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_ON }, 304 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_ON },
302 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_REW }, 305 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_REW },
303 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_REW|BUTTON_REL }, 306 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_REW|BUTTON_REL },
304 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 307 { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
305 { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF, BUTTON_RC_ON }, 308 { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
306 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_FF }, 309 { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
307 { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF, BUTTON_RC_FF|BUTTON_REL }, 310 { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF, BUTTON_RC_ON },
308 { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 311 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_FF },
312 { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF, BUTTON_RC_FF|BUTTON_REL },
313 { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
314 { ACTION_TREE_PGRIGHT, BUTTON_RC_VOL_UP, BUTTON_NONE },
315 { ACTION_TREE_PGRIGHT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
309 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), 316 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE),
310}; 317};
311 318
312const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[] = { 319const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[] = {
313 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_MENU }, 320 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_MENU },
314 { ACTION_TREE_PGLEFT, BUTTON_RC_SOURCE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_SOURCE }, 321 { ACTION_TREE_PGLEFT, BUTTON_RC_SOURCE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_SOURCE },
315 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_SOURCE|BUTTON_REL }, 322 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_SOURCE|BUTTON_REL },
316 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, 323 { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE },
317 { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE, BUTTON_RC_MENU }, 324 { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE, BUTTON_RC_MENU },
318 { ACTION_TREE_PGRIGHT, BUTTON_RC_BITRATE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_BITRATE }, 325 { ACTION_TREE_PGRIGHT, BUTTON_RC_BITRATE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_BITRATE },
319 { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE, BUTTON_RC_BITRATE|BUTTON_REL }, 326 { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE, BUTTON_RC_BITRATE|BUTTON_REL },
320 { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, 327 { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE },
321 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), 328 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE),
322}; 329};
323 330
324const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[] = { 331const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[] = {
325 { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, 332 { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
326 { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, 333 { ACTION_TREE_PGLEFT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
327 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 334 { ACTION_TREE_PGRIGHT, BUTTON_RC_VOL_UP, BUTTON_NONE },
328 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, 335 { ACTION_TREE_PGRIGHT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
329 { ACTION_NONE, BUTTON_RC_FF, BUTTON_NONE },
330 { ACTION_STD_OK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF },
331 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
332 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT },
333 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), 336 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE),
334}; 337};
335 338
336const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[] = { 339const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[] = {
337 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 340 { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE },
338 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 341 { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW },
339 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 342 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
340 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, 343 { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT },
341 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, 344 { ACTION_NONE, BUTTON_RC_FF, BUTTON_NONE },
342 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 345 { ACTION_STD_OK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF },
343 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 346 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
344 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, 347 { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT },
345 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), 348 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE),
346}; 349};
347 350
@@ -371,14 +374,14 @@ const struct button_mapping button_context_settings_h300lcdremote[] = {
371 374
372 375
373const struct button_mapping button_context_settingsgraphical_h100remote[] = { 376const struct button_mapping button_context_settingsgraphical_h100remote[] = {
374 { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, 377 { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE },
375 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 378 { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
376 { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 379 { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE },
377 { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 380 { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
378 { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, 381 { ACTION_STD_PREV, BUTTON_RC_SOURCE, BUTTON_NONE },
379 { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 382 { ACTION_STD_PREVREPEAT, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE },
380 { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, 383 { ACTION_STD_NEXT, BUTTON_RC_BITRATE, BUTTON_NONE },
381 { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 384 { ACTION_STD_NEXTREPEAT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE },
382 385
383 LAST_ITEM_IN_LIST 386 LAST_ITEM_IN_LIST
384}; 387};
@@ -397,15 +400,12 @@ const struct button_mapping button_context_settingsgraphical_h300lcdremote[] =
397}; 400};
398 401
399const struct button_mapping button_context_yesno_h100remote[] = { 402const struct button_mapping button_context_yesno_h100remote[] = {
400 { ACTION_YESNO_ACCEPT, BUTTON_RC_ON, BUTTON_NONE },
401 LAST_ITEM_IN_LIST
402}; /* button_context_settings_yesno */
403
404const struct button_mapping button_context_yesno_h300lcdremote[] = {
405 { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, 403 { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE },
406 LAST_ITEM_IN_LIST 404 LAST_ITEM_IN_LIST
407}; /* button_context_settings_yesno */ 405}; /* button_context_settings_yesno */
408 406
407const struct button_mapping *button_context_yesno_h300lcdremote =
408 button_context_yesno_h100remote;
409 409
410const struct button_mapping button_context_bmark_h100remote[] = { 410const struct button_mapping button_context_bmark_h100remote[] = {
411 { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE }, 411 { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE },
@@ -424,10 +424,10 @@ const struct button_mapping button_context_quickscreen_h100remote[] = {
424 { ACTION_QS_DOWNINV, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 424 { ACTION_QS_DOWNINV, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
425 { ACTION_QS_DOWN, BUTTON_RC_FF, BUTTON_NONE }, 425 { ACTION_QS_DOWN, BUTTON_RC_FF, BUTTON_NONE },
426 { ACTION_QS_DOWN, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 426 { ACTION_QS_DOWN, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
427 { ACTION_QS_LEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 427 { ACTION_QS_LEFT, BUTTON_RC_SOURCE, BUTTON_NONE },
428 { ACTION_QS_LEFT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 428 { ACTION_QS_LEFT, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE },
429 { ACTION_QS_RIGHT, BUTTON_RC_VOL_UP, BUTTON_NONE }, 429 { ACTION_QS_RIGHT, BUTTON_RC_BITRATE, BUTTON_NONE },
430 { ACTION_QS_RIGHT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 430 { ACTION_QS_RIGHT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE },
431 { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, 431 { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE },
432 432
433 LAST_ITEM_IN_LIST 433 LAST_ITEM_IN_LIST
@@ -452,10 +452,10 @@ const struct button_mapping button_context_pitchscreen_h100remote[] = {
452 { ACTION_PS_INC_BIG, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE }, 452 { ACTION_PS_INC_BIG, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE },
453 { ACTION_PS_DEC_SMALL, BUTTON_RC_FF, BUTTON_NONE }, 453 { ACTION_PS_DEC_SMALL, BUTTON_RC_FF, BUTTON_NONE },
454 { ACTION_PS_DEC_BIG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 454 { ACTION_PS_DEC_BIG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
455 { ACTION_PS_NUDGE_LEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 455 { ACTION_PS_NUDGE_LEFT, BUTTON_RC_SOURCE, BUTTON_NONE },
456 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_VOL_DOWN|BUTTON_REL, BUTTON_NONE }, 456 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_SOURCE|BUTTON_REL,BUTTON_NONE },
457 { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_VOL_UP, BUTTON_NONE }, 457 { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_BITRATE, BUTTON_NONE },
458 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_VOL_UP|BUTTON_REL,BUTTON_NONE }, 458 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_BITRATE|BUTTON_REL, BUTTON_NONE },
459 { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, 459 { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE },
460 { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, 460 { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE },
461 461
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-28 01:33:06 +0000