BigW Consortium Gitlab

Commit b1abcb93 by Gabor Kiss-Vamosi

all 3 hal elements are integrated

parent 3d381505
[submodule "misc"]
path = misc
url = https://github.com/littlevgl/misc
hal @ 86bad91f
Subproject commit 597fd86a782942df3ff7486da8a23831fe73681f Subproject commit 86bad91fff25a09fc66ccda5d5eb90aeaadf26bb
...@@ -90,8 +90,8 @@ void lv_dispi_reset(void) ...@@ -90,8 +90,8 @@ void lv_dispi_reset(void)
void lv_dispi_reset_lpr(lv_dispi_t * dispi) void lv_dispi_reset_lpr(lv_dispi_t * dispi)
{ {
dispi->long_press_sent = 0; dispi->long_press_sent = 0;
dispi->lpr_rep_time_stamp = systick_get(); dispi->lpr_rep_time_stamp = lv_hal_tick_get();
dispi->press_time_stamp = systick_get(); dispi->press_time_stamp = lv_hal_tick_get();
} }
/** /**
...@@ -145,16 +145,16 @@ void lv_dispi_wait_release(lv_dispi_t * dispi) ...@@ -145,16 +145,16 @@ void lv_dispi_wait_release(lv_dispi_t * dispi)
*/ */
static void dispi_task(void * param) static void dispi_task(void * param)
{ {
lv_hal_indev_data_t data;
return; //TODO lv_indev_t * drv;
cord_t x; drv = lv_hal_indev_next(NULL);
cord_t y;
uint8_t i; while(drv) {
drv->drv.get_data(&data);
for (i = 0; i < 1; i++) { drv->dispi.pressed = data.state;
//TODO dispi_array[i].pressed = indev_get(i, &x, &y); dispi_proc_point(&drv->dispi,data.point.x , data.point.y);
dispi_proc_point(&dispi_array[i], x, y); drv = lv_hal_indev_next(drv);
} }
/*If reset query occurred in this round then set a flag to /*If reset query occurred in this round then set a flag to
* ask the dispis to reset themself in the next round */ * ask the dispis to reset themself in the next round */
...@@ -253,7 +253,7 @@ static void dispi_proc_press(lv_dispi_t * dispi_p) ...@@ -253,7 +253,7 @@ static void dispi_proc_press(lv_dispi_t * dispi_p)
if(pr_obj != NULL) { if(pr_obj != NULL) {
/* Save the time when the obj pressed. /* Save the time when the obj pressed.
* It is necessary to count the long press time.*/ * It is necessary to count the long press time.*/
dispi_p->press_time_stamp = systick_get(); dispi_p->press_time_stamp = lv_hal_tick_get();
dispi_p->long_press_sent = 0; dispi_p->long_press_sent = 0;
dispi_p->drag_range_out = 0; dispi_p->drag_range_out = 0;
dispi_p->drag_in_prog = 0; dispi_p->drag_in_prog = 0;
...@@ -300,22 +300,22 @@ static void dispi_proc_press(lv_dispi_t * dispi_p) ...@@ -300,22 +300,22 @@ static void dispi_proc_press(lv_dispi_t * dispi_p)
/*If there is no drag then check for long press time*/ /*If there is no drag then check for long press time*/
if(dispi_p->drag_in_prog == 0 && dispi_p->long_press_sent == 0) { if(dispi_p->drag_in_prog == 0 && dispi_p->long_press_sent == 0) {
/*Send a signal about the long press if enough time elapsed*/ /*Send a signal about the long press if enough time elapsed*/
if(systick_elaps(dispi_p->press_time_stamp) > LV_DISPI_LONG_PRESS_TIME) { if(lv_hal_tick_elaps(dispi_p->press_time_stamp) > LV_DISPI_LONG_PRESS_TIME) {
pr_obj->signal_f(pr_obj, LV_SIGNAL_LONG_PRESS, dispi_p); pr_obj->signal_f(pr_obj, LV_SIGNAL_LONG_PRESS, dispi_p);
/*Mark the signal sending to do not send it again*/ /*Mark the signal sending to do not send it again*/
dispi_p->long_press_sent = 1; dispi_p->long_press_sent = 1;
/*Save the long press time stamp for the long press repeat handler*/ /*Save the long press time stamp for the long press repeat handler*/
dispi_p->lpr_rep_time_stamp = systick_get(); dispi_p->lpr_rep_time_stamp = lv_hal_tick_get();
} }
} }
/*Send long press repeated signal*/ /*Send long press repeated signal*/
if(dispi_p->drag_in_prog == 0 && dispi_p->long_press_sent == 1) { if(dispi_p->drag_in_prog == 0 && dispi_p->long_press_sent == 1) {
/*Send a signal about the long press repeate if enough time elapsed*/ /*Send a signal about the long press repeate if enough time elapsed*/
if(systick_elaps(dispi_p->lpr_rep_time_stamp) > LV_DISPI_LONG_PRESS_REP_TIME) { if(lv_hal_tick_elaps(dispi_p->lpr_rep_time_stamp) > LV_DISPI_LONG_PRESS_REP_TIME) {
pr_obj->signal_f(pr_obj, LV_SIGNAL_LONG_PRESS_REP, dispi_p); pr_obj->signal_f(pr_obj, LV_SIGNAL_LONG_PRESS_REP, dispi_p);
dispi_p->lpr_rep_time_stamp = systick_get(); dispi_p->lpr_rep_time_stamp = lv_hal_tick_get();
} }
} }
......
...@@ -147,7 +147,7 @@ void lv_refr_set_monitor_cb(void (*cb)(uint32_t, uint32_t)) ...@@ -147,7 +147,7 @@ void lv_refr_set_monitor_cb(void (*cb)(uint32_t, uint32_t))
static void lv_refr_task(void * param) static void lv_refr_task(void * param)
{ {
uint32_t start = systick_get(); uint32_t start = lv_hal_tick_get();
lv_refr_join_area(); lv_refr_join_area();
...@@ -162,7 +162,7 @@ static void lv_refr_task(void * param) ...@@ -162,7 +162,7 @@ static void lv_refr_task(void * param)
* therefore be sure the inv_buf is cleared prior to it*/ * therefore be sure the inv_buf is cleared prior to it*/
if(refr_done != false) { if(refr_done != false) {
if(monitor_cb != NULL) { if(monitor_cb != NULL) {
monitor_cb(systick_elaps(start), px_num); monitor_cb(lv_hal_tick_elaps(start), px_num);
} }
} }
} }
......
...@@ -105,7 +105,7 @@ void lv_vdb_flush(void) ...@@ -105,7 +105,7 @@ void lv_vdb_flush(void)
* ----------------------------- * -----------------------------
* in1_buf |2,2|6,8| 3,7 * in1_buf |2,2|6,8| 3,7
* in2_buf |4,4|7,7| 1,2 * in2_buf |4,4|7,7| 1,2
* --------- ==> * --------- ==>
* in1_buf |1,1|1,3| * in1_buf |1,1|1,3|
* in2_buf |1,1|1,3| * in2_buf |1,1|1,3|
* */ * */
...@@ -146,7 +146,7 @@ void lv_vdb_flush(void) ...@@ -146,7 +146,7 @@ void lv_vdb_flush(void)
/* Now the full the VDB is filtered and the result is stored in the first quarter of it /* Now the full the VDB is filtered and the result is stored in the first quarter of it
* Write out the filtered map to the display*/ * Write out the filtered map to the display*/
//TODO disp_map(vdb_act->area.x1 >> 1, vdb_act->area.y1 >> 1, vdb_act->area.x2 >> 1, vdb_act->area.y2 >> 1, vdb_act->buf); hal_disp_map(vdb_act->area.x1 >> 1, vdb_act->area.y1 >> 1, vdb_act->area.x2 >> 1, vdb_act->area.y2 >> 1, vdb_act->buf);
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment