2 files changed, 28 insertions, 6 deletions

diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index d1e863246a..d8a5548613 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -670,13 +670,35 @@ const struct button_mapping button_context_radio_h100remote[]  = {
     { ACTION_FM_EXIT,        BUTTON_RC_MODE | BUTTON_REL,            BUTTON_RC_MODE },
     { ACTION_FM_PLAY,        BUTTON_RC_ON | BUTTON_REL,              BUTTON_RC_ON },
     { ACTION_FM_NEXT_PRESET, BUTTON_RC_BITRATE,                      BUTTON_NONE },
-    { ACTION_FM_PREV_PRESET, BUTTON_RC_SOURCE,                      BUTTON_NONE },
+    { ACTION_FM_PREV_PRESET, BUTTON_RC_SOURCE,                       BUTTON_NONE },
+    { 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__NEXTLIST(CONTEXT_SETTINGS)
+    LAST_ITEM_IN_LIST
 };
 
-const struct button_mapping *button_context_radio_h300lcdremote =
-                button_context_radio_h100remote;
+const struct button_mapping button_context_radio_h300lcdremote[] = {
+    { ACTION_FM_MENU,        BUTTON_RC_MENU | BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_FM_PRESET,      BUTTON_RC_MENU | BUTTON_REL,            BUTTON_RC_MENU },
+    { ACTION_FM_STOP,        BUTTON_RC_STOP,                         BUTTON_NONE },
+    { ACTION_FM_MODE,        BUTTON_RC_ON | BUTTON_REPEAT,           BUTTON_RC_ON },
+    { ACTION_FM_EXIT,        BUTTON_RC_MODE | BUTTON_REL,            BUTTON_RC_MODE },
+    { ACTION_FM_PLAY,        BUTTON_RC_ON | BUTTON_REL,              BUTTON_RC_ON },
+    { ACTION_FM_NEXT_PRESET, BUTTON_RC_BITRATE,                      BUTTON_NONE },
+    { ACTION_FM_PREV_PRESET, BUTTON_RC_SOURCE,                       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__NEXTLIST(CONTEXT_SETTINGS)
+};
 
 /* the actual used tables */
 static const struct button_mapping 
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index ece5d97a71..ddde3e9a79 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -73,6 +73,8 @@
 #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
 #define FM_PRESET
 #define FM_MODE
+#define FM_NEXT_PRESET
+#define FM_PREV_PRESET
 
 #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
 #define FM_PRESET
@@ -760,8 +762,6 @@ bool radio_screen(void)
         if (button != ACTION_NONE)
             lastbutton = button;
 
-       // action_signalscreenchange();
-
 #if CONFIG_CODEC != SWCODEC
         peak_meter_peek();
 #endif