diff options
-rw-r--r-- | apps/keymaps/keymap-zenxfi2.c | 4 | ||||
-rw-r--r-- | uisimulator/buttonmap/creative-zenxfi2.c | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/apps/keymaps/keymap-zenxfi2.c b/apps/keymaps/keymap-zenxfi2.c index 2f8d503b78..c98a4a8405 100644 --- a/apps/keymaps/keymap-zenxfi2.c +++ b/apps/keymaps/keymap-zenxfi2.c | |||
@@ -128,8 +128,8 @@ static const struct button_mapping button_context_keyboard[] = { | |||
128 | }; /* button_context_keyboard */ | 128 | }; /* button_context_keyboard */ |
129 | 129 | ||
130 | static const struct button_mapping button_context_radio[] = { | 130 | static const struct button_mapping button_context_radio[] = { |
131 | { ACTION_FM_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, | 131 | { ACTION_FM_EXIT, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, |
132 | { ACTION_FM_PRESET, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 132 | { ACTION_FM_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, |
133 | { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, | 133 | { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, |
134 | 134 | ||
135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
diff --git a/uisimulator/buttonmap/creative-zenxfi2.c b/uisimulator/buttonmap/creative-zenxfi2.c index ae56599b69..e9aa1d134a 100644 --- a/uisimulator/buttonmap/creative-zenxfi2.c +++ b/uisimulator/buttonmap/creative-zenxfi2.c | |||
@@ -29,18 +29,24 @@ int key_to_button(int keyboard_button) | |||
29 | int new_btn = BUTTON_NONE; | 29 | int new_btn = BUTTON_NONE; |
30 | switch (keyboard_button) | 30 | switch (keyboard_button) |
31 | { | 31 | { |
32 | case SDLK_PAGEDOWN: | 32 | case SDLK_ESCAPE: |
33 | new_btn = BUTTON_MENU; | 33 | case SDLK_BACKSPACE: |
34 | break; | 34 | case SDLK_DELETE: |
35 | case SDLK_HOME: | ||
36 | new_btn = BUTTON_POWER; | 35 | new_btn = BUTTON_POWER; |
37 | break; | 36 | break; |
37 | case SDLK_KP_ENTER: | ||
38 | case SDLK_RETURN: | ||
39 | case SDLK_SPACE: | ||
40 | case SDLK_INSERT: | ||
41 | new_btn = BUTTON_MENU; | ||
42 | break; | ||
38 | } | 43 | } |
39 | return new_btn; | 44 | return new_btn; |
40 | } | 45 | } |
41 | 46 | ||
42 | struct button_map bm[] = { | 47 | struct button_map bm[] = { |
43 | { SDLK_PAGEDOWN, 162, 136, 26, "Menu" }, | 48 | { SDLK_RETURN, 162, 136, 26, "Menu" }, |
49 | { SDLK_ESCAPE, 315, 514, 26, "Power" }, | ||
44 | { 0, 0, 0, 0, "None" } | 50 | { 0, 0, 0, 0, "None" } |
45 | }; | 51 | }; |
46 | 52 | ||