From 30fb53d47f7f96019956de32a94f3c77fd9aa609 Mon Sep 17 00:00:00 2001 From: "Igor B. Poretsky" Date: Sat, 4 Feb 2017 12:37:56 +0300 Subject: Enabled hotkey for Sansa Clip players Change-Id: Ic0fb331415bf0cc0fce5916befce64f4a41c46ee --- apps/keymaps/keymap-clip.c | 7 +++---- firmware/export/config/sansaclip.h | 2 +- firmware/export/config/sansaclipplus.h | 2 +- firmware/export/config/sansaclipv2.h | 2 +- firmware/export/config/sansaclipzip.h | 2 +- manual/platform/keymap-sansaclip.tex | 2 ++ 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index 378c8a7439..7c8fb69471 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c @@ -84,10 +84,9 @@ static const struct button_mapping button_context_wps[] = { { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, #ifdef HAVE_HOTKEY /* down|repeat doesn't work in the file browser */ - { ACTION_WPS_HOTKEY, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, -#else - { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_HOTKEY, BUTTON_DOWN, BUTTON_NONE }, #endif + { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, #ifndef HAS_BUTTON_HOLD /* Clip+ */ { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE }, @@ -137,7 +136,7 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, #ifdef HAVE_HOTKEY -// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, + { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_DOWN, BUTTON_HOME }, #endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h index cdee43d44a..35496e5fda 100644 --- a/firmware/export/config/sansaclip.h +++ b/firmware/export/config/sansaclip.h @@ -207,4 +207,4 @@ #define DEFAULT_REC_RIGHT_GAIN 23 /* Define this if a programmable hotkey is mapped */ -//#define HAVE_HOTKEY +#define HAVE_HOTKEY diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index addf7d86c0..851884da36 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h @@ -229,4 +229,4 @@ #define DEFAULT_REC_RIGHT_GAIN 23 /* Define this if a programmable hotkey is mapped */ -//#define HAVE_HOTKEY +#define HAVE_HOTKEY diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index cf3f90e363..581f6e900f 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h @@ -223,4 +223,4 @@ #define DEFAULT_REC_RIGHT_GAIN 23 /* Define this if a programmable hotkey is mapped */ -//#define HAVE_HOTKEY +#define HAVE_HOTKEY diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index fc9f558eef..8c2e3404d4 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h @@ -228,4 +228,4 @@ #define DEFAULT_REC_RIGHT_GAIN 23 /* Define this if a programmable hotkey is mapped */ -//#define HAVE_HOTKEY +#define HAVE_HOTKEY diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-sansaclip.tex index 49a98fd67a..83a16135ed 100644 --- a/manual/platform/keymap-sansaclip.tex +++ b/manual/platform/keymap-sansaclip.tex @@ -42,6 +42,7 @@ \newcommand{\ActionWpsPitchScreen}{Long \ButtonUp} \newcommand{\ActionWpsPlaylist}{Long \ButtonDown} \newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown} +\newcommand{\ActionWpsHotkey}{\ButtonDown} \newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight} \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft} @@ -52,6 +53,7 @@ \newcommand{\ActionTreeStop}{\ButtonPower} \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} \newcommand{\ActionTreeParentDirectory}{\ButtonLeft} +\newcommand{\ActionTreeHotkey}{\ButtonHome{} + \ButtonDown} %Button actions, YesNo context \newcommand{\ActionYesNoAccept}{\ButtonSelect} -- cgit v1.2.3