From 9d79cefc91aaf136723c4693f11cd1bafa6dec93 Mon Sep 17 00:00:00 2001 From: Moshe Piekarski Date: Tue, 11 Jun 2019 11:09:36 -0400 Subject: 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 --- apps/keymaps/keymap-fuzeplus.c | 16 ++++++++-------- docs/CREDITS | 1 + manual/platform/keymap-sansafuzeplus.tex | 6 +++--- 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[] = { { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, -/* { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, - { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, - { ACTION_STD_HOTKEY, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, - on some gesture later? */ + { ACTION_STD_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, +// { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, + { ACTION_STD_HOTKEY, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, +// on some gesture later? LAST_ITEM_IN_LIST }; /* button_context_standard */ @@ -155,12 +155,12 @@ static const struct button_mapping button_context_list[] = { { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, #endif - { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT, BUTTON_NONE }, +// { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT, BUTTON_NONE }, { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, +// { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_NONE }, -/*#ifdef HAVE_HOTKEY on some gesture later? - { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL, BUTTON_BACK|BUTTON_REPEAT }, +#ifdef HAVE_HOTKEY //on some gesture later? + { ACTION_TREE_HOTKEY, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, #endif*/ 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 Gergely Békési Stephane Doyon Alex Wallis +Moshe Piekarski Christian Soffke Juan Gonzalez Yangyong 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 @@ \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} \newcommand{\ActionStdRec}{\fixme{tbd}} -\newcommand{\ActionStdQuickScreen}{\fixme{tbd}} +\newcommand{\ActionStdQuickScreen}{\ButtonBottomLeft} \newcommand{\ActionStdMenu}{\fixme{tbd}} \newcommand{\ActionQuickScreenExit}{Any corner keys or \ButtonSelect} @@ -62,8 +62,8 @@ \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} \newcommand{\ActionTreeParentDirectory}{\ButtonBack{} or \ButtonLeft} -\newcommand{\ActionTreeHotkey}{\fixme{tbd}} -\newcommand{\ActionTreeQuickScreen}{\fixme{tbd}} +\newcommand{\ActionTreeHotkey}{\ButtonBottomRight} +\newcommand{\ActionTreeQuickScreen}{\ButtonBottomLeft} %Button actions, YesNo context \newcommand{\ActionYesNoAccept}{\ButtonSelect} -- cgit v1.2.3