summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor B. Poretsky <poretsky@mlbox.ru>2017-02-04 12:37:56 +0300
committerSolomon Peachy <pizza@shaftnet.org>2020-07-14 12:42:16 +0000
commit30fb53d47f7f96019956de32a94f3c77fd9aa609 (patch)
treea2eb28b9ae470ccf5037f5ae2d46aab3c318667f
parent45915101d5338963e6359258513215a723ba1fd2 (diff)
downloadrockbox-30fb53d47f7f96019956de32a94f3c77fd9aa609.tar.gz
rockbox-30fb53d47f7f96019956de32a94f3c77fd9aa609.tar.bz2
rockbox-30fb53d47f7f96019956de32a94f3c77fd9aa609.zip
Enabled hotkey for Sansa Clip players
Change-Id: Ic0fb331415bf0cc0fce5916befce64f4a41c46ee
-rw-r--r--apps/keymaps/keymap-clip.c7
-rw-r--r--firmware/export/config/sansaclip.h2
-rw-r--r--firmware/export/config/sansaclipplus.h2
-rw-r--r--firmware/export/config/sansaclipv2.h2
-rw-r--r--firmware/export/config/sansaclipzip.h2
-rw-r--r--manual/platform/keymap-sansaclip.tex2
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}