From 86df983eee86eafe9325fc28a0ebe9d1c42c77cd Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Mon, 30 May 2016 16:51:40 +0100 Subject: [PATCH] zenxfi3: update keymap Map short menu press to context menu/quickscreen. Map long menu press to return to main menu. Also remove some stupid keylock mapping, that doesn't make sense. Change-Id: I5f9b05af261bcbd2f0cf116f99570c4d853e0394 --- apps/keymaps/keymap-zenxfi3.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/keymaps/keymap-zenxfi3.c b/apps/keymaps/keymap-zenxfi3.c index aa68a34f43..bdd8b2dae4 100644 --- a/apps/keymaps/keymap-zenxfi3.c +++ b/apps/keymaps/keymap-zenxfi3.c @@ -43,13 +43,12 @@ static const struct button_mapping button_context_standard[] = { { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, + { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, + { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - - { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, LAST_ITEM_IN_LIST }; /* button_context_standard */ @@ -73,6 +72,8 @@ static const struct button_mapping button_context_wps[] = { { ACTION_WPS_MENU, BUTTON_BACK, BUTTON_NONE }, + { ACTION_WPS_QUICKSCREEN, BUTTON_MENU, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_wps */ @@ -97,12 +98,11 @@ static const struct button_mapping button_context_keyboard[] = { }; /* button_context_keyboard */ static const struct button_mapping button_context_quickscreen[] = { - { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_QS_RIGHT, BUTTON_PLAY, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_PLAY, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_quickscreen */