Driver for the Synaptics touchpad on the m:robe 100 based on the 3-wire interface spec. Needs some tweaking as it's too sensitive with the default hardware settings. For now, the vertical strip is divided into up/select/down buttons. Also, redo the keymap (using the Gigabeat as a starting point), but it still needs a good bit of work.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16400 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 258 insertions, 276 deletions

diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c
index 572f510..2d6b616 100644
--- a/apps/keymaps/keymap-mr100.c
+++ b/apps/keymaps/keymap-mr100.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) Barry Wardell 2006
+ * Copyright (C) 2008 Mark Arigo
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
@@ -17,331 +17,314 @@
  *
  ****************************************************************************/
 
-/* Button Code Definitions for Olympus m:robe 100 target
-   NOTE: COPIED FROM IRIVER H10, NEEDS ADAPTING TO MROBE 100 */
+/* Button Code Definitions for the Olympus m:robe 100 */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 #include "config.h"
 #include "action.h"
 #include "button.h"
 #include "settings.h"
 
-/* {Action Code,    Button code,    Prereq button code } */
-
-/* 
+/*
  * The format of the list is as follows
- * { Action Code,   Button code,    Prereq button code } 
+ * { Action Code,   Button code,    Prereq button code }
  * if there's no need to check the previous button's value, use BUTTON_NONE
- * Insert LAST_ITEM_IN_LIST at the end of each mapping 
+ * Insert LAST_ITEM_IN_LIST at the end of each mapping
  */
+
+/* CONTEXT_CUSTOM's used in this file...
+
+CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
+CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
+                                  i.e where up/down is inc/dec
+               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
+
+*/
+
+
 static const struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,        BUTTON_SCROLL_UP,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,  BUTTON_SCROLL_UP|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,        BUTTON_SCROLL_DOWN,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,  BUTTON_SCROLL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-
-    { ACTION_STD_MENU,        BUTTON_POWER|BUTTON_REL,           BUTTON_POWER },
-    { ACTION_STD_OK,          BUTTON_RIGHT|BUTTON_REL,           BUTTON_RIGHT },
-    { ACTION_STD_CONTEXT,     BUTTON_RIGHT|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_STD_CANCEL,      BUTTON_LEFT|BUTTON_REL,            BUTTON_LEFT },
-    { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT,         BUTTON_NONE },
-    
-    /* TODO: this is a bit of a hack so that we can exit some debug screens
-     * (audio, tagcache, dircache, hwinfo, stack, ports). They don't like it
-     * when ACTION_STD_CANCEL has anything other than BUTTON_NONE for prereq.
-     */
-    { ACTION_STD_CANCEL,      BUTTON_POWER|BUTTON_RIGHT,         BUTTON_NONE },
+    { ACTION_STD_PREV,          BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST
-}; /* button_context_standard */
+    { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_DISPLAY,             BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_POWER,               BUTTON_NONE },
 
-static const struct button_mapping remote_button_context_standard[]  = {
-    { 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_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
+
+    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
+    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
+
+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
+    { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
-}; /* remote_button_context_standard */
+}; /* button_context_standard */
+
 
 static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,     BUTTON_PLAY|BUTTON_REL,   BUTTON_PLAY },
-    { ACTION_WPS_STOP,     BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY },
-    { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL,    BUTTON_REW},
-    { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL,    BUTTON_REW|BUTTON_REPEAT },
-    { ACTION_WPS_SKIPNEXT, BUTTON_FF|BUTTON_REL,     BUTTON_FF },
-    { ACTION_WPS_SEEKFWD,  BUTTON_FF|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK, BUTTON_FF|BUTTON_REL,     BUTTON_FF|BUTTON_REPEAT },
-    
-    { ACTION_WPS_ABSETB_NEXTDIR,    BUTTON_POWER|BUTTON_FF,     BUTTON_POWER },
-    { ACTION_WPS_ABSETA_PREVDIR,    BUTTON_POWER|BUTTON_REW,    BUTTON_POWER },
-    { ACTION_WPS_ABRESET,           BUTTON_POWER|BUTTON_PLAY,   BUTTON_POWER },
-    
-    { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN,              BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE },
-    { ACTION_WPS_VOLUP,   BUTTON_SCROLL_UP,                BUTTON_NONE },
-    { ACTION_WPS_VOLUP,   BUTTON_SCROLL_UP|BUTTON_REPEAT,  BUTTON_NONE },
-    
-    { ACTION_WPS_BROWSE,        BUTTON_LEFT|BUTTON_REL,       BUTTON_LEFT },
-    { ACTION_WPS_CONTEXT,       BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_RIGHT },
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_LEFT },
-    { ACTION_WPS_MENU,          BUTTON_POWER|BUTTON_REL,      BUTTON_POWER },
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_PLAY|BUTTON_LEFT,      BUTTON_PLAY },
-    { ACTION_WPS_ID3SCREEN,     BUTTON_PLAY|BUTTON_RIGHT,     BUTTON_PLAY },
-    
-    LAST_ITEM_IN_LIST
-}; /* button_context_wps */
+    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
 
-static const struct button_mapping remote_button_context_wps[]  = {
-    { ACTION_WPS_PLAY,     BUTTON_RC_PLAY|BUTTON_REL,   BUTTON_RC_PLAY },
-    { ACTION_WPS_STOP,     BUTTON_RC_PLAY|BUTTON_REPEAT,BUTTON_RC_PLAY },
-    { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL,    BUTTON_RC_REW},
-    { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL,    BUTTON_RC_REW|BUTTON_REPEAT },
-    { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL,     BUTTON_RC_FF },
-    { ACTION_WPS_SEEKFWD,  BUTTON_RC_FF|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL,     BUTTON_RC_FF|BUTTON_REPEAT },
-    
-    { 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_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
 
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_RC_PLAY|BUTTON_LEFT,    BUTTON_RC_PLAY },
-    { ACTION_WPS_ID3SCREEN,     BUTTON_RC_PLAY|BUTTON_RIGHT,   BUTTON_RC_PLAY },
-    
-    LAST_ITEM_IN_LIST
-}; /* remote_button_context_wps */
-
-static const struct button_mapping button_context_settings[] = {
-    { ACTION_SETTINGS_INC,      BUTTON_SCROLL_UP,                 BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,      BUTTON_SCROLL_DOWN,               BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_STD_PREV,          BUTTON_LEFT,                      BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_STD_NEXT,          BUTTON_RIGHT,                     BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,    BUTTON_PLAY,                      BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
-}; /* button_context_settings */
+    { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
 
-static const struct button_mapping button_context_list[]  = {
-    { ACTION_LISTTREE_PGUP,         BUTTON_REW|BUTTON_REL,       BUTTON_REW },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_FF|BUTTON_REL,        BUTTON_FF  },
+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_list */
+    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
+    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
+    
+    { ACTION_WPS_BROWSE,        BUTTON_DISPLAY|BUTTON_REL,      BUTTON_DISPLAY },
+    { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_DISPLAY|BUTTON_RIGHT,    BUTTON_NONE },
+    { ACTION_WPS_ABSETA_PREVDIR,BUTTON_DISPLAY|BUTTON_LEFT,     BUTTON_NONE },
+    { ACTION_WPS_ABRESET,       BUTTON_DISPLAY|BUTTON_SELECT,   BUTTON_NONE },
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_DISPLAY|BUTTON_UP,       BUTTON_DISPLAY },
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_DISPLAY|BUTTON_DOWN,     BUTTON_DISPLAY },
+    { ACTION_WPS_ID3SCREEN,     BUTTON_DISPLAY|BUTTON_MENU,     BUTTON_NONE },
 
