len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-05-12 11:43:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pitchscreen: adjust keymaps for ipod and fiiom3k

Browse source 
ipod:
- To be more consistent with other plugins and
  (Settings) menus, press Long Select, instead of Menu,
  to reset, and press Menu, or Select, to exit screen

fiiom3k:
- Press Back, or Select, to exit screen
- Press Menu, instead of Select, to switch between modes
- Use repeat button events and adjust values by 1%, instead of
  by 0.1%, when scrolling, to speed up setting changes
- Get rid of surprising actions for Back/Menu/Volume buttons

Change-Id: Ifd16958bf56c7e20fb182aa157b4cb4dd19ac9b9
This commit is contained in:
Christian Soffke 2026-04-16 13:31:26 +02:00
parent 41893b250f
commit a1ccb79727
6 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/keymaps/keymap-fiiom3k.c
View file

@ -185,20 +185,23 @@ static const struct button_mapping button_context_quickscreen[] = {
static const struct button_mapping button_context_pitchscreen[] = { static const struct button_mapping button_context_pitchscreen[] = {
{ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE}, {ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE},
{ACTION_PS_INC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE}, {ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE},
{ACTION_PS_INC_BIG, BUTTON_VOL_UP, BUTTON_NONE}, {ACTION_PS_INC_BIG, BUTTON_SCROLL_BACK, BUTTON_NONE},
{ACTION_PS_INC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE},
{ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE}, {ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE},
{ACTION_PS_DEC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE}, {ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE},
{ACTION_PS_DEC_BIG, BUTTON_VOL_DOWN, BUTTON_NONE}, {ACTION_PS_DEC_BIG, BUTTON_SCROLL_FWD, BUTTON_NONE},
{ACTION_PS_DEC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE},
{ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE}, {ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE},
{ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, {ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
{ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE}, {ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE},
{ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE}, {ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE},
{ACTION_PS_TOGGLE_MODE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, {ACTION_PS_TOGGLE_MODE, BUTTON_MENU, BUTTON_NONE},
{ACTION_PS_EXIT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
{ACTION_PS_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, {ACTION_PS_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT},
{ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE}, {ACTION_PS_EXIT, BUTTON_BACK, BUTTON_NONE},
{ACTION_PS_FASTER, BUTTON_BACK, BUTTON_NONE}, {ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
{ACTION_PS_SLOWER, BUTTON_MENU, BUTTON_NONE}, {ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_pitchscreen */ }; /* button_context_pitchscreen */

5
apps/keymaps/keymap-ipod.c
View file

@ -151,8 +151,9 @@ static const struct button_mapping button_context_pitchscreen[] = {
{ ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
{ ACTION_PS_TOGGLE_MODE, BUTTON_PLAY, BUTTON_NONE }, { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY, BUTTON_NONE },
{ ACTION_PS_RESET, BUTTON_MENU, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE },
{ ACTION_PS_EXIT, BUTTON_SELECT, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
{ ACTION_PS_RESET, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT},
{ ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },

16
manual/platform/keymap-fiiom3k.tex
View file

@ -78,17 +78,17 @@
\newcommand{\ActionKbdAbort}{\ButtonPower} \newcommand{\ActionKbdAbort}{\ButtonPower}
%Button actions, Pitch Screen context %Button actions, Pitch Screen context
\newcommand{\ActionPsToggleMode}{\ButtonSelect} \newcommand{\ActionPsToggleMode}{\ButtonMenu}
\newcommand{\ActionPsIncSmall}{\ButtonUp{} or \ButtonScrollBack} \newcommand{\ActionPsIncSmall}{\ButtonUp}
\newcommand{\ActionPsDecSmall}{\ButtonDown{} or \ButtonScrollFwd} \newcommand{\ActionPsDecSmall}{\ButtonDown}
\newcommand{\ActionPsIncBig}{\ButtonVolUp} \newcommand{\ActionPsIncBig}{Long \ButtonUp{} or \ButtonScrollBack}
\newcommand{\ActionPsDecBig}{\ButtonVolDown} \newcommand{\ActionPsDecBig}{Long \ButtonDown {} or \ButtonScrollFwd}
\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
\newcommand{\ActionPsNudgeRight}{\ButtonRight} \newcommand{\ActionPsNudgeRight}{\ButtonRight}
\newcommand{\ActionPsReset}{Long \ButtonSelect} \newcommand{\ActionPsReset}{Long \ButtonSelect}
\newcommand{\ActionPsExit}{\ButtonPower} \newcommand{\ActionPsExit}{\ButtonBack{} or \ButtonSelect}
\newcommand{\ActionPsFaster}{\ButtonBack} \newcommand{\ActionPsFaster}{Long \ButtonRight}
\newcommand{\ActionPsSlower}{\ButtonMenu} \newcommand{\ActionPsSlower}{Long \ButtonLeft}
%Button actions, Bookmark screen context %Button actions, Bookmark screen context
\newcommand{\ActionBmDelete}{\ButtonPlay} \newcommand{\ActionBmDelete}{\ButtonPlay}

4
manual/platform/keymap-ipod1g2g.tex
View file

@ -77,8 +77,8 @@
\newcommand{\ActionPsDecBig}{Long \ButtonScrollBack} \newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
\newcommand{\ActionPsNudgeRight}{\ButtonRight} \newcommand{\ActionPsNudgeRight}{\ButtonRight}
\newcommand{\ActionPsReset}{\ButtonMenu} \newcommand{\ActionPsReset}{Long \ButtonSelect}
\newcommand{\ActionPsExit}{\ButtonSelect} \newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
%Button actions, Bookmark screen context %Button actions, Bookmark screen context
\newcommand{\ActionBmDelete}{Long \ButtonMenu} \newcommand{\ActionBmDelete}{Long \ButtonMenu}

4
manual/platform/keymap-ipod3g.tex
View file

@ -77,8 +77,8 @@
\newcommand{\ActionPsDecBig}{Long \ButtonScrollBack} \newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
\newcommand{\ActionPsNudgeRight}{\ButtonRight} \newcommand{\ActionPsNudgeRight}{\ButtonRight}
\newcommand{\ActionPsReset}{\ButtonMenu} \newcommand{\ActionPsReset}{Long \ButtonSelect}
\newcommand{\ActionPsExit}{\ButtonSelect} \newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
%Button actions, Bookmark screen context %Button actions, Bookmark screen context
\newcommand{\ActionBmDelete}{Long \ButtonMenu} \newcommand{\ActionBmDelete}{Long \ButtonMenu}

4
manual/platform/keymap-ipod4g.tex
View file

@ -78,8 +78,8 @@
\newcommand{\ActionPsDecBig}{Long \ButtonScrollBack} \newcommand{\ActionPsDecBig}{Long \ButtonScrollBack}
\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
\newcommand{\ActionPsNudgeRight}{\ButtonRight} \newcommand{\ActionPsNudgeRight}{\ButtonRight}
\newcommand{\ActionPsReset}{\ButtonMenu} \newcommand{\ActionPsReset}{Long \ButtonSelect}
\newcommand{\ActionPsExit}{\ButtonSelect} \newcommand{\ActionPsExit}{\ButtonMenu}{} or \ButtonSelect}
%Button actions, Recording screen context %Button actions, Recording screen context
\newcommand{\ActionRecPause}{\ButtonPlay} \newcommand{\ActionRecPause}{\ButtonPlay}