[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rockbox-cvs
Subject:    Shanling Q1: minor update to keymap
From:       rockbox-gerrit-noreply--- via rockbox-cvs <rockbox-cvs () cool ! haxx ! se>
Date:       2021-08-25 22:38:36
Message-ID: 202108252238.17PMcaYM495169 () stuffed ! shaftnet ! org
[Download RAW message or body]

commit cbf1970b563e5fd5ef5b20f7dde47db80343bd30
Author: Aidan MacDonald <amachronic@protonmail.com>
Date:   Mon Aug 23 12:34:25 2021 +0100

    Shanling Q1: minor update to keymap
    
    - Enable repeat for prev/next keys
    - Provide a way to access the context menu using buttons
    - Update the manual
    
    Change-Id: I53a7474cc64f915851175aea0695229c581fd8a6

diff --git a/apps/keymaps/keymap-shanlingq1.c b/apps/keymaps/keymap-shanlingq1.c
index 2c09a40f4b..cb0e0a44ff 100644
--- a/apps/keymaps/keymap-shanlingq1.c
+++ b/apps/keymaps/keymap-shanlingq1.c
@@ -30,8 +30,11 @@
 
 static const struct button_mapping button_context_standard[] = {
     {ACTION_STD_PREV,           BUTTON_PREV,                        BUTTON_NONE},
+    {ACTION_STD_PREVREPEAT,     BUTTON_PREV|BUTTON_REPEAT,          BUTTON_NONE},
     {ACTION_STD_NEXT,           BUTTON_NEXT,                        BUTTON_NONE},
+    {ACTION_STD_NEXTREPEAT,     BUTTON_NEXT|BUTTON_REPEAT,          BUTTON_NONE},
     {ACTION_STD_OK,             BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
+    {ACTION_STD_CONTEXT,        BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_PLAY},
     {ACTION_STD_CANCEL,         BUTTON_POWER|BUTTON_REL,            BUTTON_POWER},
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
@@ -77,7 +80,6 @@ const struct button_mapping* target_get_context_mapping(int context)
         case CONTEXT_CUSTOM|CONTEXT_TREE:
         case CONTEXT_MAINMENU:
         case CONTEXT_BOOKMARKSCREEN:
-            //return button_context_tree;
         case CONTEXT_LIST:
             return button_context_list;
         case CONTEXT_YESNOSCREEN:
diff --git a/manual/platform/keymap-shanlingq1.tex b/manual/platform/keymap-shanlingq1.tex
index 9476ca8a70..4e426e1604 100644
--- a/manual/platform/keymap-shanlingq1.tex
+++ b/manual/platform/keymap-shanlingq1.tex
@@ -13,7 +13,7 @@
 \newcommand{\ActionStdNext}{\ButtonNext{} or \TouchActionStdNext}
 \newcommand{\ActionStdNextRepeat}{Long \ButtonNext{} or \TouchActionStdNextRepeat}
 \newcommand{\ActionStdCancel}{\ButtonPower{} or \TouchActionStdCancel}
-\newcommand{\ActionStdContext}{\TouchActionStdContext}
+\newcommand{\ActionStdContext}{Long \ButtonPlay{} or \TouchActionStdContext}
 \newcommand{\ActionStdQuickScreen}{\TouchActionStdQuickScreen}
 \newcommand{\ActionQuickScreenExit}{\TouchActionQuickScreenExit}
 \newcommand{\ActionStdMenu}{\TouchActionStdMenu}
@@ -47,7 +47,7 @@
 \newcommand{\ActionTreeParentDirectory}{\TouchActionTreeParentDirectory}
 
 %Button actions, YesNo context
-\newcommand{\ActionYesNoAccept}{\TouchActionYesNoAccept}
+\newcommand{\ActionYesNoAccept}{\ButtonPlay}
 
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\TouchActionKbdLeft}
@@ -83,7 +83,7 @@
 \newcommand{\PluginDown}{\TouchBottomMiddle}
 \newcommand{\PluginLeft}{\TouchMidLeft}
 \newcommand{\PluginRight}{\TouchMidRight}
-\newcommand{\PluginCancel}{\ButtonPower or \TouchBottomRight}
+\newcommand{\PluginCancel}{\ButtonPower{} or \TouchBottomRight}
 \newcommand{\PluginExit}{\ButtonPower}
 \newcommand{\PluginSelect}{\TouchCenter}
 \newcommand{\PluginSelectRepeat}{Long \TouchCenter}
_______________________________________________
rockbox-cvs mailing list
rockbox-cvs@cool.haxx.se
https://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs

[prev in list] [next in list] [prev in thread] [next in thread]