diff --git a/lv_misc/lv_task.c b/lv_misc/lv_task.c index d5a83594a..959506a08 100644 --- a/lv_misc/lv_task.c +++ b/lv_misc/lv_task.c @@ -68,7 +68,7 @@ LV_ATTRIBUTE_TASK_HANDLER void lv_task_handler(void) /* Run all task from the highest to the lowest priority * If a lower priority task is executed check task again from the highest priority * but on the priority of executed tasks don't run tasks before the executed*/ - lv_task_t * task_interruper = NULL; + lv_task_t * task_interrupter = NULL; lv_task_t * next; bool end_flag; do { @@ -80,8 +80,8 @@ LV_ATTRIBUTE_TASK_HANDLER void lv_task_handler(void) next = lv_ll_get_next(&lv_task_ll, act); /*Here is the interrupter task. Don't execute it again.*/ - if(act == task_interruper) { - task_interruper = NULL; /*From this point only task after the interrupter comes, so the interrupter is not interesting anymore*/ + if(act == task_interrupter) { + task_interrupter = NULL; /*From this point only task after the interrupter comes, so the interrupter is not interesting anymore*/ act = next; continue; /*Load the next task*/ } @@ -91,10 +91,10 @@ LV_ATTRIBUTE_TASK_HANDLER void lv_task_handler(void) lv_task_exec(act); } /*Tasks with higher priority then the interrupted shall be run in every case*/ - else if(task_interruper) { - if(act->prio > task_interruper->prio) { + else if(task_interrupter) { + if(act->prio > task_interrupter->prio) { if(lv_task_exec(act)) { - task_interruper = act; /*Check all tasks again from the highest priority */ + task_interrupter = act; /*Check all tasks again from the highest priority */ end_flag = false; break; } @@ -104,7 +104,7 @@ LV_ATTRIBUTE_TASK_HANDLER void lv_task_handler(void) * Just run the remaining tasks*/ else { if(lv_task_exec(act)) { - task_interruper = act; /*Check all tasks again from the highest priority */ + task_interrupter = act; /*Check all tasks again from the highest priority */ end_flag = false; break; } diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c index abc47193b..75abd296c 100644 --- a/lv_objx/lv_ta.c +++ b/lv_objx/lv_ta.c @@ -175,6 +175,9 @@ void lv_ta_add_char(lv_obj_t * ta, char c) { lv_ta_ext_t * ext = lv_obj_get_ext_attr(ta); + +// if(ext->one_line && c == '\n') return; /*Ignore new lines i n one line mode*/ + if(ext->pwd_mode != 0) pwd_char_hider(ta); /*Make sure all the current text contains only '*'*/ char letter_buf[2]; letter_buf[0] = c;