-static const struct button_mapping remote_button_context_list[]  = {
-    { ACTION_LISTTREE_PGUP,         BUTTON_RC_REW|BUTTON_REL,   BUTTON_RC_REW },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_RC_FF|BUTTON_REL,    BUTTON_RC_FF  },
+    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
+    LAST_ITEM_IN_LIST
+}; /* button_context_wps */
+
+static const struct button_mapping button_context_list[]  = {
+    { ACTION_LISTTREE_PGUP,     BUTTON_DISPLAY|BUTTON_UP,       BUTTON_DISPLAY },
+    { ACTION_LISTTREE_PGUP,     BUTTON_UP|BUTTON_REL,           BUTTON_DISPLAY|BUTTON_UP },
+    { ACTION_LISTTREE_PGUP,     BUTTON_DISPLAY|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_DISPLAY|BUTTON_DOWN,     BUTTON_DISPLAY },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_DOWN|BUTTON_REL,         BUTTON_DISPLAY|BUTTON_DOWN },
+    { ACTION_LISTTREE_PGDOWN,   BUTTON_DISPLAY|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_list */
 
 static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_tree */
+    { ACTION_TREE_WPS,          BUTTON_DISPLAY|BUTTON_REL,      BUTTON_DISPLAY },
+    { ACTION_TREE_STOP,         BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
+    { ACTION_TREE_STOP,         BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_TREE_STOP,         BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
+    { ACTION_TREE_STOP,         BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
 
-static const struct button_mapping remote_button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_RC_PLAY|BUTTON_REL,     BUTTON_RC_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_RC_PLAY|BUTTON_REPEAT,  BUTTON_RC_PLAY },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
 
-static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
-    { ACTION_TREE_ROOT_INIT,    BUTTON_REW|BUTTON_REPEAT,     BUTTON_REW },
-    { ACTION_TREE_PGLEFT,       BUTTON_REW|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_FF|BUTTON_REPEAT,      BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-}; /* button_context_listtree_scroll_without_combo */
+static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
+    { ACTION_NONE,              BUTTON_DISPLAY,                 BUTTON_NONE },
+    { ACTION_TREE_PGLEFT,       BUTTON_DISPLAY|BUTTON_LEFT,     BUTTON_DISPLAY },
+    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,         BUTTON_DISPLAY|BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,       BUTTON_DISPLAY|BUTTON_LEFT,     BUTTON_LEFT|BUTTON_REL },
+    { ACTION_TREE_ROOT_INIT,    BUTTON_DISPLAY|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_DISPLAY|BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,       BUTTON_DISPLAY|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_TREE_PGRIGHT,      BUTTON_DISPLAY|BUTTON_RIGHT,    BUTTON_DISPLAY },
+    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_DISPLAY|BUTTON_RIGHT },
+    { ACTION_TREE_PGRIGHT,      BUTTON_DISPLAY|BUTTON_RIGHT,    BUTTON_RIGHT|BUTTON_REL },
+    { ACTION_TREE_PGRIGHT,      BUTTON_DISPLAY|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
 
-static const struct button_mapping remote_button_context_listtree_scroll_without_combo[]  = {
-    { ACTION_TREE_ROOT_INIT,    BUTTON_RC_REW|BUTTON_REPEAT,  BUTTON_RC_REW },
-    { ACTION_TREE_PGLEFT,       BUTTON_RC_REW|BUTTON_REPEAT,  BUTTON_NONE   },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RC_FF|BUTTON_REPEAT,   BUTTON_NONE   },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-}; /* button_context_listtree_scroll_without_combo */
+};
 
