From d198b4c32d3ccae67e5a3055e50f7f5433e28fe4 Mon Sep 17 00:00:00 2001 From: Hristo Kovachev Date: Sat, 19 Aug 2006 08:00:20 +0000 Subject: Rework of iriver remote mappings, now follow the main screen layout. Please, test. Needs more work (especially for h300 NON-lcd remote), but is a good starting point. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10653 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-h1x0_h3x0.c | 526 ++++++++++++++++++++++++++++------------ 1 file changed, 374 insertions(+), 152 deletions(-) (limited to 'apps/keymaps') diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 1e88b7935c..42ba9fbafb 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c @@ -5,7 +5,7 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id $ + * $Id$ * * Copyright (C) 2006 Jonathan Gordon * @@ -52,6 +52,7 @@ const struct button_mapping button_context_standard[] = { { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE }, { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, + { ACTION_STD_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, { ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, @@ -62,7 +63,6 @@ const struct button_mapping button_context_standard[] = { const struct button_mapping button_context_wps[] = { - { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -73,10 +73,10 @@ const struct button_mapping button_context_wps[] = { { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_ON }, { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_ON }, { ACTION_WPS_STOP, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, - { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, + { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_DOWN, BUTTON_ON }, { ACTION_WPS_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, @@ -89,15 +89,15 @@ const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ -const struct button_mapping button_context_listtree[] = { +const struct button_mapping button_context_list[] = { { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN, BUTTON_ON|BUTTON_UP }, + { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN, BUTTON_ON }, { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_ON|BUTTON_DOWN }, { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST -}; /* button_context_listtree */ +}; /* button_context_list */ const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, @@ -105,7 +105,7 @@ const struct button_mapping button_context_tree[] = { { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) -}; /* button_context_listtree */ +}; /* button_context_tree */ const struct button_mapping button_context_listtree_scroll_with_combo[] = { { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, @@ -117,7 +117,7 @@ const struct button_mapping button_context_listtree_scroll_with_combo[] = { { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_ON|BUTTON_RIGHT }, { ACTION_TREE_PGRIGHT, BUTTON_ON|BUTTON_RIGHT, BUTTON_RIGHT|BUTTON_REL }, { ACTION_TREE_PGRIGHT, BUTTON_ON|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; const struct button_mapping button_context_listtree_scroll_without_combo[] = { @@ -129,7 +129,7 @@ const struct button_mapping button_context_listtree_scroll_without_combo[] = { { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; const struct button_mapping button_context_settings[] = { @@ -195,155 +195,310 @@ const struct button_mapping button_context_pitchscreen[] = { LAST_ITEM_IN_LIST }; /* button_context_pitchcreen */ + /***************************************************************************** * Remote control mappings *****************************************************************************/ -/********* H100 LCD remote ******/ -const struct button_mapping button_context_standard_h100lcdremote[] = { +const struct button_mapping button_context_standard_h100remote[] = { { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, - { ACTION_STD_CONTEXT, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, { ACTION_STD_CANCEL, BUTTON_RC_STOP, BUTTON_NONE }, + { ACTION_STD_CONTEXT, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, + { ACTION_STD_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE }, { ACTION_STD_MENU, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, + { ACTION_STD_OK, BUTTON_RC_ON, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, LAST_ITEM_IN_LIST }; /* button_context_standard_h100lcdremote */ -const struct button_mapping button_context_wps_h100lcdremote[] = { +const struct button_mapping button_context_standard_h300lcdremote[] = { + { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + + { ACTION_STD_CANCEL, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_RC_STOP, BUTTON_NONE }, + { ACTION_STD_CONTEXT, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, + { ACTION_STD_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE }, + { ACTION_STD_MENU, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, + { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, + { ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE }, + + LAST_ITEM_IN_LIST + +}; + +const struct button_mapping button_context_wps_remotescommon[] = { { ACTION_WPS_PLAY, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, - { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOP, BUTTON_RC_STOP, BUTTON_NONE }, + { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, + { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, + { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_RC_BITRATE, BUTTON_NONE }, + { ACTION_WPS_ABSETA_PREVDIR, BUTTON_RC_SOURCE, BUTTON_NONE }, + { ACTION_WPS_STOP, BUTTON_RC_STOP|BUTTON_REL, BUTTON_RC_STOP }, { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_RC_BITRATE, BUTTON_NONE }, - { ACTION_WPS_ABSETA_PREVDIR, BUTTON_RC_SOURCE, BUTTON_NONE }, - { ACTION_WPS_PITCHSCREEN, BUTTON_RC_ON|BUTTON_REPEAT, BUTTON_RC_ON }, + { ACTION_WPS_PITCHSCREEN, BUTTON_RC_ON|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE }, { ACTION_WPS_MENU, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, - { ACTION_WPS_CONTEXT, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, + { ACTION_WPS_CONTEXT, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_BROWSE, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, - - LAST_ITEM_IN_LIST -}; /* button_context_wps_h100lcdremote */ - -const struct button_mapping button_context_listtree_h100lcdremote[] = { - { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE, BUTTON_NONE }, - { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_TREE_WPS, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, - - LAST_ITEM_IN_LIST -}; /* button_context_listtree_h100lcdremote */ -/* Not needed? _std_ actions seem to be fine */ -const struct button_mapping button_context_settings_h100lcdremote[] = { +/* Now the specific combos, because H100 & H300 LCD remotes have different + * keys, capable of acting as "modifier" - H100 : RC_ON; H300: RC_MENU + */ + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_REMOTE|CONTEXT_WPS) +}; + + +const struct button_mapping button_context_wps_h100remote[] = { + { ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON }, + { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE }, LAST_ITEM_IN_LIST -};/* button_context_settings_h100lcdremote */ - -const struct button_mapping button_context_settingsgraphical_h100lcdremote[] = { - { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - +}; +const struct button_mapping button_context_wps_h300lcdremote[] = { + { ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU }, + { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE }, LAST_ITEM_IN_LIST -}; /* button_context_settingsgraphical */ +}; -const struct button_mapping button_context_yesno_h100lcdremote[] = { - { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, +const struct button_mapping button_context_list_h100remote[] = { + { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE, BUTTON_NONE }, + { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, + { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST -}; /* button_context_settings_yesno */ +}; -const struct button_mapping button_context_bmark_h100lcdremote[] = { - { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RC_MENU, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL), -}; /* button_context_settings_bmark */ +const struct button_mapping *button_context_list_h300lcdremote = + button_context_list_h100remote; +const struct button_mapping button_context_tree_h100remote[] = { + { ACTION_TREE_WPS, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, + { ACTION_TREE_STOP, BUTTON_RC_STOP|BUTTON_REL, BUTTON_RC_STOP }, + { ACTION_TREE_STOP, BUTTON_RC_STOP|BUTTON_REPEAT, BUTTON_NONE }, -/********* H300 LCD remote ******/ -const struct button_mapping button_context_standard_h300lcdremote[] = { - { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, - { ACTION_STD_CANCEL, BUTTON_RC_REW, BUTTON_NONE }, - { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_CONTEXT, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, - { ACTION_STD_CANCEL, BUTTON_RC_STOP, BUTTON_NONE }, - { ACTION_STD_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE }, - { ACTION_STD_MENU, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, - { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, - { ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE) +}; /* button_context_tree_h100remote */ + +const struct button_mapping *button_context_tree_h300lcdremote = + button_context_tree_h100remote; + +const struct button_mapping button_context_listtree_scroll_w_cmb_h100remote[] = { + { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_ON }, + { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_REW }, + { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW, BUTTON_RC_REW|BUTTON_REL }, + { ACTION_TREE_PGLEFT, BUTTON_RC_ON|BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF, BUTTON_RC_ON }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_ON|BUTTON_RC_FF }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF, BUTTON_RC_FF|BUTTON_REL }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_ON|BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), +}; + +const struct button_mapping button_context_listtree_scroll_w_cmb_h300lcdremote[] = { + { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_MENU }, + { ACTION_TREE_PGLEFT, BUTTON_RC_SOURCE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_SOURCE }, + { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE, BUTTON_RC_SOURCE|BUTTON_REL }, + { ACTION_TREE_PGLEFT, BUTTON_RC_MENU|BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE, BUTTON_RC_MENU }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_BITRATE|BUTTON_REL, BUTTON_RC_MENU|BUTTON_RC_BITRATE }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE, BUTTON_RC_BITRATE|BUTTON_REL }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_MENU|BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), +}; + +const struct button_mapping button_context_listtree_scroll_wo_cmb_h100remote[] = { + { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, + { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_TREE_PGLEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, + { ACTION_NONE, BUTTON_RC_FF, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_TREE_PGRIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), +}; + +const struct button_mapping button_context_listtree_scroll_wo_cmb_h300lcdremote[] = { + { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, + { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, + { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, + { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE|CONTEXT_REMOTE), +}; + +const struct button_mapping button_context_settings_h100remote[] = { + { ACTION_SETTINGS_INC, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_RC_FF, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, +/* { ACTION_NONE, BUTTON_RC_ON, BUTTON_NONE }, + { ACTION_NONE, BUTTON_RC_STOP, BUTTON_NONE }, + { ACTION_NONE, BUTTON_RC_MENU|BUTTON_REL, BUTTON_NONE }, +*/ + LAST_ITEM_IN_LIST +}; /* button_context_settings */ + +const struct button_mapping button_context_settings_h300lcdremote[] = { + { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_NONE, BUTTON_RC_FF, BUTTON_NONE }, LAST_ITEM_IN_LIST +}; /* button_context_settings */ -}; /* button_context_standard */ + -/* the mapping of the 2 LCD remotes in the WPS screen should be the same */ -const struct button_mapping *button_context_wps_h300lcdremote = - button_context_wps_h100lcdremote; +const struct button_mapping button_context_settingsgraphical_h100remote[] = { + { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; -const struct button_mapping button_context_listtree_h300lcdremote[] = { - { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE, BUTTON_NONE }, - { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_TREE_WPS, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, - { ACTION_TREE_STOP, BUTTON_RC_STOP, BUTTON_NONE }, +const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { + { ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; +const struct button_mapping button_context_yesno_h100remote[] = { + { ACTION_YESNO_ACCEPT, BUTTON_RC_ON, BUTTON_NONE }, LAST_ITEM_IN_LIST +}; /* button_context_settings_yesno */ -}; /* button_context_listtree_h300lcdremote */ +const struct button_mapping button_context_yesno_h300lcdremote[] = { + { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, + LAST_ITEM_IN_LIST +}; /* button_context_settings_yesno */ -const struct button_mapping *button_context_settingsgraphical_h300lcdremote = - button_context_settingsgraphical_h100lcdremote; - -const struct button_mapping *button_context_yesno_h300lcdremote = - button_context_yesno_h100lcdremote; -const struct button_mapping *button_context_bmark_h300lcdremote = - button_context_bmark_h100lcdremote; +const struct button_mapping button_context_bmark_h100remote[] = { + { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_RC_ON, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL|CONTEXT_REMOTE), +}; /* button_context_settings_bmark */ -const struct button_mapping *button_context_settings_h300lcdremote = - button_context_settings_h100lcdremote; -/* FIXME: non lcd remotes need mappings.. ?? */ +const struct button_mapping button_context_bmark_h300lcdremote[] = { + { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_RC_MENU, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL|CONTEXT_REMOTE), +}; + +const struct button_mapping button_context_quickscreen_h100remote[] = { + { ACTION_QS_DOWNINV, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_QS_DOWNINV, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_QS_DOWN, BUTTON_RC_FF, BUTTON_NONE }, + { ACTION_QS_DOWN, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_QS_LEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_QS_LEFT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; /* button_context_quickscreen */ +const struct button_mapping button_context_quickscreen_h300lcdremote[] = { + { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_QS_LEFT, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; /* button_context_quickscreen */ +const struct button_mapping button_context_pitchscreen_h100remote[] = { + { ACTION_PS_INC_SMALL, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_PS_INC_BIG, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE }, + { ACTION_PS_DEC_SMALL, BUTTON_RC_FF, BUTTON_NONE }, + { ACTION_PS_DEC_BIG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_PS_NUDGE_LEFT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_VOL_DOWN|BUTTON_REL, BUTTON_NONE }, + { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_VOL_UP|BUTTON_REL,BUTTON_NONE }, + { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, + { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; /* button_context_pitchcreen */ +const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { + { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_PS_DEC_BIG, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_PS_NUDGE_LEFT, BUTTON_RC_REW, BUTTON_NONE }, + { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_REW|BUTTON_REL, BUTTON_NONE }, + { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, + { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_FF|BUTTON_REL, BUTTON_NONE }, + { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, + { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; /* the actual used tables */ static const struct button_mapping - *remote_button_context_std = button_context_standard_h100lcdremote, - *remote_button_context_wps = button_context_wps_h100lcdremote, - *remote_button_context_listtree = button_context_listtree_h100lcdremote, - *remote_button_context_settings = button_context_settings_h100lcdremote, - *remote_button_context_settingsgraphical = button_context_settingsgraphical_h100lcdremote, - *remote_button_context_yesno = button_context_yesno_h100lcdremote, - *remote_button_context_bmark = button_context_bmark_h100lcdremote; - + *remote_btn_ctxt_std = button_context_standard_h100remote, + *remote_btn_ctxt_wps = button_context_wps_h100remote, + *remote_btn_ctxt_list = button_context_list_h100remote, + *remote_btn_ctxt_tree = button_context_tree_h100remote, + *remote_btn_ctxt_listtree_scroll_w_cmb + = button_context_listtree_scroll_w_cmb_h100remote, + *remote_btn_ctxt_listtree_scroll_wo_cmb + = button_context_listtree_scroll_wo_cmb_h100remote, + *remote_btn_ctxt_settings = button_context_settings_h100remote, + *remote_btn_ctxt_settingsgrph + = button_context_settingsgraphical_h100remote, + *remote_btn_ctxt_yesno = button_context_yesno_h100remote, + *remote_btn_ctxt_bmark = button_context_bmark_h100remote, + *remote_btn_ctxt_quickscreen + = button_context_quickscreen_h100remote, + *remote_btn_ctxt_pitchscreen + = button_context_pitchscreen_h100remote; + static int _remote_type = 0; static void remap_remote(void) @@ -352,51 +507,98 @@ static void remap_remote(void) switch(_remote_type) { case REMOTETYPE_UNPLUGGED: - remote_button_context_std = NULL; - remote_button_context_wps = NULL; - remote_button_context_listtree = NULL; - remote_button_context_settings = NULL; - remote_button_context_settingsgraphical = NULL; - remote_button_context_yesno = NULL; - remote_button_context_bmark = NULL; + remote_btn_ctxt_std = NULL; + remote_btn_ctxt_wps = NULL; + remote_btn_ctxt_list = NULL; + remote_btn_ctxt_tree = NULL; + remote_btn_ctxt_listtree_scroll_w_cmb = NULL; + remote_btn_ctxt_listtree_scroll_wo_cmb = NULL; + remote_btn_ctxt_settings = NULL; + remote_btn_ctxt_settingsgrph = NULL; + remote_btn_ctxt_yesno = NULL; + remote_btn_ctxt_bmark = NULL; + remote_btn_ctxt_quickscreen = NULL; + remote_btn_ctxt_pitchscreen = NULL; break; + case REMOTETYPE_H100_LCD: - remote_button_context_std = button_context_standard_h100lcdremote; - remote_button_context_wps = button_context_wps_h100lcdremote; - remote_button_context_listtree = button_context_listtree_h100lcdremote; - remote_button_context_settings = button_context_settings_h100lcdremote; - remote_button_context_settingsgraphical = button_context_settingsgraphical_h100lcdremote; - remote_button_context_yesno = button_context_yesno_h100lcdremote; - remote_button_context_bmark = button_context_bmark_h100lcdremote; + remote_btn_ctxt_std = button_context_standard_h100remote, + remote_btn_ctxt_wps = button_context_wps_h100remote, + remote_btn_ctxt_list = button_context_list_h100remote, + remote_btn_ctxt_tree = button_context_tree_h100remote, + remote_btn_ctxt_listtree_scroll_w_cmb + = button_context_listtree_scroll_w_cmb_h100remote, + remote_btn_ctxt_listtree_scroll_wo_cmb + = button_context_listtree_scroll_wo_cmb_h100remote, + remote_btn_ctxt_settings = button_context_settings_h100remote, + remote_btn_ctxt_settingsgrph + = button_context_settingsgraphical_h100remote, + remote_btn_ctxt_yesno = button_context_yesno_h100remote, + remote_btn_ctxt_bmark = button_context_bmark_h100remote, + remote_btn_ctxt_quickscreen + = button_context_quickscreen_h100remote, + remote_btn_ctxt_pitchscreen + = button_context_pitchscreen_h100remote; break; + case REMOTETYPE_H300_LCD: - remote_button_context_std = button_context_standard_h300lcdremote; - remote_button_context_wps = button_context_wps_h300lcdremote; - remote_button_context_listtree = button_context_listtree_h300lcdremote; - remote_button_context_settings = button_context_settings_h300lcdremote; - remote_button_context_settingsgraphical = button_context_settingsgraphical_h300lcdremote; - remote_button_context_yesno = button_context_yesno_h300lcdremote; - remote_button_context_bmark = button_context_bmark_h300lcdremote; + remote_btn_ctxt_std = button_context_standard_h300lcdremote, + remote_btn_ctxt_wps = button_context_wps_h300lcdremote, + remote_btn_ctxt_list = button_context_list_h300lcdremote, + remote_btn_ctxt_tree = button_context_tree_h300lcdremote, + remote_btn_ctxt_listtree_scroll_w_cmb + = button_context_listtree_scroll_w_cmb_h300lcdremote, + remote_btn_ctxt_listtree_scroll_wo_cmb + = button_context_listtree_scroll_wo_cmb_h300lcdremote, + remote_btn_ctxt_settings = button_context_settings_h300lcdremote, + remote_btn_ctxt_settingsgrph + = button_context_settingsgraphical_h300lcdremote, + remote_btn_ctxt_yesno = button_context_yesno_h300lcdremote, + remote_btn_ctxt_bmark = button_context_bmark_h300lcdremote, + remote_btn_ctxt_quickscreen + = button_context_quickscreen_h300lcdremote, + remote_btn_ctxt_pitchscreen + = button_context_pitchscreen_h300lcdremote; break; + case REMOTETYPE_H300_NONLCD: /* FIXME: add its tables */ - remote_button_context_std = button_context_standard_h300lcdremote; - remote_button_context_wps = button_context_wps_h300lcdremote; - remote_button_context_listtree = button_context_listtree_h300lcdremote; - remote_button_context_settings = button_context_settings_h300lcdremote; - remote_button_context_settingsgraphical = button_context_settingsgraphical_h300lcdremote; - remote_button_context_yesno = button_context_yesno_h300lcdremote; - remote_button_context_bmark = button_context_bmark_h300lcdremote; + remote_btn_ctxt_std = button_context_standard_h300lcdremote, + remote_btn_ctxt_wps = button_context_wps_h300lcdremote, + remote_btn_ctxt_list = button_context_list_h300lcdremote, + remote_btn_ctxt_tree = button_context_tree_h300lcdremote, + remote_btn_ctxt_listtree_scroll_w_cmb + = button_context_listtree_scroll_w_cmb_h300lcdremote, + remote_btn_ctxt_listtree_scroll_wo_cmb + = button_context_listtree_scroll_wo_cmb_h300lcdremote, + remote_btn_ctxt_settings = button_context_settings_h300lcdremote, + remote_btn_ctxt_settingsgrph + = button_context_settingsgraphical_h300lcdremote, + remote_btn_ctxt_yesno = button_context_yesno_h300lcdremote, + remote_btn_ctxt_bmark = button_context_bmark_h300lcdremote, + remote_btn_ctxt_quickscreen + = button_context_quickscreen_h300lcdremote, + remote_btn_ctxt_pitchscreen + = button_context_pitchscreen_h300lcdremote; +#if 0 + remote_btn_ctxt_std = + remote_btn_ctxt_wps = + remote_btn_ctxt_list = + remote_btn_ctxt_tree = + remote_btn_ctxt_listtree_scroll_w_cmb = + remote_btn_ctxt_listtree_scroll_wo_cmb = + remote_btn_ctxt_settings = + remote_btn_ctxt_settingsgrph = + remote_btn_ctxt_yesno = + remote_btn_ctxt_bmark = + remote_btn_ctxt_quickscreen = + remote_btn_ctxt_pitchscreen = +#endif break; + } } - - - - - - const struct button_mapping* get_context_mapping_remote(int context) { if(remote_type() != _remote_type) @@ -407,22 +609,40 @@ const struct button_mapping* get_context_mapping_remote(int context) { case CONTEXT_STD: case CONTEXT_MAINMENU: - case CONTEXT_SETTINGS: - return remote_button_context_std; - case CONTEXT_WPS: - return remote_button_context_wps; - - case CONTEXT_TREE: + return remote_btn_ctxt_std; + case CONTEXT_WPS: /* common for all remotes */ + return button_context_wps_remotescommon; + + case CONTEXT_CUSTOM|CONTEXT_WPS: + return remote_btn_ctxt_wps; + case CONTEXT_LIST: - return remote_button_context_listtree; + return remote_btn_ctxt_list; + case CONTEXT_TREE: + if (global_settings.hold_lr_for_scroll_in_list) + return remote_btn_ctxt_listtree_scroll_wo_cmb; + else + return remote_btn_ctxt_listtree_scroll_w_cmb; + case CONTEXT_CUSTOM|CONTEXT_TREE: + return remote_btn_ctxt_tree; + case CONTEXT_SETTINGSGRAPHICAL: - return remote_button_context_settingsgraphical; - case CONTEXT_YESNOSCREEN: - return remote_button_context_yesno; + return remote_btn_ctxt_settingsgrph; + + case CONTEXT_SETTINGS: + return remote_btn_ctxt_settings; + + case CONTEXT_YESNOSCREEN: + return remote_btn_ctxt_yesno; + case CONTEXT_BOOKMARKSCREEN: - return remote_button_context_bmark; + return remote_btn_ctxt_bmark; + case CONTEXT_QUICKSCREEN: + return remote_btn_ctxt_quickscreen; + case CONTEXT_PITCHSCREEN: + return remote_btn_ctxt_pitchscreen; } - return remote_button_context_std; + return remote_btn_ctxt_std; } const struct button_mapping* get_context_mapping(int context) @@ -439,13 +659,15 @@ const struct button_mapping* get_context_mapping(int context) return button_context_wps; case CONTEXT_LIST: - return button_context_listtree; + return button_context_list; case CONTEXT_TREE: if (global_settings.hold_lr_for_scroll_in_list) return button_context_listtree_scroll_without_combo; - else return button_context_listtree_scroll_with_combo; - case CONTEXT_CUSTOM|1: + else + return button_context_listtree_scroll_with_combo; + case CONTEXT_CUSTOM|CONTEXT_TREE: return button_context_tree; + case CONTEXT_SETTINGSGRAPHICAL: return button_context_settingsgraphical; -- cgit v1.2.3