arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-16 11:28:14 +00:00
Code Issues Releases Wiki Activity

touch code wip

Browse Source
This commit is contained in:
Pavol Rusnak 2016-04-01 21:09:45 +02:00
parent 4ddde025db
commit 516057a7fa
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extmod/modTrezorUi/modTrezorUi-unix.h
View File

@ -47,15 +47,15 @@ static int HandleEvents(void *ptr)
if (x < 0 || y < 0 || x >= RESX || y >= RESY) continue;
switch (event.type) {
case SDL_MOUSEBUTTONDOWN:
printf("TOUCH START: %d %d\n", x, y);
// touch_start(x, y);
break;
case SDL_MOUSEMOTION:
if (event.motion.state) {
printf("TOUCH MOVE: %d %d\n", x, y);
// touch_move(x, y);
}
break;
case SDL_MOUSEBUTTONUP:
printf("TOUCH END: %d %d\n", x, y);
// touch_end(x, y);
break;
}
break;

32
extmod/modTrezorUi/modTrezorUi.c
View File

@ -18,6 +18,31 @@
#define RESX 240
#define RESY 240
mp_obj_t touch_start_callback = mp_const_none;
mp_obj_t touch_move_callback = mp_const_none;
mp_obj_t touch_end_callback = mp_const_none;
/*
static void touch_start(mp_int_t x, mp_int_t y) {
if (touch_start_callback != mp_const_none) {
mp_call_function_2(touch_start_callback, MP_OBJ_NEW_SMALL_INT(x), MP_OBJ_NEW_SMALL_INT(y));
}
}
static void touch_move(mp_int_t x, mp_int_t y) {
if (touch_move_callback != mp_const_none) {
mp_call_function_2(touch_move_callback, MP_OBJ_NEW_SMALL_INT(x), MP_OBJ_NEW_SMALL_INT(y));
}
}
static void touch_end(mp_int_t x, mp_int_t y) {
if (touch_end_callback != mp_const_none) {
mp_call_function_2(touch_end_callback, MP_OBJ_NEW_SMALL_INT(x), MP_OBJ_NEW_SMALL_INT(y));
}
}
*/
#if defined STM32_HAL_H
#include "modTrezorUi-stmhal.h"
#elif defined UNIX
@ -100,6 +125,7 @@ static void display_text(uint8_t x, uint8_t y, uint8_t *text, int textlen, uint8
const uint8_t *g;
uint8_t c;
set_color_table(fgcolor, bgcolor);
// render glyphs
for (i = 0; i < textlen; i++) {
if (text[i] >= ' ' && text[i] <= '~') {
@ -303,21 +329,21 @@ STATIC mp_obj_t mod_TrezorUi_Touch_make_new(const mp_obj_type_t *type, size_t n_
// def Touch.callback_start(self, callback) -> None:
STATIC mp_obj_t mod_TrezorUi_Touch_callback_start(mp_obj_t self, mp_obj_t callback) {
// TODO
touch_start_callback = callback;
return mp_const_none;
}
MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_callback_start_obj, mod_TrezorUi_Touch_callback_start);
// def Touch.callback_move(self, callback) -> None:
STATIC mp_obj_t mod_TrezorUi_Touch_callback_move(mp_obj_t self, mp_obj_t callback) {
// TODO
touch_move_callback = callback;
return mp_const_none;
}
MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_callback_move_obj, mod_TrezorUi_Touch_callback_move);
// def Touch.callback_end(self, callback) -> None:
STATIC mp_obj_t mod_TrezorUi_Touch_callback_end(mp_obj_t self, mp_obj_t callback) {
// TODO
touch_end_callback = callback;
return mp_const_none;
}
MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_callback_end_obj, mod_TrezorUi_Touch_callback_end);

6
src/main.py
View File

@ -4,9 +4,9 @@ import utime
layout.show_send('1BitkeyP2nDd5oa64x7AjvBbbwST54W5Zmx2', 110.126967)
# ui.touch.callback_start(lambda x, y: print('touch start %d %d\n', x, y))
# ui.touch.callback_move(lambda x, y: print('touch move %d %d\n', x, y))
# ui.touch.callback_end(lambda x, y: print('touch end %d %d\n', x, y))
ui.touch.callback_start(lambda x, y: print('touch start %d %d\n' % (x, y)))
ui.touch.callback_move(lambda x, y: print('touch move %d %d\n' % (x, y)))
ui.touch.callback_end(lambda x, y: print('touch end %d %d\n' % (x, y)))
import playground
playground.run()