diff options
| -rw-r--r-- | apps/tree.h | 10 | ||||
| -rw-r--r-- | apps/wps.h | 4 | ||||
| -rw-r--r-- | firmware/drivers/button.c | 2 | ||||
| -rw-r--r-- | firmware/export/button.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/apps/tree.h b/apps/tree.h index ca6fd468e4..cf578fd0bb 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -43,11 +43,11 @@ #define TREE_RC_NEXT BUTTON_RC_FF #define TREE_RC_PREV BUTTON_RC_REW #define TREE_RC_EXIT BUTTON_RC_STOP -#define TREE_RC_RUN (BUTTON_RC_ON | BUTTON_REL) -#define TREE_RC_RUN_PRE BUTTON_RC_ON -#define TREE_RC_MENU BUTTON_RC_MENU -#define TREE_RC_WPS (BUTTON_RC_VOL | BUTTON_REL) -#define TREE_RC_WPS_PRE BUTTON_RC_VOL +#define TREE_RC_RUN (BUTTON_RC_MENU | BUTTON_REL) +#define TREE_RC_RUN_PRE BUTTON_RC_MENU +#define TREE_RC_MENU BUTTON_RC_MODE +#define TREE_RC_WPS (BUTTON_RC_ON | BUTTON_REL) +#define TREE_RC_WPS_PRE BUTTON_RC_ON #define TREE_RC_CONTEXT (BUTTON_RC_ON | BUTTON_REPEAT) #elif CONFIG_KEYPAD == RECORDER_PAD diff --git a/apps/wps.h b/apps/wps.h index 4f22ed9e45..4f869794b2 100644 --- a/apps/wps.h +++ b/apps/wps.h @@ -48,8 +48,8 @@ #define WPS_RC_EXIT BUTTON_RC_STOP #define WPS_RC_MENU (BUTTON_RC_MENU | BUTTON_REL) #define WPS_RC_MENU_PRE BUTTON_RC_MENU -#define WPS_RC_BROWSE (BUTTON_RC_VOL | BUTTON_REL) -#define WPS_RC_BROWSE_PRE BUTTON_RC_VOL +#define WPS_RC_BROWSE (BUTTON_RC_MODE | BUTTON_REL) +#define WPS_RC_BROWSE_PRE BUTTON_RC_MODE #elif CONFIG_KEYPAD == RECORDER_PAD #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index d0f9b026b6..e644267b19 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -418,7 +418,7 @@ static int button_read(void) else btn = BUTTON_RC_VOL_DOWN; else - btn = BUTTON_RC_VOL; + btn = BUTTON_RC_MODE; else if (data < 0x58) btn = BUTTON_RC_VOL_UP; diff --git a/firmware/export/button.h b/firmware/export/button.h index 40c374880b..14cd195d3c 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h @@ -70,7 +70,7 @@ bool remote_button_hold(void); #define BUTTON_RC_ON (BUTTON_REMOTE | 0x00010000) #define BUTTON_RC_STOP (BUTTON_REMOTE | 0x00020000) -#define BUTTON_RC_VOL (BUTTON_REMOTE | 0x00040000) +#define BUTTON_RC_MODE (BUTTON_REMOTE | 0x00040000) #define BUTTON_RC_BITRATE (BUTTON_REMOTE | 0x00200000) #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) #define BUTTON_RC_SOURCE (BUTTON_REMOTE | 0x00800000) |