From d435bb77b57a2c3ec1f3e447101bb6bbb7d163e1 Mon Sep 17 00:00:00 2001 From: Dana Conrad Date: Sun, 5 Sep 2021 11:27:33 -0500 Subject: [PATCH] Yes/No Screen Keymap: add fallbacks to targets lacking them With the addition of ignoring unknown actions to the yes/no screen, several (mostly older) targets won't have keys defined to cancel out of the yes/no screen. Adding fallbacks to standard context to correct this. Targets: Shanling Q1 - changed, untested (doesn't appear sim has buttons mapped) Sansa Connect - changed, untested (can't figure out sim keys) HM60x - changed, untested (sim won't build) HM801 - changed, untested (sim won't build) ihifi - changed, untested (sim won't build) MA - changed, untested (sim won't build) M3 - changed, tested on sim X5 - changed, tested on sim MPIO HD300 - changed, sim tested MPIO HD200 - changed, sim tested (remote not tested) Vibe 500 - changed, sim tested Change-Id: Ib5290ada8e12bb845d3840e481e8533515b42e95 --- apps/keymaps/keymap-hm60x.c | 2 +- apps/keymaps/keymap-hm801.c | 2 +- apps/keymaps/keymap-ihifi.c | 2 +- apps/keymaps/keymap-m3.c | 4 ++-- apps/keymaps/keymap-ma.c | 2 +- apps/keymaps/keymap-mpio-hd200.c | 6 ++++-- apps/keymaps/keymap-mpio-hd300.c | 5 ++++- apps/keymaps/keymap-sansa-connect.c | 7 ++++++- apps/keymaps/keymap-shanlingq1.c | 2 +- apps/keymaps/keymap-vibe500.c | 4 +++- apps/keymaps/keymap-x5.c | 4 ++-- 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[] = { /** Yes/No Screen **/ static const struct button_mapping button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesnoscreen */ /* 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[] = { /** Yes/No Screen **/ static const struct button_mapping button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesnoscreen */ /* 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[] = { /** Yes/No Screen **/ static const struct button_mapping button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesnoscreen */ /* 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[] = { /** Yes/No Screen **/ static const struct button_mapping button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_yesnoscreen */ static const struct button_mapping remote_button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* remote_button_context_yesnoscreen */ 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[] = { /** Yes/No Screen **/ static const struct button_mapping button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesnoscreen */ /* 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[] = { static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_FUNC, BUTTON_NONE }, { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_VOL_UP, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_VOL_DOWN, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_yesno */ static const struct button_mapping button_context_bmark[] = { @@ -269,7 +271,7 @@ static const struct button_mapping button_rc_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_RC_FUNC, BUTTON_NONE }, { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_yesno */ static 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[] = { static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_ENTER, BUTTON_NONE }, { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_REW, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_FF, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_yesno */ static 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[] = { static const struct button_mapping button_context_yesno[] = { {ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE}, - LAST_ITEM_IN_LIST + {ACTION_STD_CANCEL, BUTTON_PREV, BUTTON_NONE}, + {ACTION_STD_CANCEL, BUTTON_NEXT, BUTTON_NONE}, + {ACTION_STD_CANCEL, BUTTON_VOL_UP, BUTTON_NONE}, + {ACTION_STD_CANCEL, BUTTON_VOL_DOWN, BUTTON_NONE}, + {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE}, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_yesno */ static 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[] = { /* note: touchscreen buttons are usable in addition to physical keys */ {ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE}, {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE}, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_yesno */ const 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[] = { static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_OK, BUTTON_NONE }, - LAST_ITEM_IN_LIST + { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_yesno */ static 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[] = { /** Yes/No Screen **/ static const struct button_mapping button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesnoscreen */ static const struct button_mapping remote_button_context_yesnoscreen[] = { { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* remote_button_context_settings_yesnoscreen */