summaryrefslogtreecommitdiff
path: root/fw/fe310/test
diff options
context:
space:
mode:
Diffstat (limited to 'fw/fe310/test')
-rw-r--r--fw/fe310/test/cell_pdp.c2
-rw-r--r--fw/fe310/test/main.c3
-rw-r--r--fw/fe310/test/modem.c10
-rw-r--r--fw/fe310/test/phone.c2
-rw-r--r--fw/fe310/test/status.c2
-rw-r--r--fw/fe310/test/wifi.c2
6 files changed, 5 insertions, 16 deletions
diff --git a/fw/fe310/test/cell_pdp.c b/fw/fe310/test/cell_pdp.c
index b7580cc..a45adc4 100644
--- a/fw/fe310/test/cell_pdp.c
+++ b/fw/fe310/test/cell_pdp.c
@@ -10,8 +10,6 @@
#include <net.h>
#include <cell.h>
-#include <unicode.h>
-
#include <eve/eve.h>
#include <eve/eve_kbd.h>
#include <eve/eve_font.h>
diff --git a/fw/fe310/test/main.c b/fw/fe310/test/main.c
index 37d7a45..a3af24b 100644
--- a/fw/fe310/test/main.c
+++ b/fw/fe310/test/main.c
@@ -10,8 +10,6 @@
#include <net.h>
#include <cell.h>
-#include <unicode.h>
-
#include <eve/eve.h>
#include <eve/eve_kbd.h>
#include <eve/eve_font.h>
@@ -68,7 +66,6 @@ int main() {
eos_init();
- app_form_init();
app_root_init(app_home_page);
app_status_init();
app_phone_init();
diff --git a/fw/fe310/test/modem.c b/fw/fe310/test/modem.c
index 8c3a8a6..ec74482 100644
--- a/fw/fe310/test/modem.c
+++ b/fw/fe310/test/modem.c
@@ -10,8 +10,6 @@
#include <net.h>
#include <cell.h>
-#include <unicode.h>
-
#include <eve/eve.h>
#include <eve/eve_kbd.h>
#include <eve/eve_text.h>
@@ -133,7 +131,7 @@ void app_modem(EVEWindow *window, EVEViewStack *stack) {
param->stack = stack;
param->cell_dev_handler = eos_cell_get_handler(EOS_CELL_MTYPE_DEV);
eve_text_init(&param->text, &g, 30, 16, 200, root->mem_next, &root->mem_next);
- eve_view_init(view, window, modem_draw, modem_touch, param);
+ eve_view_init(view, window, modem_draw, modem_touch, NULL, param);
eve_kbd_set_handler(kbd, key_down, view);
eve_window_kbd_attach(window);
@@ -153,6 +151,7 @@ void app_modem_close(EVEView *view) {
VParam *param = view->param;
EVEWindow *window = view->window;
EVEWindowRoot *root = (EVEWindowRoot *)window->root;
+ EVEKbd *kbd = eve_window_kbd(window);
EVEViewStack *stack = param->stack;
buf[0] = EOS_CELL_MTYPE_DEV | EOS_CELL_MTYPE_RESET;
@@ -163,9 +162,10 @@ void app_modem_close(EVEView *view) {
eos_net_acquire_for_evt(EOS_EVT_UART | EOS_UART_ETYPE_RX, 0);
root->mem_next = param->mem;
+ eve_window_kbd_detach(window);
+ eve_kbd_set_handler(kbd, NULL, NULL);
+
eve_free(param);
eve_free(view);
-
- eve_window_kbd_detach(window);
eve_view_destroy(window, stack);
}
diff --git a/fw/fe310/test/phone.c b/fw/fe310/test/phone.c
index 2d33760..de5ed1e 100644
--- a/fw/fe310/test/phone.c
+++ b/fw/fe310/test/phone.c
@@ -10,8 +10,6 @@
#include <net.h>
#include <cell.h>
-#include <unicode.h>
-
#include <eve/eve.h>
#include <eve/eve_kbd.h>
#include <eve/eve_font.h>
diff --git a/fw/fe310/test/status.c b/fw/fe310/test/status.c
index 7d3eb73..4413767 100644
--- a/fw/fe310/test/status.c
+++ b/fw/fe310/test/status.c
@@ -10,8 +10,6 @@
#include <net.h>
#include <cell.h>
-#include <unicode.h>
-
#include <eve/eve.h>
#include <eve/eve_kbd.h>
#include <eve/eve_font.h>
diff --git a/fw/fe310/test/wifi.c b/fw/fe310/test/wifi.c
index 2ce3e87..d3c61e4 100644
--- a/fw/fe310/test/wifi.c
+++ b/fw/fe310/test/wifi.c
@@ -10,8 +10,6 @@
#include <net.h>
#include <wifi.h>
-#include <unicode.h>
-
#include <eve/eve.h>
#include <eve/eve_kbd.h>
#include <eve/eve_font.h>