summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoshe Piekarski <mendelmunkis@protonmail.com>2019-06-11 11:09:36 -0400
committerSolomon Peachy <pizza@shaftnet.org>2019-08-04 01:56:51 +0200
commit9d79cefc91aaf136723c4693f11cd1bafa6dec93 (patch)
treecbf2f981a2d108608221ebc98c35aa6bfc94d4e6
parenta18803af27f5a34fb45d7938c7f1b159f8066e34 (diff)
downloadrockbox-9d79cefc91aaf136723c4693f11cd1bafa6dec93.tar.gz
rockbox-9d79cefc91aaf136723c4693f11cd1bafa6dec93.zip
Fuze+ hotkeys and quickscreen
Add bottom left as quickscreen and bottom right as hotkey acroos the board for fuze+. Meant as a stopgap until gesture support becomes good enough that it is unnecessary Also adds my name to CREDITS Change-Id: If1729b7d53d967081b6d97a9a49cd66312c96ed4
-rw-r--r--apps/keymaps/keymap-fuzeplus.c16
-rw-r--r--docs/CREDITS1
-rw-r--r--manual/platform/keymap-sansafuzeplus.tex6
3 files changed, 12 insertions, 11 deletions
diff --git a/apps/keymaps/keymap-fuzeplus.c b/apps/keymaps/keymap-fuzeplus.c
index 8e71da08c4..a09d4adbfc 100644
--- a/apps/keymaps/keymap-fuzeplus.c
+++ b/apps/keymaps/keymap-fuzeplus.c
@@ -50,10 +50,10 @@ static const struct button_mapping button_context_standard[] = {
50 50
51 { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, 51 { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE },
52 52
53/* { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, 53 { ACTION_STD_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT },
54 { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, 54// { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
55 { ACTION_STD_HOTKEY, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, 55 { ACTION_STD_HOTKEY, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT },
56 on some gesture later? */ 56// on some gesture later?
57 57
58 LAST_ITEM_IN_LIST 58 LAST_ITEM_IN_LIST
59}; /* button_context_standard */ 59}; /* button_context_standard */
@@ -155,12 +155,12 @@ static const struct button_mapping button_context_list[] = {
155 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, 155 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
156 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 156 { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
157#endif 157#endif
158 { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT, BUTTON_NONE }, 158// { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT, BUTTON_NONE },
159 { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_NONE }, 159 { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_NONE },
160 { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, 160// { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT, BUTTON_NONE },
161 { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_NONE }, 161 { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_NONE },
162/*#ifdef HAVE_HOTKEY on some gesture later? 162#ifdef HAVE_HOTKEY //on some gesture later?
163 { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL, BUTTON_BACK|BUTTON_REPEAT }, 163 { ACTION_TREE_HOTKEY, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT },
164#endif*/ 164#endif*/
165 165
166 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 166 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
diff --git a/docs/CREDITS b/docs/CREDITS
index e87e54ef12..e2b844a9e6 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -675,6 +675,7 @@ Nathan Follens
675Gergely Békési 675Gergely Békési
676Stephane Doyon 676Stephane Doyon
677Alex Wallis 677Alex Wallis
678Moshe Piekarski
678Christian Soffke 679Christian Soffke
679Juan Gonzalez 680Juan Gonzalez
680Yangyong Wu 681Yangyong Wu
diff --git a/manual/platform/keymap-sansafuzeplus.tex b/manual/platform/keymap-sansafuzeplus.tex
index bd77fd2391..878a9468aa 100644
--- a/manual/platform/keymap-sansafuzeplus.tex
+++ b/manual/platform/keymap-sansafuzeplus.tex
@@ -25,7 +25,7 @@
25\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} 25\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
26 26
27\newcommand{\ActionStdRec}{\fixme{tbd}} 27\newcommand{\ActionStdRec}{\fixme{tbd}}
28\newcommand{\ActionStdQuickScreen}{\fixme{tbd}} 28\newcommand{\ActionStdQuickScreen}{\ButtonBottomLeft}
29\newcommand{\ActionStdMenu}{\fixme{tbd}} 29\newcommand{\ActionStdMenu}{\fixme{tbd}}
30\newcommand{\ActionQuickScreenExit}{Any corner keys or \ButtonSelect} 30\newcommand{\ActionQuickScreenExit}{Any corner keys or \ButtonSelect}
31 31
@@ -62,8 +62,8 @@
62 62
63\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} 63\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
64\newcommand{\ActionTreeParentDirectory}{\ButtonBack{} or \ButtonLeft} 64\newcommand{\ActionTreeParentDirectory}{\ButtonBack{} or \ButtonLeft}
65\newcommand{\ActionTreeHotkey}{\fixme{tbd}} 65\newcommand{\ActionTreeHotkey}{\ButtonBottomRight}
66\newcommand{\ActionTreeQuickScreen}{\fixme{tbd}} 66\newcommand{\ActionTreeQuickScreen}{\ButtonBottomLeft}
67 67
68%Button actions, YesNo context 68%Button actions, YesNo context
69\newcommand{\ActionYesNoAccept}{\ButtonSelect} 69\newcommand{\ActionYesNoAccept}{\ButtonSelect}