nyx: adjust handling of touch return values
This commit is contained in:
@@ -348,8 +348,12 @@ static bool _fts_touch_read(lv_indev_data_t *data)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (console_enabled && !res)
|
if (console_enabled)
|
||||||
{
|
{
|
||||||
|
// If no event, keep last debug message.
|
||||||
|
if (res)
|
||||||
|
return false;
|
||||||
|
|
||||||
// Print input debugging in console.
|
// Print input debugging in console.
|
||||||
gfx_con_getpos(&gfx_con.savedx, &gfx_con.savedy, &gfx_con.savedcol);
|
gfx_con_getpos(&gfx_con.savedx, &gfx_con.savedy, &gfx_con.savedcol);
|
||||||
gfx_con_setpos(32, 638, GFX_COL_AUTO);
|
gfx_con_setpos(32, 638, GFX_COL_AUTO);
|
||||||
@@ -2516,7 +2520,7 @@ void nyx_load_and_run()
|
|||||||
close_btn = NULL;
|
close_btn = NULL;
|
||||||
|
|
||||||
// Initialize touch.
|
// Initialize touch.
|
||||||
touch_enabled = touch_power_on();
|
touch_enabled = !touch_power_on();
|
||||||
lv_indev_drv_t indev_drv_touch;
|
lv_indev_drv_t indev_drv_touch;
|
||||||
lv_indev_drv_init(&indev_drv_touch);
|
lv_indev_drv_init(&indev_drv_touch);
|
||||||
indev_drv_touch.type = LV_INDEV_TYPE_POINTER;
|
indev_drv_touch.type = LV_INDEV_TYPE_POINTER;
|
||||||
|
|||||||
@@ -999,7 +999,7 @@ static lv_res_t _create_window_unset_abit_tool(lv_obj_t *btn)
|
|||||||
|
|
||||||
static lv_res_t _create_mbox_fix_touchscreen(lv_obj_t *btn)
|
static lv_res_t _create_mbox_fix_touchscreen(lv_obj_t *btn)
|
||||||
{
|
{
|
||||||
int res = 0;
|
int res = 1;
|
||||||
lv_obj_t *dark_bg = lv_obj_create(lv_scr_act(), NULL);
|
lv_obj_t *dark_bg = lv_obj_create(lv_scr_act(), NULL);
|
||||||
lv_obj_set_style(dark_bg, &mbox_darken);
|
lv_obj_set_style(dark_bg, &mbox_darken);
|
||||||
lv_obj_set_size(dark_bg, LV_HOR_RES, LV_VER_RES);
|
lv_obj_set_size(dark_bg, LV_HOR_RES, LV_VER_RES);
|
||||||
@@ -1045,7 +1045,7 @@ static lv_res_t _create_mbox_fix_touchscreen(lv_obj_t *btn)
|
|||||||
if (!err[0] && !err[1])
|
if (!err[0] && !err[1])
|
||||||
{
|
{
|
||||||
res = touch_execute_autotune();
|
res = touch_execute_autotune();
|
||||||
if (res)
|
if (!res)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1103,7 +1103,7 @@ ito_failed:
|
|||||||
touch_sense_enable();
|
touch_sense_enable();
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (res)
|
if (!res)
|
||||||
lv_mbox_set_text(mbox, "#C7EA46 The touchscreen calibration finished!");
|
lv_mbox_set_text(mbox, "#C7EA46 The touchscreen calibration finished!");
|
||||||
else
|
else
|
||||||
lv_mbox_set_text(mbox, "#FFFF00 The touchscreen calibration failed!");
|
lv_mbox_set_text(mbox, "#FFFF00 The touchscreen calibration failed!");
|
||||||
|
|||||||
Reference in New Issue
Block a user