From daa87d92b3df433578e53284a8c88083e24f8623 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Sat, 27 Mar 2021 22:08:31 +0100 Subject: form/app cleanup; scroll infrastructure --- fw/fe310/test/modem.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'fw/fe310/test/modem.c') diff --git a/fw/fe310/test/modem.c b/fw/fe310/test/modem.c index ec74482..b78a3b4 100644 --- a/fw/fe310/test/modem.c +++ b/fw/fe310/test/modem.c @@ -22,7 +22,6 @@ #include #include -#include #include "modem.h" @@ -79,8 +78,8 @@ static void handle_uart(unsigned char type) { } static void handle_cell_msg(unsigned char type, unsigned char *buffer, uint16_t len) { - EVEWindow *root = app_root(); - EVEWindow *window = eve_window_search(root, "main"); + EVEWindowRoot *root = app_root(); + EVEWindow *window = eve_window_search(&root->w, "main"); VParam *param = window->view->param; if (type == EOS_CELL_MTYPE_UART_DATA) { @@ -106,7 +105,7 @@ static uint8_t modem_draw(EVEView *view, uint8_t tag0) { VParam *param = view->param; EVEText *text = ¶m->text; - tag0 = eve_view_clear(view, tag0); + tag0 = eve_view_clear(view, tag0, 0); return eve_text_draw(text, tag0); } @@ -119,7 +118,7 @@ static int modem_touch(EVEView *view, EVETouch *touch, uint16_t evt, uint8_t tag void app_modem(EVEWindow *window, EVEViewStack *stack) { unsigned char *buf; - EVEWindowRoot *root = (EVEWindowRoot *)window->root; + EVEWindowRoot *root = window->root; EVEKbd *kbd = eve_window_kbd(window); EVERect g = {0, 60, 480, 512}; EVEView *view; @@ -150,7 +149,7 @@ void app_modem_close(EVEView *view) { unsigned char *buf = eos_net_alloc(); VParam *param = view->param; EVEWindow *window = view->window; - EVEWindowRoot *root = (EVEWindowRoot *)window->root; + EVEWindowRoot *root = window->root; EVEKbd *kbd = eve_window_kbd(window); EVEViewStack *stack = param->stack; -- cgit v1.2.3