diff options
author | Szymon Dziok <b0hoon@o2.pl> | 2010-02-11 20:04:09 +0000 |
---|---|---|
committer | Szymon Dziok <b0hoon@o2.pl> | 2010-02-11 20:04:09 +0000 |
commit | f8287b0e9f61e58a8001d4998c7942e072f439e8 (patch) | |
tree | 18f6a8de920d1732ed36a345615214e61bf24295 | |
parent | 446eda80c9be49eaa8c2830aeaa43ecaf3729908 (diff) | |
download | rockbox-f8287b0e9f61e58a8001d4998c7942e072f439e8.tar.gz rockbox-f8287b0e9f61e58a8001d4998c7942e072f439e8.zip |
Packard Bell Vibe 500: correct main keymaps, enable full keyboard editing, enable morse input.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24600 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-vibe500.c | 161 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 6 | ||||
-rw-r--r-- | firmware/export/config/vibe500.h | 3 |
3 files changed, 83 insertions, 87 deletions
diff --git a/apps/keymaps/keymap-vibe500.c b/apps/keymaps/keymap-vibe500.c index 5a779d2841..0a4cf83921 100644 --- a/apps/keymaps/keymap-vibe500.c +++ b/apps/keymaps/keymap-vibe500.c | |||
@@ -47,8 +47,8 @@ static const struct button_mapping button_context_standard[] = { | |||
47 | { ACTION_STD_OK, BUTTON_NEXT, BUTTON_NONE }, | 47 | { ACTION_STD_OK, BUTTON_NEXT, BUTTON_NONE }, |
48 | { ACTION_STD_OK, BUTTON_OK|BUTTON_REL, BUTTON_OK }, | 48 | { ACTION_STD_OK, BUTTON_OK|BUTTON_REL, BUTTON_OK }, |
49 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 49 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
50 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 50 | { ACTION_STD_QUICKSCREEN, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, |
51 | { ACTION_STD_CONTEXT, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, | 51 | { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
52 | 52 | ||
53 | LAST_ITEM_IN_LIST | 53 | LAST_ITEM_IN_LIST |
54 | }; /* button_context_standard */ | 54 | }; /* button_context_standard */ |
@@ -62,16 +62,13 @@ static const struct button_mapping button_context_wps[] = { | |||
62 | { ACTION_WPS_SKIPNEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | 62 | { ACTION_WPS_SKIPNEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
63 | { ACTION_WPS_SEEKFWD, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 63 | { ACTION_WPS_SEEKFWD, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
64 | { ACTION_WPS_STOPSEEK, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT|BUTTON_REPEAT }, | 64 | { ACTION_WPS_STOPSEEK, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT|BUTTON_REPEAT }, |
65 | { ACTION_WPS_VOLDOWN, BUTTON_UP, BUTTON_NONE }, | 65 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
66 | { ACTION_WPS_VOLDOWN, BUTTON_UP, BUTTON_NONE }, | 66 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
67 | { ACTION_WPS_VOLUP, BUTTON_DOWN, BUTTON_NONE }, | ||
68 | { ACTION_WPS_VOLUP, BUTTON_DOWN, BUTTON_NONE }, | ||
69 | { ACTION_WPS_BROWSE, BUTTON_OK|BUTTON_REL, BUTTON_OK }, | 67 | { ACTION_WPS_BROWSE, BUTTON_OK|BUTTON_REL, BUTTON_OK }, |
70 | { ACTION_WPS_CONTEXT, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, | 68 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
71 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_OK|BUTTON_PLAY, BUTTON_NONE }, | 69 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_CANCEL, BUTTON_NONE }, |
72 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 70 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
73 | { ACTION_WPS_MENU, BUTTON_CANCEL|BUTTON_REL, BUTTON_MENU }, | 71 | { ACTION_WPS_QUICKSCREEN, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, |
74 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
75 | 72 | ||
76 | LAST_ITEM_IN_LIST | 73 | LAST_ITEM_IN_LIST |
77 | }; /* button_context_wps */ | 74 | }; /* button_context_wps */ |
@@ -93,6 +90,7 @@ static const struct button_mapping button_context_tree_scroll_lr[] = { | |||
93 | { ACTION_STD_OK, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | 90 | { ACTION_STD_OK, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
94 | { ACTION_TREE_PGRIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 91 | { ACTION_TREE_PGRIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
95 | { ACTION_TREE_PGRIGHT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT|BUTTON_REPEAT }, | 92 | { ACTION_TREE_PGRIGHT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT|BUTTON_REPEAT }, |
93 | |||
96 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 94 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
97 | }; /* button_context_tree_scroll_lr */ | 95 | }; /* button_context_tree_scroll_lr */ |
98 | 96 | ||
@@ -122,15 +120,13 @@ static const struct button_mapping button_context_bmark[] = { | |||
122 | }; /* button_context_bmark */ | 120 | }; /* button_context_bmark */ |
123 | 121 | ||
124 | static const struct button_mapping button_context_quickscreen[] = { | 122 | static const struct button_mapping button_context_quickscreen[] = { |
125 | { ACTION_QS_TOP, BUTTON_MENU, BUTTON_NONE }, | 123 | { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE }, |
126 | { ACTION_QS_TOP, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 124 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
127 | { ACTION_QS_DOWN, BUTTON_PLAY, BUTTON_NONE }, | ||
128 | { ACTION_QS_DOWN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
129 | { ACTION_QS_LEFT, BUTTON_PREV, BUTTON_NONE }, | 125 | { ACTION_QS_LEFT, BUTTON_PREV, BUTTON_NONE }, |
130 | { ACTION_QS_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 126 | { ACTION_QS_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
131 | { ACTION_QS_RIGHT, BUTTON_NEXT, BUTTON_NONE }, | 127 | { ACTION_QS_RIGHT, BUTTON_NEXT, BUTTON_NONE }, |
132 | { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 128 | { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
133 | { ACTION_STD_CANCEL, BUTTON_CANCEL, BUTTON_NONE }, | 129 | { ACTION_STD_CANCEL, BUTTON_OK, BUTTON_NONE }, |
134 | 130 | ||
135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
136 | }; /* button_context_quickscreen */ | 132 | }; /* button_context_quickscreen */ |
@@ -146,7 +142,7 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
146 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, | 142 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, |
147 | { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY, BUTTON_NONE }, | 143 | { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY, BUTTON_NONE }, |
148 | { ACTION_PS_RESET, BUTTON_MENU, BUTTON_NONE }, | 144 | { ACTION_PS_RESET, BUTTON_MENU, BUTTON_NONE }, |
149 | { ACTION_PS_EXIT, BUTTON_CANCEL, BUTTON_NONE }, | 145 | { ACTION_PS_EXIT, BUTTON_OK, BUTTON_NONE }, |
150 | { ACTION_PS_SLOWER, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 146 | { ACTION_PS_SLOWER, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
151 | { ACTION_PS_FASTER, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 147 | { ACTION_PS_FASTER, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
152 | 148 | ||
@@ -155,18 +151,18 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
155 | 151 | ||
156 | static const struct button_mapping button_context_keyboard[] = { | 152 | static const struct button_mapping button_context_keyboard[] = { |
157 | { ACTION_KBD_LEFT, BUTTON_PREV, BUTTON_NONE }, | 153 | { ACTION_KBD_LEFT, BUTTON_PREV, BUTTON_NONE }, |
158 | { ACTION_KBD_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 154 | { ACTION_KBD_LEFT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
159 | { ACTION_KBD_RIGHT, BUTTON_NEXT, BUTTON_NONE }, | 155 | { ACTION_KBD_RIGHT, BUTTON_NEXT, BUTTON_NONE }, |
160 | { ACTION_KBD_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 156 | { ACTION_KBD_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
161 | { ACTION_KBD_SELECT, BUTTON_OK, BUTTON_NONE }, | 157 | { ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE }, |
162 | { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE }, | 158 | { ACTION_KBD_DONE, BUTTON_OK, BUTTON_NONE }, |
163 | { ACTION_KBD_ABORT, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, | 159 | { ACTION_KBD_ABORT, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, |
164 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 160 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
165 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | ||
166 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
167 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 161 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
162 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | ||
168 | { ACTION_KBD_MORSE_INPUT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 163 | { ACTION_KBD_MORSE_INPUT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
169 | { ACTION_KBD_MORSE_SELECT, BUTTON_OK|BUTTON_REL, BUTTON_NONE }, | 164 | { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
165 | |||
170 | LAST_ITEM_IN_LIST | 166 | LAST_ITEM_IN_LIST |
171 | }; /* button_context_keyboard */ | 167 | }; /* button_context_keyboard */ |
172 | 168 | ||
@@ -174,17 +170,15 @@ static const struct button_mapping button_context_keyboard[] = { | |||
174 | const struct button_mapping button_context_recscreen[] = { | 170 | const struct button_mapping button_context_recscreen[] = { |
175 | 171 | ||
176 | { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 172 | { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
177 | { ACTION_STD_MENU, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, | 173 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
178 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 174 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
179 | { ACTION_STD_CANCEL, BUTTON_CANCEL, BUTTON_NONE }, | 175 | { ACTION_STD_CANCEL, BUTTON_CANCEL, BUTTON_NONE }, |
180 | { ACTION_STD_NEXT, BUTTON_UP, BUTTON_NONE }, | 176 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
181 | { ACTION_STD_NEXT, BUTTON_UP, BUTTON_NONE }, | 177 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
182 | { ACTION_STD_PREV, BUTTON_DOWN, BUTTON_NONE }, | ||
183 | { ACTION_STD_PREV, BUTTON_DOWN, BUTTON_NONE }, | ||
184 | { ACTION_SETTINGS_INC, BUTTON_NEXT, BUTTON_NONE }, | 178 | { ACTION_SETTINGS_INC, BUTTON_NEXT, BUTTON_NONE }, |
185 | { ACTION_SETTINGS_INCREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 179 | { ACTION_SETTINGS_INCREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
186 | { ACTION_SETTINGS_DEC, BUTTON_PREV, BUTTON_NONE }, | 180 | { ACTION_SETTINGS_DEC, BUTTON_PREV, BUTTON_NONE }, |
187 | { ACTION_SETTINGS_DECREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 181 | { ACTION_SETTINGS_DECREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
188 | 182 | ||
189 | LAST_ITEM_IN_LIST | 183 | LAST_ITEM_IN_LIST |
190 | }; /* button_context_recscreen */ | 184 | }; /* button_context_recscreen */ |
@@ -192,84 +186,80 @@ const struct button_mapping button_context_recscreen[] = { | |||
192 | 186 | ||
193 | #ifdef USB_ENABLE_HID | 187 | #ifdef USB_ENABLE_HID |
194 | static const struct button_mapping button_context_usb_hid[] = { | 188 | static const struct button_mapping button_context_usb_hid[] = { |
195 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_NEXT|BUTTON_REL, BUTTON_REC|BUTTON_NEXT }, | 189 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_OK|BUTTON_NEXT|BUTTON_REL, BUTTON_OK|BUTTON_NEXT }, |
196 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_NEXT|BUTTON_REPEAT, BUTTON_REC|BUTTON_NEXT }, | 190 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_OK|BUTTON_NEXT|BUTTON_REPEAT, BUTTON_OK|BUTTON_NEXT }, |
197 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_PREV|BUTTON_REL, BUTTON_REC|BUTTON_PREV }, | 191 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_OK|BUTTON_PREV|BUTTON_REL, BUTTON_OK|BUTTON_PREV }, |
198 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_PREV|BUTTON_REPEAT, BUTTON_REC|BUTTON_PREV }, | 192 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_OK|BUTTON_PREV|BUTTON_REPEAT, BUTTON_OK|BUTTON_PREV }, |
199 | 193 | ||
200 | LAST_ITEM_IN_LIST | 194 | LAST_ITEM_IN_LIST |
201 | }; /* button_context_usb_hid */ | 195 | }; /* button_context_usb_hid */ |
202 | 196 | ||
203 | static const struct button_mapping button_context_usb_hid_mode_multimedia[] = { | 197 | static const struct button_mapping button_context_usb_hid_mode_multimedia[] = { |
204 | { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_UP, BUTTON_NONE }, | 198 | { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
205 | { ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN, BUTTON_UP, BUTTON_NONE }, | 199 | { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_UP, BUTTON_NONE }, |
206 | { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_DOWN, BUTTON_NONE }, | 200 | { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
207 | { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_DOWN, BUTTON_NONE }, | 201 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
208 | { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, | 202 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, |
209 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 203 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
210 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 204 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, |
211 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 205 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
212 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, | ||
213 | { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | ||
214 | 206 | ||
215 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | 207 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) |
216 | }; /* button_context_usb_hid_mode_multimedia */ | 208 | }; /* button_context_usb_hid_mode_multimedia */ |
217 | 209 | ||
218 | static const struct button_mapping button_context_usb_hid_mode_presentation[] = { | 210 | static const struct button_mapping button_context_usb_hid_mode_presentation[] = { |
219 | { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 211 | { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
220 | { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 212 | { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
221 | { ACTION_USB_HID_PRESENTATION_SLIDE_PREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, | 213 | { ACTION_USB_HID_PRESENTATION_SLIDE_PREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, |
222 | { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | 214 | { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
223 | { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST, BUTTON_PREV|BUTTON_REPEAT, BUTTON_PREV }, | 215 | { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST, BUTTON_PREV|BUTTON_REPEAT, BUTTON_PREV }, |
224 | { ACTION_USB_HID_PRESENTATION_SLIDE_LAST, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NEXT }, | 216 | { ACTION_USB_HID_PRESENTATION_SLIDE_LAST, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NEXT }, |
225 | { ACTION_USB_HID_PRESENTATION_SCREEN_BLACK, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, | 217 | { ACTION_USB_HID_PRESENTATION_SCREEN_BLACK, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, |
226 | { ACTION_USB_HID_PRESENTATION_SCREEN_WHITE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 218 | { ACTION_USB_HID_PRESENTATION_SCREEN_WHITE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
227 | { ACTION_USB_HID_PRESENTATION_LINK_PREV, BUTTON_UP, BUTTON_NONE }, | 219 | { ACTION_USB_HID_PRESENTATION_LINK_PREV, BUTTON_UP, BUTTON_NONE }, |
228 | { ACTION_USB_HID_PRESENTATION_LINK_PREV, BUTTON_UP, BUTTON_NONE }, | 220 | { ACTION_USB_HID_PRESENTATION_LINK_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
229 | { ACTION_USB_HID_PRESENTATION_LINK_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 221 | { ACTION_USB_HID_PRESENTATION_MOUSE_CLICK, BUTTON_OK|BUTTON_REL, BUTTON_OK }, |
230 | { ACTION_USB_HID_PRESENTATION_LINK_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 222 | { ACTION_USB_HID_PRESENTATION_MOUSE_OVER, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, |
231 | { ACTION_USB_HID_PRESENTATION_MOUSE_CLICK, BUTTON_OK|BUTTON_REL, BUTTON_OK }, | ||
232 | { ACTION_USB_HID_PRESENTATION_MOUSE_OVER, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, | ||
233 | 223 | ||
234 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | 224 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) |
235 | }; /* button_context_usb_hid_mode_presentation */ | 225 | }; /* button_context_usb_hid_mode_presentation */ |
236 | 226 | ||
237 | static const struct button_mapping button_context_usb_hid_mode_browser[] = { | 227 | static const struct button_mapping button_context_usb_hid_mode_browser[] = { |
238 | { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_UP, BUTTON_NONE }, | 228 | { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_UP, BUTTON_NONE }, |
239 | { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_UP, BUTTON_NONE }, | 229 | { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
240 | { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 230 | { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP, BUTTON_OK|BUTTON_REL, BUTTON_OK }, |
241 | { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 231 | { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, |
242 | { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 232 | { ACTION_USB_HID_BROWSER_ZOOM_IN, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
243 | { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 233 | { ACTION_USB_HID_BROWSER_ZOOM_OUT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
244 | { ACTION_USB_HID_BROWSER_ZOOM_IN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 234 | { ACTION_USB_HID_BROWSER_ZOOM_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
245 | { ACTION_USB_HID_BROWSER_ZOOM_OUT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 235 | { ACTION_USB_HID_BROWSER_TAB_PREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, |
246 | { ACTION_USB_HID_BROWSER_ZOOM_RESET, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, | 236 | { ACTION_USB_HID_BROWSER_TAB_NEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
247 | { ACTION_USB_HID_BROWSER_TAB_PREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, | 237 | { ACTION_USB_HID_BROWSER_TAB_CLOSE, BUTTON_CANCEL|BUTTON_REPEAT, BUTTON_CANCEL }, |
248 | { ACTION_USB_HID_BROWSER_TAB_NEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | 238 | { ACTION_USB_HID_BROWSER_HISTORY_BACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_PREV }, |
249 | { ACTION_USB_HID_BROWSER_TAB_CLOSE, BUTTON_CANCEL|BUTTON_REL, BUTTON_CANCEL }, | 239 | { ACTION_USB_HID_BROWSER_HISTORY_FORWARD, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NEXT }, |
250 | { ACTION_USB_HID_BROWSER_HISTORY_BACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_PREV }, | 240 | { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
251 | { ACTION_USB_HID_BROWSER_HISTORY_FORWARD, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NEXT }, | ||
252 | { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_OK|BUTTON_REL, BUTTON_OK }, | ||
253 | 241 | ||
254 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | 242 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) |
255 | }; /* button_context_usb_hid_mode_browser */ | 243 | }; /* button_context_usb_hid_mode_browser */ |
256 | 244 | ||
257 | #ifdef HAVE_USB_HID_MOUSE | 245 | #ifdef HAVE_USB_HID_MOUSE |
258 | static const struct button_mapping button_context_usb_hid_mode_mouse[] = { | 246 | static const struct button_mapping button_context_usb_hid_mode_mouse[] = { |
259 | { ACTION_USB_HID_MOUSE_UP, BUTTON_OK, BUTTON_NONE }, | 247 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, |
260 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_OK|BUTTON_REPEAT, BUTTON_NONE }, | 248 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP, BUTTON_NONE }, |
261 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_CANCEL, BUTTON_NONE }, | 249 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
262 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_CANCEL|BUTTON_REPEAT, BUTTON_NONE }, | 250 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN, BUTTON_NONE }, |
263 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_PREV, BUTTON_NONE }, | 251 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_PREV, BUTTON_NONE }, |
264 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 252 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
265 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_NEXT, BUTTON_NONE }, | 253 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_NEXT, BUTTON_NONE }, |
266 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 254 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
267 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_MENU, BUTTON_NONE }, | 255 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_MENU, BUTTON_NONE }, |
268 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, | 256 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, |
269 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_UP, BUTTON_NONE }, | 257 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_PLAY, BUTTON_NONE }, |
270 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_UP, BUTTON_NONE }, | 258 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
271 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 259 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_OK, BUTTON_NONE }, |
272 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 260 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_OK|BUTTON_REPEAT, BUTTON_NONE }, |
261 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_CANCEL, BUTTON_NONE }, | ||
262 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_CANCEL|BUTTON_REPEAT, BUTTON_NONE }, | ||
273 | 263 | ||
274 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | 264 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) |
275 | }; /* button_context_usb_hid_mode_mouse */ | 265 | }; /* button_context_usb_hid_mode_mouse */ |
@@ -312,6 +302,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
312 | case CONTEXT_PITCHSCREEN: | 302 | case CONTEXT_PITCHSCREEN: |
313 | return button_context_pitchscreen; | 303 | return button_context_pitchscreen; |
314 | case CONTEXT_KEYBOARD: | 304 | case CONTEXT_KEYBOARD: |
305 | case CONTEXT_MORSE_INPUT: | ||
315 | return button_context_keyboard; | 306 | return button_context_keyboard; |
316 | #ifdef HAVE_RECORDING | 307 | #ifdef HAVE_RECORDING |
317 | case CONTEXT_RECSCREEN: | 308 | case CONTEXT_RECSCREEN: |
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 76e7df0509..fdf1f3a433 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -54,7 +54,8 @@ | |||
54 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ | 54 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ |
55 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ | 55 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
56 | || (CONFIG_KEYPAD == IAUDIO_M3_PAD) \ | 56 | || (CONFIG_KEYPAD == IAUDIO_M3_PAD) \ |
57 | || (CONFIG_KEYPAD == IRIVER_H10_PAD) | 57 | || (CONFIG_KEYPAD == IRIVER_H10_PAD) \ |
58 | || (CONFIG_KEYPAD == PBELL_VIBE500_PAD) \ | ||
58 | /* no key combos to move the cursor if not in line edit mode */ | 59 | /* no key combos to move the cursor if not in line edit mode */ |
59 | #define KBD_MODES /* uses 2 modes, picker and line edit */ | 60 | #define KBD_MODES /* uses 2 modes, picker and line edit */ |
60 | 61 | ||
@@ -85,7 +86,8 @@ | |||
85 | || (CONFIG_KEYPAD == MROBE100_PAD) \ | 86 | || (CONFIG_KEYPAD == MROBE100_PAD) \ |
86 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ | 87 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ |
87 | || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ | 88 | || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ |
88 | || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | 89 | || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ |
90 | || (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | ||
89 | /* certain key combos toggle input mode between keyboard input and Morse input */ | 91 | /* certain key combos toggle input mode between keyboard input and Morse input */ |
90 | #define KBD_TOGGLE_INPUT | 92 | #define KBD_TOGGLE_INPUT |
91 | #endif | 93 | #endif |
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h index b63bfa7447..76ec17a113 100644 --- a/firmware/export/config/vibe500.h +++ b/firmware/export/config/vibe500.h | |||
@@ -72,6 +72,9 @@ | |||
72 | 72 | ||
73 | #define CONFIG_KEYPAD PBELL_VIBE500_PAD | 73 | #define CONFIG_KEYPAD PBELL_VIBE500_PAD |
74 | 74 | ||
75 | /* Define this to enable morse code input */ | ||
76 | #define HAVE_MORSE_INPUT | ||
77 | |||
75 | /* Define this if you do software codec */ | 78 | /* Define this if you do software codec */ |
76 | #define CONFIG_CODEC SWCODEC | 79 | #define CONFIG_CODEC SWCODEC |
77 | 80 | ||