ErosQ: Small keymap changes

- Move WPS Stop to Power (Hold)
- Add WPS Hotkey to Wheel scroll Fwd/Back
- Add WPS Quickscreen to Play (Hold)
- Add Tree Hotkey to Play (Hold)

Change-Id: Id74622138353521f736c0de1009a354307b108eb

2 files changed, 15 insertions, 26 deletions

diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c
index 71c9b39171..59b70d24ca 100644
--- a/apps/keymaps/keymap-erosq.c
+++ b/apps/keymaps/keymap-erosq.c
@@ -39,16 +39,11 @@ static const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_NEXT,       BUTTON_NEXT,                   BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_STD_OK,         BUTTON_PLAY|BUTTON_REL,        BUTTON_PLAY },
-    { ACTION_STD_CANCEL,     BUTTON_BACK|BUTTON_REL,        BUTTON_BACK }, // release just because it feels better to use
+    { ACTION_STD_HOTKEY,     BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
+    { ACTION_STD_CANCEL,     BUTTON_BACK|BUTTON_REL,        BUTTON_BACK },
     { ACTION_STD_CONTEXT,    BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
     { ACTION_STD_MENU,       BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
-    { ACTION_STD_KEYLOCK,    BUTTON_POWER,                  BUTTON_NONE },
-
-/*    ACTION_STD_QUICKSCREEN,
- *    ACTION_STD_KEYLOCK
- *    ACTION_STD_REC
- *    ACTION_STD_HOTKEY
- */
+    { ACTION_STD_KEYLOCK,    BUTTON_POWER|BUTTON_REL,       BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
@@ -67,34 +62,32 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_STOPSEEK,    BUTTON_PREV|BUTTON_REL,        BUTTON_PREV|BUTTON_REPEAT },
     { ACTION_WPS_SKIPNEXT,    BUTTON_NEXT|BUTTON_REL,        BUTTON_NEXT },
     { ACTION_WPS_SKIPPREV,    BUTTON_PREV|BUTTON_REL,        BUTTON_PREV },
-    { ACTION_WPS_STOP,        BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
+    { ACTION_WPS_QUICKSCREEN, BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
+    { ACTION_WPS_HOTKEY,      BUTTON_SCROLL_BACK,            BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,      BUTTON_SCROLL_FWD,             BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,     BUTTON_VOL_DOWN,               BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,     BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_WPS_VOLUP,       BUTTON_VOL_UP,                 BUTTON_NONE },
     { ACTION_WPS_VOLUP,       BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
 /*    ACTION_WPS_ID3SCREEN    optional */
     { ACTION_WPS_CONTEXT,     BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
-//    { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_DOWN },
     { ACTION_WPS_MENU,        BUTTON_MENU|BUTTON_REL,        BUTTON_MENU }, /* this should be the same as ACTION_STD_MENU */
 /*    ACTION_WPS_VIEW_PLAYLIST
  *    ACTION_WPS_LIST_BOOKMARKS,  optional
  *    ACTION_WPS_CREATE_BOOKMARK, optional
  */
-    { ACTION_STD_KEYLOCK,     BUTTON_POWER,                 BUTTON_NONE },
+    { ACTION_STD_KEYLOCK,     BUTTON_POWER|BUTTON_REL,                 BUTTON_POWER },
+    { ACTION_WPS_STOP,        BUTTON_POWER|BUTTON_REPEAT,               BUTTON_POWER },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 
 static const struct button_mapping button_context_settings[] = {
     { ACTION_SETTINGS_INC,      BUTTON_SCROLL_FWD,               BUTTON_NONE },
-//    { ACTION_SETTINGS_INCREPEAT, BUTTON_VOLUP|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_SETTINGS_INCBIGSTEP, BUTTON_VOL_UP,                 BUTTON_NONE },
     { ACTION_SETTINGS_DEC,       BUTTON_SCROLL_BACK,             BUTTON_NONE },
-//    { ACTION_SETTINGS_DECREPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_SETTINGS_DECBIGSTEP, BUTTON_VOL_DOWN,               BUTTON_NONE },
-/*    ACTION_SETTINGS_DECBIGSTEP */
     { ACTION_SETTINGS_RESET,     BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
-/*    ACTION_SETTINGS_SET, Used by touchscreen targets */
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_settings */
 
@@ -117,9 +110,9 @@ static const struct button_mapping button_context_tree[]  = {
 /*
     { ACTION_TREE_WPS,        BUTTON_OPTION|BUTTON_REL,         BUTTON_OPTION },
     { ACTION_TREE_STOP,       BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
-    { ACTION_TREE_HOTKEY,     BUTTON_HOME|BUTTON_REPEAT,        BUTTON_HOME },
 */
-    { ACTION_STD_MENU,        BUTTON_MENU,      BUTTON_MENU },
+    { ACTION_TREE_HOTKEY,     BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_PLAY },
+    { ACTION_STD_MENU,        BUTTON_MENU|BUTTON_REL,                      BUTTON_MENU },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_tree */
@@ -133,10 +126,10 @@ static const struct button_mapping button_context_yesno[]  = {
 static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_TOP,   BUTTON_PREV|BUTTON_REL,        BUTTON_NONE },
     { ACTION_QS_TOP,   BUTTON_PREV|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_QS_DOWN,  BUTTON_SCROLL_FWD|BUTTON_REL,  BUTTON_NONE },
-    { ACTION_QS_LEFT,  BUTTON_SCROLL_BACK|BUTTON_REL, BUTTON_NONE },
-    { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REL,        BUTTON_NONE },
-    { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_QS_RIGHT,  BUTTON_SCROLL_FWD,  BUTTON_NONE },
+    { ACTION_QS_LEFT,  BUTTON_SCROLL_BACK, BUTTON_NONE },
+    { ACTION_QS_DOWN, BUTTON_NEXT|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_QS_DOWN, BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
@@ -150,12 +143,9 @@ static const struct button_mapping button_context_settings_time[] = {
     { ACTION_STD_CANCEL,         BUTTON_BACK|BUTTON_REPEAT,  BUTTON_BACK },
     { ACTION_STD_OK,             BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY },
     { ACTION_SETTINGS_INC,       BUTTON_SCROLL_FWD,          BUTTON_NONE },
-//    { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_SETTINGS_DEC,       BUTTON_SCROLL_BACK,         BUTTON_NONE },
-//    { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
-    //LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_settings_time */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
@@ -164,9 +154,7 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_DEC_SMALL,      BUTTON_SCROLL_BACK,           BUTTON_NONE },
     { ACTION_PS_DEC_BIG,        BUTTON_VOL_DOWN,              BUTTON_NONE },
     { ACTION_PS_NUDGE_LEFT,     BUTTON_PREV,                  BUTTON_NONE },
-/*    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,       BUTTON_NONE }, */
     { ACTION_PS_NUDGE_RIGHT,    BUTTON_NEXT,                  BUTTON_NONE },
-/*    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,      BUTTON_NONE }, */
     { ACTION_PS_TOGGLE_MODE,    BUTTON_PLAY|BUTTON_REL,       BUTTON_PLAY },
     { ACTION_PS_RESET,          BUTTON_PLAY|BUTTON_REPEAT,    BUTTON_PLAY },
     { ACTION_PS_EXIT,           BUTTON_BACK,                  BUTTON_NONE },
diff --git a/firmware/export/config/aigoerosq.h b/firmware/export/config/aigoerosq.h
index 2d0f7a0cdf..bfaa323968 100644
--- a/firmware/export/config/aigoerosq.h
+++ b/firmware/export/config/aigoerosq.h
@@ -15,6 +15,7 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+#define HAVE_HOTKEY
 
 #define HAVE_HEADPHONE_DETECTION
 #define HAVE_LINEOUT_DETECTION