Merge branch 'dev-5.3' of https://github.com/littlevgl/lvgl into dev-5.3

lv_core/lv_group.c

@@ -90,7 +90,7 @@ void lv_group_add_obj(lv_group_t * group, lv_obj_t * obj)
 {
     if(group == NULL) return;
 
-    /*If the object is already in a group and focused then defocuse it*/
+    /*If the object is already in a group and focused then defocus it*/
     if(obj->group_p) {
         if(lv_obj_is_focused(obj)) {
             lv_group_refocus(obj->group_p);

lv_core/lv_obj.c

@@ -81,7 +81,7 @@ void lv_init(void)
     /*Init. the sstyles*/
     lv_style_init();
 
-    /*Init. the screen refresh system*/
+    /*Initialize the screen refresh system*/
     lv_refr_init();
 
     /*Create the default screen*/
@@ -1587,7 +1587,7 @@ bool lv_obj_get_drag(const lv_obj_t * obj)
 }
 
 /**
- * Get the drag thow enable attribute of an object
+ * Get the drag throw enable attribute of an object
  * @param obj pointer to an object
  * @return true: drag throw is enabled
  */

lv_core/lv_obj.h

@@ -34,7 +34,7 @@ extern "C" {
 
 /*Error check of lv_conf.h*/
 #if LV_HOR_RES == 0 || LV_VER_RES == 0
-#error "LittlevGL: LV_HOR_RES and LV_VER_RES must be greater then 0"
+#error "LittlevGL: LV_HOR_RES and LV_VER_RES must be greater than 0"
 #endif
 
 #if LV_ANTIALIAS > 1
@@ -701,7 +701,7 @@ bool lv_obj_get_click(const lv_obj_t * obj);
 /**
  * Get the top enable attribute of an object
  * @param obj pointer to an object
- * @return true: the auto top feture is enabled
+ * @return true: the auto top feature is enabled
  */
 bool lv_obj_get_top(const lv_obj_t * obj);
 
@@ -713,7 +713,7 @@ bool lv_obj_get_top(const lv_obj_t * obj);
 bool lv_obj_get_drag(const lv_obj_t * obj);
 
 /**
- * Get the drag thow enable attribute of an object
+ * Get the drag throw enable attribute of an object
  * @param obj pointer to an object
  * @return true: drag throw is enabled
  */
@@ -810,7 +810,7 @@ void * lv_obj_get_group(const lv_obj_t * obj);
 
 
 /**
- * Tell whether the ohe object is the focused object of a group or not.
+ * Tell whether the object is the focused object of a group or not.
  * @param obj pointer to an object
  * @return true: the object is focused, false: the object is not focused or not in a group
  */

lv_core/lv_refr.c

@@ -73,9 +73,9 @@ void lv_refr_init(void)
 
 /**
  * Redraw the invalidated areas now.
- * Normally the redarwing is peridocally executed in `lv_task_handler` but a long blocking process can
+ * Normally the redrawing is periodically executed in `lv_task_handler` but a long blocking process can
  * prevent the call of `lv_task_handler`. In this case if the the GUI is updated in the process (e.g. progress bar)
- * this function can be called when the screen shoud be updated.
+ * this function can be called when the screen should be updated.
  */
 void lv_refr_now(void)
 {

lv_core/lv_refr.h

@@ -47,9 +47,9 @@ void lv_refr_init(void);
 
 /**
  * Redraw the invalidated areas now.
- * Normally the redarwing is peridocally executed in `lv_task_handler` but a long blocking process can
+ * Normally the redrawing is periodically executed in `lv_task_handler` but a long blocking process can
  * prevent the call of `lv_task_handler`. In this case if the the GUI is updated in the process (e.g. progress bar)
- * this function can be called when the screen shoud be updated.
+ * this function can be called when the screen should be updated.
  */
 void lv_refr_now(void);
 

lv_misc/lv_log.c

@@ -54,7 +54,7 @@ void lv_log_register_print(void f(lv_log_level_t, const char *, uint32_t,  const
  * @param line line number in the source code where the log added
  * @param dsc description of the log
  */
-void lv_log_add(lv_log_level_t level, const char * file, uint32_t line, const char * dsc)
+void lv_log_add(lv_log_level_t level, const char * file, int line, const char * dsc)
 {
     if(level >= _LV_LOG_LEVEL_NUM) return;      /*Invalid level*/
 

lv_misc/lv_log.h

@@ -58,7 +58,7 @@ void lv_log_register_print(void f(lv_log_level_t, const char *, uint32_t,  const
  * @param line line number in the source code where the log added
  * @param dsc description of the log
  */
-void lv_log_add(lv_log_level_t level, const char * file, uint32_t line, const char * dsc);
+void lv_log_add(lv_log_level_t level, const char * file, int line, const char * dsc);
 
 /**********************
  *      MACROS