arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 17:38:39 +00:00
Code Issues Releases Wiki Activity

embed: add confirm/cancel actions to touch events

Browse Source
This commit is contained in:
Pavol Rusnak 2018-08-31 15:53:36 +02:00
parent e3607156d8
commit 01a876f486
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embed/extmod/modtrezorio/modtrezorio.c
View File

@ -54,8 +54,10 @@ STATIC const mp_rom_map_elem_t mp_module_trezorio_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_TOUCH), MP_OBJ_NEW_SMALL_INT(TOUCH_IFACE) },
{ MP_ROM_QSTR(MP_QSTR_TOUCH_START), MP_OBJ_NEW_SMALL_INT((TOUCH_START >> 24) & 0xFFU) },
{ MP_ROM_QSTR(MP_QSTR_TOUCH_MOVE), MP_OBJ_NEW_SMALL_INT((TOUCH_MOVE >> 24) & 0xFFU) },
{ MP_ROM_QSTR(MP_QSTR_TOUCH_END), MP_OBJ_NEW_SMALL_INT((TOUCH_END >> 24) & 0xFFU) },
{ MP_ROM_QSTR(MP_QSTR_TOUCH_MOVE), MP_OBJ_NEW_SMALL_INT((TOUCH_MOVE >> 24) & 0xFFU) },
{ MP_ROM_QSTR(MP_QSTR_TOUCH_END), MP_OBJ_NEW_SMALL_INT((TOUCH_END >> 24) & 0xFFU) },
{ MP_ROM_QSTR(MP_QSTR_TOUCH_CONFIRM), MP_OBJ_NEW_SMALL_INT((TOUCH_CONFIRM >> 24) & 0xFFU) },
{ MP_ROM_QSTR(MP_QSTR_TOUCH_CANCEL), MP_OBJ_NEW_SMALL_INT((TOUCH_CANCEL >> 24) & 0xFFU) },
};
STATIC MP_DEFINE_CONST_DICT(mp_module_trezorio_globals, mp_module_trezorio_globals_table);

8
embed/trezorhal/touch.h
View File

@ -22,9 +22,11 @@
#include <stdint.h>
#define TOUCH_START (1U << 24)
#define TOUCH_MOVE (2U << 24)
#define TOUCH_END (4U << 24)
#define TOUCH_START (1U << 24)
#define TOUCH_MOVE (1U << 25)
#define TOUCH_END (1U << 26)
#define TOUCH_CONFIRM (1U << 27)
#define TOUCH_CANCEL (1U << 28)
void touch_init(void);
void touch_power_on(void);

16
embed/unix/touch.c
View File

@ -67,11 +67,17 @@ uint32_t touch_read(void)
}
break;
case SDL_KEYUP:
if (event.key.keysym.sym == SDLK_ESCAPE) {
__shutdown();
}
if (event.key.keysym.sym == SDLK_p) {
display_save("emu");
switch (event.key.keysym.sym) {
case SDLK_ESCAPE:
__shutdown();
break;
case SDLK_p:
display_save("emu");
break;
case SDLK_RIGHT:
return TOUCH_CONFIRM;
case SDLK_LEFT:
return TOUCH_CANCEL;
}
break;
case SDL_QUIT: