From 68c3fbe263a30fefaf46f5bba655810ae26584f2 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Tue, 25 Mar 2025 17:34:56 -0400 Subject: [PATCH] erosq: Rework pluginlib mappings a little prev/next -> PLA_LEFT/RIGHT volup/dn -> PLA_UP/DN scrollwheel -> PLA_SCROLL_* This will fix bubbles and any other plugin that is explicitly expecting PLA_SCROLL_* events. Change-Id: I9fd4c2e6bdd13e147b20e0f0f600e7e0b9a82842 --- apps/plugins/lib/pluginlib_actions.c | 16 ++++++++-------- manual/platform/keymap-erosqnative.tex | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 7fe43c35d1..1a94f0d5fe 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -233,14 +233,14 @@ const struct button_mapping pla_main_ctx[] = { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, #elif (CONFIG_KEYPAD == EROSQ_PAD) - { PLA_UP, BUTTON_NEXT, BUTTON_NONE }, - { PLA_DOWN, BUTTON_PREV, BUTTON_NONE }, - { PLA_LEFT, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { PLA_RIGHT, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { PLA_UP_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, - { PLA_DOWN_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, -// { PLA_LEFT_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, -// { PLA_RIGHT_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, + { PLA_UP, BUTTON_VOL_UP, BUTTON_NONE }, + { PLA_DOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, + { PLA_LEFT, BUTTON_PREV, BUTTON_NONE }, + { PLA_RIGHT, BUTTON_NEXT, BUTTON_NONE }, + { PLA_UP_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { PLA_DOWN_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, + { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, #elif (CONFIG_KEYPAD == IHIFI_770_PAD) { PLA_UP, BUTTON_PREV, BUTTON_NONE }, { PLA_DOWN, BUTTON_NEXT, BUTTON_NONE }, diff --git a/manual/platform/keymap-erosqnative.tex b/manual/platform/keymap-erosqnative.tex index a05f654769..06bd267e12 100644 --- a/manual/platform/keymap-erosqnative.tex +++ b/manual/platform/keymap-erosqnative.tex @@ -100,8 +100,8 @@ \newcommand{\ActionBmDelete}{Long \ButtonPlay} %Plugin lib actions -\newcommand{\PluginUp}{\ButtonUp} -\newcommand{\PluginDown}{\ButtonDown} +\newcommand{\PluginUp}{\ButtonVolUp} +\newcommand{\PluginDown}{\ButtonVolDown} \newcommand{\PluginLeft}{\ButtonLeft} \newcommand{\PluginRight}{\ButtonRight} \newcommand{\PluginSelect}{\ButtonSelect}