summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/keymaps/keymap-hm60x.c2
-rw-r--r--apps/keymaps/keymap-hm801.c2
-rw-r--r--apps/keymaps/keymap-ihifi.c2
-rw-r--r--apps/keymaps/keymap-m3.c4
-rw-r--r--apps/keymaps/keymap-ma.c2
-rw-r--r--apps/keymaps/keymap-mpio-hd200.c6
-rw-r--r--apps/keymaps/keymap-mpio-hd300.c5
-rw-r--r--apps/keymaps/keymap-sansa-connect.c7
-rw-r--r--apps/keymaps/keymap-shanlingq1.c2
-rw-r--r--apps/keymaps/keymap-vibe500.c4
-rw-r--r--apps/keymaps/keymap-x5.c4
11 files changed, 26 insertions, 14 deletions
diff --git a/apps/keymaps/keymap-hm60x.c b/apps/keymaps/keymap-hm60x.c
index 1050ec7f31..2e1f3dd516 100644
--- a/apps/keymaps/keymap-hm60x.c
+++ b/apps/keymaps/keymap-hm60x.c
@@ -176,7 +176,7 @@ static const struct button_mapping button_context_tree_scroll_lr[] = {
176/** Yes/No Screen **/ 176/** Yes/No Screen **/
177static const struct button_mapping button_context_yesnoscreen[] = { 177static const struct button_mapping button_context_yesnoscreen[] = {
178 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 178 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
179 LAST_ITEM_IN_LIST 179 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
180}; /* button_context_settings_yesnoscreen */ 180}; /* button_context_settings_yesnoscreen */
181 181
182/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ 182/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
diff --git a/apps/keymaps/keymap-hm801.c b/apps/keymaps/keymap-hm801.c
index b69656a3f1..1f0a49c90c 100644
--- a/apps/keymaps/keymap-hm801.c
+++ b/apps/keymaps/keymap-hm801.c
@@ -202,7 +202,7 @@ static const struct button_mapping button_context_tree_scroll_lr[] = {
202/** Yes/No Screen **/ 202/** Yes/No Screen **/
203static const struct button_mapping button_context_yesnoscreen[] = { 203static const struct button_mapping button_context_yesnoscreen[] = {
204 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 204 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
205 LAST_ITEM_IN_LIST 205 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
206}; /* button_context_settings_yesnoscreen */ 206}; /* button_context_settings_yesnoscreen */
207 207
208/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ 208/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
diff --git a/apps/keymaps/keymap-ihifi.c b/apps/keymaps/keymap-ihifi.c
index 0d574c19e6..147c2f5f62 100644
--- a/apps/keymaps/keymap-ihifi.c
+++ b/apps/keymaps/keymap-ihifi.c
@@ -175,7 +175,7 @@ static const struct button_mapping button_context_tree_scroll_lr[] = {
175/** Yes/No Screen **/ 175/** Yes/No Screen **/
176static const struct button_mapping button_context_yesnoscreen[] = { 176static const struct button_mapping button_context_yesnoscreen[] = {
177 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, 177 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
178 LAST_ITEM_IN_LIST 178 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
179}; /* button_context_settings_yesnoscreen */ 179}; /* button_context_settings_yesnoscreen */
180 180
181/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ 181/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
diff --git a/apps/keymaps/keymap-m3.c b/apps/keymaps/keymap-m3.c
index 6192d7ff6b..bcd96d664b 100644
--- a/apps/keymaps/keymap-m3.c
+++ b/apps/keymaps/keymap-m3.c
@@ -379,12 +379,12 @@ static const struct button_mapping remote_button_context_wps[] = {
379/** Yes/No Screen **/ 379/** Yes/No Screen **/
380static const struct button_mapping button_context_yesnoscreen[] = { 380static const struct button_mapping button_context_yesnoscreen[] = {
381 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, 381 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
382 LAST_ITEM_IN_LIST 382 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
383}; /* button_context_yesnoscreen */ 383}; /* button_context_yesnoscreen */
384 384
385static const struct button_mapping remote_button_context_yesnoscreen[] = { 385static const struct button_mapping remote_button_context_yesnoscreen[] = {
386 { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, 386 { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE },
387 LAST_ITEM_IN_LIST 387 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
388}; /* remote_button_context_yesnoscreen */ 388}; /* remote_button_context_yesnoscreen */
389 389
390 390
diff --git a/apps/keymaps/keymap-ma.c b/apps/keymaps/keymap-ma.c
index e1740b697b..28220d9f50 100644
--- a/apps/keymaps/keymap-ma.c
+++ b/apps/keymaps/keymap-ma.c
@@ -183,7 +183,7 @@ static const struct button_mapping button_context_tree_scroll_lr[] = {
183/** Yes/No Screen **/ 183/** Yes/No Screen **/
184static const struct button_mapping button_context_yesnoscreen[] = { 184static const struct button_mapping button_context_yesnoscreen[] = {
185 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, 185 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
186 LAST_ITEM_IN_LIST 186 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
187}; /* button_context_settings_yesnoscreen */ 187}; /* button_context_settings_yesnoscreen */
188 188
189/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ 189/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
diff --git a/apps/keymaps/keymap-mpio-hd200.c b/apps/keymaps/keymap-mpio-hd200.c
index 71b3190384..019d4bfac4 100644
--- a/apps/keymaps/keymap-mpio-hd200.c
+++ b/apps/keymaps/keymap-mpio-hd200.c
@@ -105,8 +105,10 @@ static const struct button_mapping button_context_settings[] = {
105static const struct button_mapping button_context_yesno[] = { 105static const struct button_mapping button_context_yesno[] = {
106 { ACTION_YESNO_ACCEPT, BUTTON_FUNC, BUTTON_NONE }, 106 { ACTION_YESNO_ACCEPT, BUTTON_FUNC, BUTTON_NONE },
107 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, 107 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
108 { ACTION_STD_CANCEL, BUTTON_VOL_UP, BUTTON_NONE },
109 { ACTION_STD_CANCEL, BUTTON_VOL_DOWN, BUTTON_NONE },
108 110
109 LAST_ITEM_IN_LIST 111 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
110}; /* button_context_yesno */ 112}; /* button_context_yesno */
111 113
112static const struct button_mapping button_context_bmark[] = { 114static const struct button_mapping button_context_bmark[] = {
@@ -269,7 +271,7 @@ static const struct button_mapping button_rc_context_yesno[] = {
269 { ACTION_YESNO_ACCEPT, BUTTON_RC_FUNC, BUTTON_NONE }, 271 { ACTION_YESNO_ACCEPT, BUTTON_RC_FUNC, BUTTON_NONE },
270 { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, 272 { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE },
271 273
272 LAST_ITEM_IN_LIST 274 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
273}; /* button_context_yesno */ 275}; /* button_context_yesno */
274 276
275static const struct button_mapping button_rc_context_radio[] = { 277static const struct button_mapping button_rc_context_radio[] = {
diff --git a/apps/keymaps/keymap-mpio-hd300.c b/apps/keymaps/keymap-mpio-hd300.c
index cdb617bed0..7941d1704b 100644
--- a/apps/keymaps/keymap-mpio-hd300.c
+++ b/apps/keymaps/keymap-mpio-hd300.c
@@ -109,8 +109,11 @@ static const struct button_mapping button_context_settings[] = {
109static const struct button_mapping button_context_yesno[] = { 109static const struct button_mapping button_context_yesno[] = {
110 { ACTION_YESNO_ACCEPT, BUTTON_ENTER, BUTTON_NONE }, 110 { ACTION_YESNO_ACCEPT, BUTTON_ENTER, BUTTON_NONE },
111 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, 111 { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
112 { ACTION_STD_CANCEL, BUTTON_REW, BUTTON_NONE },
113 { ACTION_STD_CANCEL, BUTTON_FF, BUTTON_NONE },
114 { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE },
112 115
113 LAST_ITEM_IN_LIST 116 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
114}; /* button_context_yesno */ 117}; /* button_context_yesno */
115 118
116static const struct button_mapping button_context_bmark[] = { 119static const struct button_mapping button_context_bmark[] = {
diff --git a/apps/keymaps/keymap-sansa-connect.c b/apps/keymaps/keymap-sansa-connect.c
index 6a6d5de955..b339744b0f 100644
--- a/apps/keymaps/keymap-sansa-connect.c
+++ b/apps/keymaps/keymap-sansa-connect.c
@@ -70,7 +70,12 @@ static const struct button_mapping button_context_wps[] = {
70 70
71static const struct button_mapping button_context_yesno[] = { 71static const struct button_mapping button_context_yesno[] = {
72 {ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE}, 72 {ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE},
73 LAST_ITEM_IN_LIST 73 {ACTION_STD_CANCEL, BUTTON_PREV, BUTTON_NONE},
74 {ACTION_STD_CANCEL, BUTTON_NEXT, BUTTON_NONE},
75 {ACTION_STD_CANCEL, BUTTON_VOL_UP, BUTTON_NONE},
76 {ACTION_STD_CANCEL, BUTTON_VOL_DOWN, BUTTON_NONE},
77 {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE},
78 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
74}; /* button_context_yesno */ 79}; /* button_context_yesno */
75 80
76static const struct button_mapping button_context_settings_time[] = { 81static const struct button_mapping button_context_settings_time[] = {
diff --git a/apps/keymaps/keymap-shanlingq1.c b/apps/keymaps/keymap-shanlingq1.c
index cb0e0a44ff..4caaa36fd2 100644
--- a/apps/keymaps/keymap-shanlingq1.c
+++ b/apps/keymaps/keymap-shanlingq1.c
@@ -64,7 +64,7 @@ static const struct button_mapping button_context_yesno[] = {
64 /* note: touchscreen buttons are usable in addition to physical keys */ 64 /* note: touchscreen buttons are usable in addition to physical keys */
65 {ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE}, 65 {ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE},
66 {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE}, 66 {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE},
67 LAST_ITEM_IN_LIST 67 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
68}; /* button_context_yesno */ 68}; /* button_context_yesno */
69 69
70const struct button_mapping* target_get_context_mapping(int context) 70const struct button_mapping* target_get_context_mapping(int context)
diff --git a/apps/keymaps/keymap-vibe500.c b/apps/keymaps/keymap-vibe500.c
index 49f77628ce..5116ec8575 100644
--- a/apps/keymaps/keymap-vibe500.c
+++ b/apps/keymaps/keymap-vibe500.c
@@ -113,7 +113,9 @@ static const struct button_mapping button_context_settings[] = {
113 113
114static const struct button_mapping button_context_yesno[] = { 114static const struct button_mapping button_context_yesno[] = {
115 { ACTION_YESNO_ACCEPT, BUTTON_OK, BUTTON_NONE }, 115 { ACTION_YESNO_ACCEPT, BUTTON_OK, BUTTON_NONE },
116 LAST_ITEM_IN_LIST 116 { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE },
117 { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE },
118 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
117}; /* button_context_yesno */ 119}; /* button_context_yesno */
118 120
119static const struct button_mapping button_context_bmark[] = { 121static const struct button_mapping button_context_bmark[] = {
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index fb2fbfa605..249df7bf3c 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -405,12 +405,12 @@ static const struct button_mapping remote_button_context_wps[] = {
405/** Yes/No Screen **/ 405/** Yes/No Screen **/
406static const struct button_mapping button_context_yesnoscreen[] = { 406static const struct button_mapping button_context_yesnoscreen[] = {
407 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 407 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
408 LAST_ITEM_IN_LIST 408 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
409}; /* button_context_settings_yesnoscreen */ 409}; /* button_context_settings_yesnoscreen */
410 410
411static const struct button_mapping remote_button_context_yesnoscreen[] = { 411static const struct button_mapping remote_button_context_yesnoscreen[] = {
412 { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, 412 { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE },
413 LAST_ITEM_IN_LIST 413 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
414}; /* remote_button_context_settings_yesnoscreen */ 414}; /* remote_button_context_settings_yesnoscreen */
415 415
416 416
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 23:00:32 +0000