summaryrefslogtreecommitdiff
path: root/apps/keymaps/keymap-ondio.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/keymaps/keymap-ondio.c')
-rw-r--r--apps/keymaps/keymap-ondio.c88
1 files changed, 49 insertions, 39 deletions
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 2ad86c868d..a82d6eb5fa 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -18,8 +18,6 @@
18 18
19/* * 19/* *
20 * Button Code Definitions for archos ondio fm/sp targets 20 * Button Code Definitions for archos ondio fm/sp targets
21 *
22 * \TODO test!
23 */ 21 */
24 22
25#include "config.h" 23#include "config.h"
@@ -34,77 +32,86 @@ CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
34 32
35*/ 33*/
36 34
37struct button_mapping button_context_standard[] = { 35const struct button_mapping button_context_standard[] = {
38 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 36 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
39 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 37 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
40 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 38 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
41 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, 39 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
42 40
43 { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, 41 { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
44 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, 42 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
45 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 43 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
46 { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, 44 { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
47 { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE }, 45 { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE },
48 46
49 LAST_ITEM_IN_LIST 47 LAST_ITEM_IN_LIST
50}; 48};
51 49
52struct button_mapping button_context_wps[] = { 50const struct button_mapping button_context_wps[] = {
53 { ACTION_WPS_PLAY, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, 51 { ACTION_WPS_PLAY, BUTTON_OFF|BUTTON_REL, BUTTON_OFF },
54 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, 52 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
55 { ACTION_WPS_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, 53 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
56 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 54 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
57 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, 55 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
58 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, 56 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
59 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, 57 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
60 { ACTION_WPS_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_OFF }, 58 { ACTION_WPS_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_OFF },
61 { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, 59 { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE },
62 { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, 60 { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
63 { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, 61 { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE },
64 { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 62 { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
65 { ACTION_WPS_BROWSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, 63 { ACTION_WPS_BROWSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
66 { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, 64 { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
67 { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_OFF, BUTTON_MENU }, /* this may trigger ACTION_WPS_BROWSE so may need changing */ 65 /* { ACTION_WPS_MENU, BUTTON_NONE, BUTTON_NONE }, we can't have that */
68 66
69 LAST_ITEM_IN_LIST 67 LAST_ITEM_IN_LIST
70}; 68};
71 69
72struct button_mapping button_context_settings[] = { 70const struct button_mapping button_context_settings[] = {
73 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 71 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
74 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 72 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
75 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 73 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
76 { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, 74 { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
77 { ACTION_STD_NEXT, BUTTON_MENU, BUTTON_NONE },
78 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, 75 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
79 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, 76 { ACTION_STD_OK, BUTTON_LEFT, BUTTON_NONE },
77 { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE },
80 78
81 LAST_ITEM_IN_LIST 79 LAST_ITEM_IN_LIST
82}; 80};
83struct button_mapping button_context_tree[] = { 81const struct button_mapping button_context_tree[] = {
84 { ACTION_TREE_WPS, BUTTON_OFF|BUTTON_REL, BUTTON_OFF }, 82 { ACTION_TREE_WPS, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
85 { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_OFF }, 83 { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE },
86 84
87 LAST_ITEM_IN_LIST 85 LAST_ITEM_IN_LIST
88}; /* button_context_listtree */ 86}; /* button_context_listtree */
89struct button_mapping button_context_tree_scroll_lr[] = { 87const struct button_mapping button_context_tree_scroll_lr[] = {
90 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 88 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
91 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 89 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
92 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 90 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
93 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, 91 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
94 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, 92 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
95 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 93 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
96 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, 94 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
97 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, 95 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
96
98 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), 97 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
99}; 98};
100 99
101struct button_mapping button_context_yesno[] = { 100const struct button_mapping button_context_yesno[] = {
102 { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, 101 { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE },
103 102
104 LAST_ITEM_IN_LIST 103 LAST_ITEM_IN_LIST
105}; 104};
106 105
107struct button_mapping* get_context_mapping( int context ) 106struct button_mapping button_context_bmark[] = {
107 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
108 { ACTION_BMARK_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
109 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
110
111 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
112}; /* button_context_settings_bmark */
113
114const struct button_mapping* get_context_mapping( int context )
108{ 115{
109 switch( context ) 116 switch( context )
110 { 117 {
@@ -120,7 +127,10 @@ struct button_mapping* get_context_mapping( int context )
120 case CONTEXT_YESNOSCREEN: 127 case CONTEXT_YESNOSCREEN:
121 return button_context_yesno; 128 return button_context_yesno;
122 129
123 case CONTEXT_TREE: 130 case CONTEXT_BOOKMARKSCREEN:
131 return button_context_bmark;
132
133 case CONTEXT_TREE:
124 if (global_settings.hold_lr_for_scroll_in_list) 134 if (global_settings.hold_lr_for_scroll_in_list)
125 return button_context_tree_scroll_lr; 135 return button_context_tree_scroll_lr;
126 /* else fall through to CUSTOM|1 */ 136 /* else fall through to CUSTOM|1 */
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-18 00:20:24 +0000