-static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
-    { ACTION_LISTTREE_PGUP,     BUTTON_REW|BUTTON_REPEAT,     BUTTON_REW },
-    { ACTION_LISTTREE_PGDOWN,   BUTTON_FF|BUTTON_REPEAT,      BUTTON_FF  },
-    { ACTION_TREE_PGLEFT,       BUTTON_REW|BUTTON_PLAY,       BUTTON_PLAY },
-    { ACTION_TREE_PGLEFT,       BUTTON_REW|BUTTON_REL,        BUTTON_REW|BUTTON_PLAY },
-    { ACTION_TREE_PGLEFT,       BUTTON_REW|BUTTON_PLAY,       BUTTON_REW|BUTTON_REL },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_REW|BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_REW|BUTTON_PLAY },
-    { ACTION_TREE_PGLEFT,       BUTTON_REW|BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_FF|BUTTON_PLAY,        BUTTON_PLAY },
-    { ACTION_TREE_PGRIGHT,      BUTTON_FF|BUTTON_REL,         BUTTON_FF|BUTTON_PLAY },
-    { ACTION_TREE_PGRIGHT,      BUTTON_FF|BUTTON_PLAY,        BUTTON_FF|BUTTON_REL },
-    { ACTION_TREE_PGRIGHT,      BUTTON_FF|BUTTON_PLAY|BUTTON_REPEAT,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-}; /* button_context_listtree_scroll_with_combo */
-
-static const struct button_mapping remote_button_context_listtree_scroll_with_combo[]  = {
-    { ACTION_LISTTREE_PGUP,     BUTTON_RC_REW|BUTTON_REPEAT,                 BUTTON_RC_REW },
-    { ACTION_LISTTREE_PGDOWN,   BUTTON_RC_FF|BUTTON_REPEAT,                  BUTTON_RC_FF  },
-    { ACTION_TREE_PGLEFT,       BUTTON_RC_REW|BUTTON_RC_PLAY,                BUTTON_RC_PLAY },
-    { ACTION_TREE_PGLEFT,       BUTTON_RC_REW|BUTTON_REL,                    BUTTON_RC_REW|BUTTON_RC_PLAY },
-    { ACTION_TREE_PGLEFT,       BUTTON_RC_REW|BUTTON_RC_PLAY,                BUTTON_RC_REW|BUTTON_REL },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_RC_REW|BUTTON_RC_PLAY|BUTTON_REPEAT,  BUTTON_RC_REW|BUTTON_RC_PLAY },
-    { ACTION_TREE_PGLEFT,       BUTTON_RC_REW|BUTTON_RC_PLAY|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RC_FF|BUTTON_RC_PLAY,                 BUTTON_RC_PLAY },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RC_FF|BUTTON_REL,                     BUTTON_RC_FF|BUTTON_RC_PLAY },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RC_FF|BUTTON_RC_PLAY,                 BUTTON_RC_FF|BUTTON_REL },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RC_FF|BUTTON_RC_PLAY|BUTTON_REPEAT,   BUTTON_NONE },
+static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
+    { ACTION_NONE,              BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
+    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,      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),
-}; /* button_context_listtree_scroll_with_combo */
+};
+
+static const struct button_mapping button_context_settings[]  = {
+    { ACTION_SETTINGS_INC,      BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,      BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_PREV,          BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,    BUTTON_DISPLAY,                 BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings */
+
+static const struct button_mapping button_context_settings_right_is_inc[]  = {
+    { ACTION_SETTINGS_INC,      BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,      BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_PREV,          BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,    BUTTON_DISPLAY,                 BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settingsgraphical */
 
 static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,          BUTTON_RIGHT,              BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+    { ACTION_YESNO_ACCEPT,      BUTTON_SELECT,                  BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings_yesno */
 
-static const struct button_mapping button_context_quickscreen[]  = {
-    { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP,                 BUTTON_NONE },
-    { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_QS_DOWN,    BUTTON_SCROLL_DOWN,               BUTTON_NONE },
-    { ACTION_QS_DOWN,    BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_QS_LEFT,    BUTTON_REW,                       BUTTON_NONE },
-    { ACTION_QS_LEFT,    BUTTON_REW|BUTTON_REPEAT,         BUTTON_NONE },
-    { ACTION_QS_RIGHT,   BUTTON_FF,                        BUTTON_NONE },
-    { ACTION_QS_RIGHT,   BUTTON_FF|BUTTON_REPEAT,          BUTTON_NONE },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
-}; /* button_context_quickscreen */
+static const struct button_mapping button_context_colorchooser[]  = {
+    { ACTION_STD_OK,            BUTTON_DISPLAY|BUTTON_REL,      BUTTON_NONE },
 
-static const struct button_mapping remote_button_context_quickscreen[]  = {
-    { 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 },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
-}; /* button_context_quickscreen */
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_colorchooser */
 
-static const struct button_mapping button_context_settings_right_is_inc[]  = {
-    { ACTION_SETTINGS_INC,       BUTTON_SCROLL_UP,                BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,       BUTTON_SCROLL_DOWN,              BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE },
-    { ACTION_STD_PREV,           BUTTON_REW,                      BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,     BUTTON_REW|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_STD_NEXT,           BUTTON_FF,                       BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,     BUTTON_FF|BUTTON_REPEAT,         BUTTON_NONE },
-    { ACTION_NONE,               BUTTON_RIGHT,                    BUTTON_NONE },
-    { ACTION_STD_OK,             BUTTON_RIGHT,                    BUTTON_NONE },
-    { ACTION_NONE,               BUTTON_LEFT,                     BUTTON_NONE },
-    { ACTION_STD_CANCEL,         BUTTON_LEFT,                     BUTTON_NONE },
+static const struct button_mapping button_context_eq[]  = {
+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,       BUTTON_NONE },
     
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
-}; /* button_context_settings_right_is_inc */
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_eq */
+
+/** Bookmark Screen **/
+static const struct button_mapping button_context_bmark[]  = {
+    { ACTION_BMS_DELETE,        BUTTON_DISPLAY,                 BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+}; /* button_context_bmark */
+
+static const struct button_mapping button_context_time[]  = {
+    { ACTION_STD_CANCEL,        BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_DISPLAY,                 BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+}; /* button_context_time */
+
+static const struct button_mapping button_context_quickscreen[]  = {
+    { ACTION_QS_DOWNINV,        BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_QS_DOWNINV,        BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_DOWN,           BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_QS_DOWN,           BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_QS_LEFT,           BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_QS_LEFT,           BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_QS_RIGHT,          BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_QS_RIGHT,          BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_MENU,                    BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_quickscreen */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
-    { ACTION_PS_INC_SMALL,      BUTTON_SCROLL_UP,                 BUTTON_NONE },
-    { ACTION_PS_INC_BIG,        BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_PS_DEC_SMALL,      BUTTON_SCROLL_DOWN,               BUTTON_NONE },
-    { ACTION_PS_DEC_BIG,        BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFT,     BUTTON_REW,                       BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_REW|BUTTON_REL,            BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHT,    BUTTON_FF,                        BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_FF|BUTTON_REL,             BUTTON_NONE },
-    { ACTION_PS_TOGGLE_MODE,    BUTTON_POWER,                     BUTTON_NONE },
-    { ACTION_PS_RESET,          BUTTON_PLAY,                      BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_LEFT,                      BUTTON_NONE },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
-}; /* button_context_pitchscreen */
-
-static const struct button_mapping remote_button_context_pitchscreen[]  = {
-    { 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_PLAY,                   BUTTON_NONE },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
-}; /* button_context_pitchscreen */
+    { ACTION_PS_INC_SMALL,      BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,    BUTTON_SELECT,                  BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_DISPLAY,                 BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_MENU,                    BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_pitchcreen */
 
 static const struct button_mapping button_context_keyboard[]  = {
-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                      BUTTON_NONE },
-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                     BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_REW,                       BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
-    { ACTION_KBD_ABORT,        BUTTON_POWER,                     BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_UP,                 BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_DOWN,               BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_KBD_MORSE_INPUT,  BUTTON_REW|BUTTON_PLAY,           BUTTON_NONE },
-    { ACTION_KBD_MORSE_SELECT, BUTTON_REW|BUTTON_REL,            BUTTON_NONE },
+    { ACTION_KBD_LEFT,          BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_KBD_LEFT,          BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_RIGHT,         BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_KBD_RIGHT,         BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,   BUTTON_DISPLAY|BUTTON_LEFT,     BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,   BUTTON_DISPLAY|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT,  BUTTON_DISPLAY|BUTTON_RIGHT,    BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT,  BUTTON_DISPLAY|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_SELECT,        BUTTON_SELECT,                  BUTTON_NONE },
+    { ACTION_KBD_PAGE_FLIP,     BUTTON_DISPLAY|BUTTON_MENU,     BUTTON_NONE },
+    { ACTION_KBD_DONE,          BUTTON_DISPLAY|BUTTON_REL,      BUTTON_DISPLAY },
+    { ACTION_KBD_ABORT,         BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
+    { ACTION_KBD_BACKSPACE,     BUTTON_MENU,                    BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,     BUTTON_MENU|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_UP,            BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_KBD_UP,            BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_DOWN,          BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_KBD_DOWN,          BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_MORSE_INPUT,   BUTTON_DISPLAY|BUTTON_POWER,    BUTTON_NONE },
+    { ACTION_KBD_MORSE_SELECT,  BUTTON_SELECT|BUTTON_REL,       BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */
 
-static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_REW,       BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_bmark */
+/*****************************************************************************
+ *    Remote control mappings
+ *****************************************************************************/
 
-const struct button_mapping button_context_recscreen[]  = {
-    { ACTION_REC_PAUSE,             BUTTON_PLAY,                BUTTON_NONE },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
-}; /* button_context_recscreen */
+static const struct button_mapping remote_button_context_standard[]  = {
+    { ACTION_STD_PREV,          BUTTON_RC_PLAY,                 BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,    BUTTON_RC_PLAY|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_RC_DISPLAY,              BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_RC_DISPLAY|BUTTON_REPEAT,BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_RC_REW,                  BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_RC_FF|BUTTON_REL,        BUTTON_RC_FF },
+    { ACTION_STD_CONTEXT,       BUTTON_RC_FF|BUTTON_REPEAT,     BUTTON_RC_FF },
+    { ACTION_STD_MENU,          BUTTON_RC_FAV,                  BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+};
+
+static const struct button_mapping remote_button_context_wps[]  = {
+    { ACTION_WPS_PLAY,          BUTTON_RC_PLAY,                 BUTTON_NONE },
+
+    { ACTION_WPS_SKIPNEXT,      BUTTON_RC_FF|BUTTON_REL,        BUTTON_RC_FF },
+    { ACTION_WPS_SKIPPREV,      BUTTON_RC_REW|BUTTON_REL,       BUTTON_RC_REW },
+
+    { ACTION_WPS_SEEKBACK,      BUTTON_RC_REW|BUTTON_REPEAT,    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_STOP,          BUTTON_RC_PLAY|BUTTON_REPEAT,   BUTTON_RC_PLAY },
+    { ACTION_WPS_MENU,          BUTTON_RC_FAV,                  BUTTON_NONE },
+
+    { 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_REPEAT, BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_RC_VOL_UP,               BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+};
+
+static const struct button_mapping remote_button_context_tree[]  = {
+    { ACTION_TREE_WPS,          BUTTON_RC_PLAY|BUTTON_REL,      BUTTON_RC_PLAY },
+    { ACTION_TREE_STOP,         BUTTON_RC_PLAY|BUTTON_REPEAT,   BUTTON_RC_PLAY },
+    { ACTION_STD_CANCEL,        BUTTON_RC_REW|BUTTON_REPEAT,    BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+};
 
 static const struct button_mapping* get_context_mapping_remote( int context )
 {
     context ^= CONTEXT_REMOTE;
-    
+
     switch (context)
     {
-        case CONTEXT_STD:
-        case CONTEXT_MAINMENU:
-            return remote_button_context_standard;
-            
         case CONTEXT_WPS:
             return remote_button_context_wps;
-
-        case CONTEXT_LIST:
-            return remote_button_context_list;
+        case CONTEXT_MAINMENU:
         case CONTEXT_TREE:
-            if (global_settings.hold_lr_for_scroll_in_list)
-                return remote_button_context_listtree_scroll_without_combo;
-            else 
-                return remote_button_context_listtree_scroll_with_combo;
-        case CONTEXT_CUSTOM|CONTEXT_TREE:
             return remote_button_context_tree;
-            
-        case CONTEXT_QUICKSCREEN:
-            return remote_button_context_quickscreen;
-        case CONTEXT_PITCHSCREEN:
-            return remote_button_context_pitchscreen;
-        case CONTEXT_RECSCREEN:
-            return button_context_recscreen;
-
-        default:
-            return remote_button_context_standard;
     }
+    return remote_button_context_standard;
 }
 
-/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
 const struct button_mapping* get_context_mapping(int context)
 {
     if (context&CONTEXT_REMOTE)
@@ -351,17 +334,16 @@ const struct button_mapping* get_context_mapping(int context)
     {
         case CONTEXT_STD:
             return button_context_standard;
-            
         case CONTEXT_WPS:
             return button_context_wps;
 
         case CONTEXT_LIST:
             return button_context_list;
-        case CONTEXT_TREE:
         case CONTEXT_MAINMENU:
+        case CONTEXT_TREE:
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_listtree_scroll_without_combo;
-            else 
+            else
                 return button_context_listtree_scroll_with_combo;
         case CONTEXT_CUSTOM|CONTEXT_TREE:
             return button_context_tree;
@@ -369,13 +351,18 @@ const struct button_mapping* get_context_mapping(int context)
         case CONTEXT_SETTINGS:
             return button_context_settings;
         case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
+            return button_context_settings_right_is_inc;
+
         case CONTEXT_SETTINGS_COLOURCHOOSER:
+            return button_context_colorchooser;
         case CONTEXT_SETTINGS_EQ:
+            return button_context_eq;
+
         case CONTEXT_SETTINGS_TIME:
-            return button_context_settings_right_is_inc;
-            
+            return button_context_time;
+
         case CONTEXT_YESNOSCREEN:
-            return button_context_yesno;            
+            return button_context_yesno;
         case CONTEXT_BOOKMARKSCREEN:
             return button_context_bmark;
         case CONTEXT_QUICKSCREEN:
@@ -384,11 +371,6 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_pitchscreen;
         case CONTEXT_KEYBOARD:
             return button_context_keyboard;
-        case CONTEXT_RECSCREEN:
-            return button_context_recscreen;
-
-        default:
-            return button_context_standard;
-    } 
+    }
     return button_context_standard;
 }