summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/keymaps/keymap-mr500.c61
-rw-r--r--apps/plugins/snow.c4
2 files changed, 31 insertions, 34 deletions
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c
index 73d20d8ae9..aa04461b64 100644
--- a/apps/keymaps/keymap-mr500.c
+++ b/apps/keymaps/keymap-mr500.c
@@ -36,31 +36,22 @@
36 * Insert LAST_ITEM_IN_LIST at the end of each mapping 36 * Insert LAST_ITEM_IN_LIST at the end of each mapping
37 */ 37 */
38 38
39
40#define BUTTON_UP BUTTON_RC_PLAY
41#define BUTTON_DOWN BUTTON_RC_DOWN
42
43#define BUTTON_SELECT BUTTON_RC_HEART
44#define BUTTON_MENU BUTTON_RC_MODE
45#define BUTTON_VOL_DOWN BUTTON_RC_VOL_DOWN
46#define BUTTON_VOL_UP BUTTON_RC_VOL_UP
47
48static const struct button_mapping button_context_standard[] = { 39static const struct button_mapping button_context_standard[] = {
49 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 40 { ACTION_STD_PREV, BUTTON_RC_PLAY, BUTTON_NONE },
50 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 41 { ACTION_STD_PREVREPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE },
51 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 42 { ACTION_STD_NEXT, BUTTON_RC_DOWN, BUTTON_NONE },
52 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 43 { ACTION_STD_NEXTREPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE },
53 44
54 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 45 { ACTION_STD_OK, BUTTON_RC_HEART|BUTTON_REL, BUTTON_RC_HEART },
55 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, 46 { ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE },
56 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, 47 { ACTION_STD_OK, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF },
57 48
58 { ACTION_STD_MENU, BUTTON_MENU, BUTTON_NONE }, 49 { ACTION_STD_MENU, BUTTON_RC_MODE, BUTTON_NONE },
59 { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, 50 { ACTION_STD_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE },
60 { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, 51 { ACTION_STD_CONTEXT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_RC_HEART },
61 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, 52 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
62 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, 53 { ACTION_STD_CANCEL, BUTTON_RC_REW, BUTTON_NONE },
63 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 54 { ACTION_STD_CANCEL, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
64 LAST_ITEM_IN_LIST 55 LAST_ITEM_IN_LIST
65}; /* button_context_standard */ 56}; /* button_context_standard */
66 57
@@ -73,19 +64,24 @@ static const struct button_mapping button_context_wps[] = {
73 64
74 { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE }, 65 { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE },
75 { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 66 { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
76 { ACTION_WPS_STOPSEEK,BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT}, 67
77 { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT}, 68 { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL,
78 69 BUTTON_RC_REW|BUTTON_REPEAT},
79 { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 70
80 { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, 71 { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL,
81 { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 72 BUTTON_RC_FF|BUTTON_REPEAT},
82 { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, 73
74 { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
75 { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
76 { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
77 { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE },
83 78
84 { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE }, 79 { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE },
85 { ACTION_WPS_MENU, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, 80 { ACTION_WPS_MENU, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE },
81 { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
86 { ACTION_WPS_CONTEXT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_RC_HEART }, 82 { ACTION_WPS_CONTEXT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_RC_HEART },
87 83
88 { ACTION_WPS_BROWSE, BUTTON_RC_HEART|BUTTON_REL, BUTTON_RC_HEART }, 84 { ACTION_WPS_BROWSE, BUTTON_RC_HEART|BUTTON_REL, BUTTON_RC_HEART },
89 85
90 LAST_ITEM_IN_LIST 86 LAST_ITEM_IN_LIST
91}; /* button_context_wps */ 87}; /* button_context_wps */
@@ -244,3 +240,4 @@ const struct button_mapping* target_get_context_mapping(int context)
244 } 240 }
245 return button_context_standard; 241 return button_context_standard;
246} 242}
243
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c
index 2a2b0a139c..fe10e3995b 100644
--- a/apps/plugins/snow.c
+++ b/apps/plugins/snow.c
@@ -56,7 +56,6 @@ PLUGIN_HEADER
56(CONFIG_KEYPAD == MROBE100_PAD) || \ 56(CONFIG_KEYPAD == MROBE100_PAD) || \
57(CONFIG_KEYPAD == COWOND2_PAD) || \ 57(CONFIG_KEYPAD == COWOND2_PAD) || \
58(CONFIG_KEYPAD == IAUDIO67_PAD) || \ 58(CONFIG_KEYPAD == IAUDIO67_PAD) || \
59(CONFIG_KEYPAD == CREATIVEZVM_PAD) || \
60(CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ 59(CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
61(CONFIG_KEYPAD == ONDAVX747_PAD) || \ 60(CONFIG_KEYPAD == ONDAVX747_PAD) || \
62(CONFIG_KEYPAD == GIGABEAT_PAD) || \ 61(CONFIG_KEYPAD == GIGABEAT_PAD) || \
@@ -66,7 +65,8 @@ PLUGIN_HEADER
66#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) 65#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
67#define SNOW_QUIT (BUTTON_HOME|BUTTON_REPEAT) 66#define SNOW_QUIT (BUTTON_HOME|BUTTON_REPEAT)
68 67
69#elif CONFIG_KEYPAD == GIGABEAT_S_PAD 68#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) || \
69(CONFIG_KEYPAD == CREATIVEZVM_PAD)
70#define SNOW_QUIT BUTTON_BACK 70#define SNOW_QUIT BUTTON_BACK
71 71
72#elif CONFIG_KEYPAD == IAUDIO_M3_PAD 72#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-24 20:25:16 +0000