From 34e3b51ba86c49b1dfcadc11d57812a91df4ff77 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 29 Apr 2016 19:07:36 +0200 Subject: [PATCH] return tuple for msg events as well --- extmod/modtrezormsg/modtrezormsg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/extmod/modtrezormsg/modtrezormsg.c b/extmod/modtrezormsg/modtrezormsg.c index 8f42e66a5..1aa8c0c52 100644 --- a/extmod/modtrezormsg/modtrezormsg.c +++ b/extmod/modtrezormsg/modtrezormsg.c @@ -59,7 +59,7 @@ STATIC mp_obj_t mod_TrezorMsg_Msg_select(mp_obj_t self, mp_obj_t timeout_us) { uint32_t e = msg_poll_ui_event(); if (e) { mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL)); - tuple->items[0] = MP_OBJ_NEW_SMALL_INT((e & 0xFF0000) >> 16); + tuple->items[0] = MP_OBJ_NEW_SMALL_INT(-((e & 0xFF0000) >> 16)); tuple->items[1] = MP_OBJ_NEW_SMALL_INT((e & 0xFF00) >> 8); tuple->items[2] = MP_OBJ_NEW_SMALL_INT((e & 0xFF)); return MP_OBJ_FROM_PTR(tuple); @@ -69,8 +69,11 @@ STATIC mp_obj_t mod_TrezorMsg_Msg_select(mp_obj_t self, mp_obj_t timeout_us) { vstr_t vstr; vstr_init_len(&vstr, 64); memcpy(vstr.buf, m, 64); - return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); - } + mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL)); + tuple->items[0] = MP_OBJ_NEW_SMALL_INT(-4); + tuple->items[1] = mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); + return MP_OBJ_FROM_PTR(tuple); + } if (to <= 0) { break; }