1 files changed, 32 insertions, 39 deletions

diff --git a/apps/keymaps/keymap-mpio-hd300.c b/apps/keymaps/keymap-mpio-hd300.c
index a849635b7d..2e0b9c06a5 100644
--- a/apps/keymaps/keymap-mpio-hd300.c
+++ b/apps/keymaps/keymap-mpio-hd300.c
@@ -35,10 +35,10 @@
  *****************************************************************************/
 
 static const struct button_mapping button_context_standard[]  = {
-    { 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_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_STD_OK,             BUTTON_ENTER|BUTTON_REL,       BUTTON_ENTER },
     { ACTION_STD_CANCEL,         BUTTON_MENU|BUTTON_REL,        BUTTON_MENU  },
     { ACTION_STD_CONTEXT,        BUTTON_ENTER|BUTTON_REPEAT,    BUTTON_ENTER },
@@ -73,10 +73,10 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_SKIPNEXT,       BUTTON_FF|BUTTON_REL,          BUTTON_FF },
     { ACTION_WPS_SKIPPREV,       BUTTON_REW|BUTTON_REL,         BUTTON_REW },
     { ACTION_WPS_STOP,           BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
-    { ACTION_WPS_VOLDOWN,        BUTTON_DOWN,               BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,        BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_WPS_VOLUP,          BUTTON_UP,                 BUTTON_NONE }, 
-    { ACTION_WPS_VOLUP,          BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,        BUTTON_DOWN,                   BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,        BUTTON_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_VOLUP,          BUTTON_UP,                     BUTTON_NONE }, 
+    { ACTION_WPS_VOLUP,          BUTTON_UP|BUTTON_REPEAT,       BUTTON_NONE },
 /*  { ACTION_WPS_PITCHSCREEN,    BUTTON_,                       BUTTON_ }, */
 /*  { ACTION_WPS_ID3SCREEN,      BUTTON_,                       BUTTON_ }, */ 
     { ACTION_WPS_CONTEXT,        BUTTON_ENTER|BUTTON_REPEAT,    BUTTON_ENTER },
@@ -93,11 +93,11 @@ static const struct button_mapping button_context_wps[]  = {
 }; /* button_context_wps */
 
 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_INCBIGSTEP,BUTTON_,                       BUTTON_ }, */
-    { ACTION_SETTINGS_DEC,       BUTTON_DOWN,               BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_INC,       BUTTON_UP,                     BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT,       BUTTON_NONE },
+/*    { ACTION_SETTINGS_INCBIGSTEP,BUTTON_,                     BUTTON_ }, */
+    { ACTION_SETTINGS_DEC,       BUTTON_DOWN,                   BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
 /*  { ACTION_SETTINGS_DECBIGSTEP,BUTTON_,                       BUTTON_ }, */
     { ACTION_STD_PREV,           BUTTON_REW,                    BUTTON_NONE  },
     { ACTION_STD_PREVREPEAT,     BUTTON_REW|BUTTON_REPEAT,      BUTTON_NONE  },
@@ -120,12 +120,6 @@ static const struct button_mapping button_context_bmark[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
-static const struct button_mapping button_context_time[]  = {
-    { ACTION_STD_CANCEL,       BUTTON_MENU,  BUTTON_NONE },
-    { ACTION_STD_OK,           BUTTON_ENTER,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_time */
-
 /*
 static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_LEFT,            BUTTON_VOL_DOWN,               BUTTON_NONE },
@@ -141,17 +135,17 @@ static const struct button_mapping button_context_quickscreen[]  = {
 };*/  /* button_context_quickscreen */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
-//    { ACTION_PS_INC_SMALL,       BUTTON_VOL_UP,                 BUTTON_NONE },
-//    { ACTION_PS_INC_BIG,         BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-//    { ACTION_PS_DEC_SMALL,       BUTTON_VOL_DOWN,               BUTTON_NONE },
-//    { ACTION_PS_DEC_BIG,         BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+/*  { ACTION_PS_INC_SMALL,       BUTTON_VOL_UP,                 BUTTON_NONE }, */
+/*  { ACTION_PS_INC_BIG,         BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE }, */
+/*  { ACTION_PS_DEC_SMALL,       BUTTON_VOL_DOWN,               BUTTON_NONE }, */
+/*  { ACTION_PS_DEC_BIG,         BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, */
     { ACTION_PS_NUDGE_LEFT,      BUTTON_REW,                    BUTTON_NONE },
     { ACTION_PS_NUDGE_RIGHT,     BUTTON_FF,                     BUTTON_NONE },
     { ACTION_PS_NUDGE_LEFTOFF,   BUTTON_REW|BUTTON_REL,         BUTTON_NONE },
     { ACTION_PS_NUDGE_RIGHTOFF,  BUTTON_FF|BUTTON_REL,          BUTTON_NONE },
     { ACTION_PS_TOGGLE_MODE,     BUTTON_PLAY,                   BUTTON_NONE },
-    { ACTION_PS_RESET,           BUTTON_ENTER,                   BUTTON_NONE },
-    { ACTION_PS_EXIT,            BUTTON_MENU,                    BUTTON_NONE },
+    { ACTION_PS_RESET,           BUTTON_ENTER,                  BUTTON_NONE },
+    { ACTION_PS_EXIT,            BUTTON_MENU,                   BUTTON_NONE },
     { ACTION_PS_SLOWER,          BUTTON_REW|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_PS_FASTER,          BUTTON_FF|BUTTON_REPEAT,       BUTTON_NONE },
 
@@ -159,17 +153,17 @@ static const struct button_mapping button_context_pitchscreen[]  = {
 }; /* button_context_pitchscreen */
 
 static const struct button_mapping button_context_radio[]  = {
-    { ACTION_FM_MENU,            BUTTON_ENTER|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_FM_PRESET,          BUTTON_ENTER|BUTTON_REL,        BUTTON_ENTER },
-/*  { ACTION_FM_RECORD,          BUTTON_,      BUTTON_ }, */
+    { ACTION_FM_MENU,            BUTTON_ENTER|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_FM_PRESET,          BUTTON_ENTER|BUTTON_REL,       BUTTON_ENTER },
+/*  { ACTION_FM_RECORD,          BUTTON_,                       BUTTON_ }, */
 /*  { ACTION_FM_FREEZE,          BUTTON_,                       BUTTON_ }, */
-    { ACTION_FM_STOP,            BUTTON_MENU|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_FM_STOP,            BUTTON_MENU|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_FM_MODE,            BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
-    { ACTION_FM_EXIT,            BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
+    { ACTION_FM_EXIT,            BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
     { ACTION_FM_PLAY,            BUTTON_PLAY|BUTTON_REL,        BUTTON_PLAY },
 /*  { ACTION_FM_RECORD_DBLPRE,   BUTTON_,                       BUTTON_ }, */
-    { ACTION_FM_NEXT_PRESET,     BUTTON_FF,                       BUTTON_NONE },
-    { ACTION_FM_PREV_PRESET,     BUTTON_REW,                      BUTTON_NONE },
+    { ACTION_FM_NEXT_PRESET,     BUTTON_FF,                     BUTTON_NONE },
+    { ACTION_FM_PREV_PRESET,     BUTTON_REW,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
@@ -231,10 +225,10 @@ const struct button_mapping* get_context_mapping(int context)
 
         case CONTEXT_BOOKMARKSCREEN:
             return button_context_bmark;
-
-//        case CONTEXT_QUICKSCREEN:
-//            return button_context_quickscreen;
-
+/*
+        case CONTEXT_QUICKSCREEN:
+            return button_context_quickscreen;
+*/
         case CONTEXT_PITCHSCREEN:
             return button_context_pitchscreen;
 
@@ -244,10 +238,9 @@ const struct button_mapping* get_context_mapping(int context)
 
         case CONTEXT_SETTINGS:
         case CONTEXT_SETTINGS_EQ:
-            return button_context_settings;
-
         case CONTEXT_SETTINGS_TIME:
-            return button_context_time;
+        case CONTEXT_SETTINGS_RECTRIGGER:
+            return button_context_settings;
 
         case CONTEXT_TREE:
         case CONTEXT_MAINMENU: