touch controller/eve fixes

2 files changed, 6 insertions, 6 deletions

diff --git a/fw/fe310/eos/eve/screen/page.c b/fw/fe310/eos/eve/screen/page.c
index 65dd534..28526ca 100644
--- a/fw/fe310/eos/eve/screen/page.c
+++ b/fw/fe310/eos/eve/screen/page.c
@@ -47,7 +47,7 @@ void eve_page_close(EVEPage *page) {
 
     if (page->lho_t0) {
         page->lho_t0 = 0;
-        eve_touch_timer_stop();
+        eve_timer_stop();
     }
     if (eve_window_scroll(window->root, NULL) == window) {
         eve_window_scroll_stop(window);
@@ -213,8 +213,8 @@ static int page_touch(EVEPage *page, EVETouch *touch, uint16_t evt, uint8_t tag0
 
                 eve_phy_lho_init(lho, lho_x, lho_y, 1000, 0.5, 0);
                 eve_phy_lho_start(lho, page->g.x, page->g.y);
-                page->lho_t0 = eve_time_get_tick();
-                eve_touch_timer_start(_tag, 20);
+                page->lho_t0 = eve_get_tick();
+                eve_timer_start(_tag, 20);
             }
         }
 
@@ -256,14 +256,14 @@ static int page_touch(EVEPage *page, EVETouch *touch, uint16_t evt, uint8_t tag0
             EVEPhyLHO *lho = &page->lho;
             int x, y, more;
 
-            more = eve_phy_lho_tick(lho, eve_time_get_tick() - page->lho_t0, scroll_x ? &x : NULL, scroll_y ? &y : NULL);
+            more = eve_phy_lho_tick(lho, eve_get_tick() - page->lho_t0, scroll_x ? &x : NULL, scroll_y ? &y : NULL);
             if (scroll_x) page->g.x = x;
             if (scroll_y) page->g.y = y;
             if (!more) {
                 int _ret = 0;
 
                 page->lho_t0 = 0;
-                eve_touch_timer_stop();
+                eve_timer_stop();
                 page->track_mode = PAGE_TMODE_NONE;
                 eve_window_scroll_stop(window);
                 _ret = eve_view_uievt_pusht(view, EVE_UIEVT_PAGE_SCROLL_STOP, touch, evt, tag0);
diff --git a/fw/fe310/eos/eve/screen/page.h b/fw/fe310/eos/eve/screen/page.h
index 26c33c5..0fc9809 100644
--- a/fw/fe310/eos/eve/screen/page.h
+++ b/fw/fe310/eos/eve/screen/page.h
@@ -26,7 +26,7 @@ typedef struct EVEPage {
     uint16_t widget_size;
     struct EVEWidget *widget_f;
     EVEPhyLHO lho;
-    uint64_t lho_t0;
+    uint32_t lho_t0;
     uint8_t track_mode;
     uint8_t opt;
 } EVEPage;