From 5cbeb88541ebbfe388b3d60a1c7564b556b9748b Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 16 May 2021 16:44:01 +0100 Subject: FiiO M3K: keymap improvements & fixes - Add support for skip and seek while the player is locked. (Thanks to @bahus for the suggestion) - Fix touch zones because the down button zone ended up being a lot smaller than expected due to the touchpad's wonkiness. Also added a visual display of the touchpad to its debug menu. - Fixes the pictureflow keymap because it was mostly unusable. Change-Id: Ic0da4f8df3613ff7828ce1cb940ed9e77ada3281 --- apps/keymaps/keymap-fiiom3k.c | 19 +++++++++++++++++++ apps/plugins/pictureflow/pictureflow.c | 9 +++++++++ 2 files changed, 28 insertions(+) (limited to 'apps') diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c index 440f851650..94d2dbc172 100644 --- a/apps/keymaps/keymap-fiiom3k.c +++ b/apps/keymaps/keymap-fiiom3k.c @@ -76,6 +76,16 @@ static const struct button_mapping button_context_wps[] = { LAST_ITEM_IN_LIST }; /* button_context_wps */ +static const struct button_mapping button_context_wps_locked[] = { + {ACTION_WPS_SKIPNEXT, BUTTON_VOL_UP|BUTTON_REL, BUTTON_PLAY|BUTTON_VOL_UP}, + {ACTION_WPS_SEEKFWD, BUTTON_PLAY|BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, + {ACTION_WPS_STOPSEEK, BUTTON_PLAY|BUTTON_VOL_UP|BUTTON_REL, BUTTON_PLAY|BUTTON_VOL_UP|BUTTON_REPEAT}, + {ACTION_WPS_SKIPPREV, BUTTON_VOL_DOWN|BUTTON_REL, BUTTON_PLAY|BUTTON_VOL_DOWN}, + {ACTION_WPS_SEEKBACK, BUTTON_PLAY|BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, + {ACTION_WPS_STOPSEEK, BUTTON_PLAY|BUTTON_VOL_DOWN|BUTTON_REL, BUTTON_PLAY|BUTTON_VOL_DOWN|BUTTON_REPEAT}, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_WPS) +}; /* button_context_wps_locked */ + static const struct button_mapping button_context_tree[] = { {ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY}, {ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK}, @@ -242,6 +252,15 @@ static const struct button_mapping button_context_usb_hid_mode_browser[] = { const struct button_mapping* get_context_mapping(int context) { + switch (context) + { + case CONTEXT_WPS|CONTEXT_LOCKED: + return button_context_wps_locked; + default: + context &= ~CONTEXT_LOCKED; + break; + } + switch (context) { default: diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 9faf53661e..9731d92d35 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -148,6 +148,15 @@ const struct button_mapping pf_context_buttons[] = {PF_CONTEXT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_FFWD}, {PF_TRACKLIST, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD}, {PF_WPS, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY}, +#elif CONFIG_KEYPAD == FIIO_M3K_PAD + {PF_PREV, BUTTON_LEFT, BUTTON_NONE}, + {PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, + {PF_NEXT, BUTTON_RIGHT, BUTTON_NONE}, + {PF_NEXT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, + {PF_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, + {PF_QUIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER}, + {PF_CONTEXT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU}, + {PF_TRACKLIST, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, #endif #if CONFIG_KEYPAD == IAUDIO_M3_PAD LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD|CONTEXT_REMOTE) -- cgit v1.2.3