From d0e179e090d49f6836c05df4dd5b2daf0c1d9768 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Mon, 4 Apr 2016 15:14:30 +0200
Subject: [PATCH] rename touch.callback functions

---
 docs/api.md                      |  6 +++---
 extmod/modTrezorUi/modTrezorUi.c | 24 ++++++++++++------------
 src/main.py                      |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/api.md b/docs/api.md
index 5e9f63f7..86014c03 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -42,9 +42,9 @@ trezor.ui.display.backlight(self, val: int) -> None
 ###trezor.ui.touch
 
 ``` python
-trezor.ui.touch.callback_start(self, callback) -> None
+trezor.ui.touch.start(self, callback) -> None
 
-trezor.ui.touch.callback_move(self, callback) -> None
+trezor.ui.touch.move(self, callback) -> None
 
-trezor.ui.touch.callback_end(self, callback) -> None
+trezor.ui.touch.end(self, callback) -> None
 ```
diff --git a/extmod/modTrezorUi/modTrezorUi.c b/extmod/modTrezorUi/modTrezorUi.c
index 32f7d41d..da572922 100644
--- a/extmod/modTrezorUi/modTrezorUi.c
+++ b/extmod/modTrezorUi/modTrezorUi.c
@@ -377,33 +377,33 @@ STATIC mp_obj_t mod_TrezorUi_Touch_make_new(const mp_obj_type_t *type, size_t n_
     return MP_OBJ_FROM_PTR(o);
 }
 
-// def Touch.callback_start(self, callback) -> None
-STATIC mp_obj_t mod_TrezorUi_Touch_callback_start(mp_obj_t self, mp_obj_t callback) {
+// def Touch.start(self, callback) -> None
+STATIC mp_obj_t mod_TrezorUi_Touch_start(mp_obj_t self, mp_obj_t callback) {
     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);
+MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_start_obj, mod_TrezorUi_Touch_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) {
+// def Touch.move(self, callback) -> None
+STATIC mp_obj_t mod_TrezorUi_Touch_move(mp_obj_t self, mp_obj_t callback) {
     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);
+MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_move_obj, mod_TrezorUi_Touch_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) {
+// def Touch.end(self, callback) -> None
+STATIC mp_obj_t mod_TrezorUi_Touch_end(mp_obj_t self, mp_obj_t callback) {
     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);
+MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_end_obj, mod_TrezorUi_Touch_end);
 
 // Touch stuff
 
 STATIC const mp_rom_map_elem_t mod_TrezorUi_Touch_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_callback_start), MP_ROM_PTR(&mod_TrezorUi_Touch_callback_start_obj) },
-    { MP_ROM_QSTR(MP_QSTR_callback_move), MP_ROM_PTR(&mod_TrezorUi_Touch_callback_move_obj) },
-    { MP_ROM_QSTR(MP_QSTR_callback_end), MP_ROM_PTR(&mod_TrezorUi_Touch_callback_end_obj) },
+    { MP_ROM_QSTR(MP_QSTR_start), MP_ROM_PTR(&mod_TrezorUi_Touch_start_obj) },
+    { MP_ROM_QSTR(MP_QSTR_move), MP_ROM_PTR(&mod_TrezorUi_Touch_move_obj) },
+    { MP_ROM_QSTR(MP_QSTR_end), MP_ROM_PTR(&mod_TrezorUi_Touch_end_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(mod_TrezorUi_Touch_locals_dict, mod_TrezorUi_Touch_locals_dict_table);
 
diff --git a/src/main.py b/src/main.py
index dbb85042..61128fc9 100644
--- a/src/main.py
+++ b/src/main.py
@@ -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.start(lambda x, y: print('touch start %d %d\n' % (x, y)))
+ui.touch.move(lambda x, y: print('touch move %d %d\n' % (x, y)))
+ui.touch.end(lambda x, y: print('touch end %d %d\n' % (x, y)))
 
 import playground
 playground.run()