Merge pull request #1580 from DaPa/master

Code comments spelling fixes
This commit is contained in:
Gabor Kiss-Vamosi
2020-06-16 13:36:36 +02:00
committed by GitHub
66 changed files with 143 additions and 146 deletions
+1 -1
View File
@@ -498,7 +498,7 @@ typedef void * lv_obj_user_data_t;
#endif #endif
#endif #endif
/*1: enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/ /*1: enable `lv_obj_realign()` based on `lv_obj_align()` parameters*/
#define LV_USE_OBJ_REALIGN 1 #define LV_USE_OBJ_REALIGN 1
/* Enable to make the object clickable on a larger area. /* Enable to make the object clickable on a larger area.
+3 -3
View File
@@ -678,14 +678,14 @@
#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3 #define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3
#endif #endif
/* The control character to use for signalling text recoloring. */ /* The control character to use for signaling text recoloring. */
#ifndef LV_TXT_COLOR_CMD #ifndef LV_TXT_COLOR_CMD
#define LV_TXT_COLOR_CMD "#" #define LV_TXT_COLOR_CMD "#"
#endif #endif
/* Support bidirectional texts. /* Support bidirectional texts.
* Allows mixing Left-to-Right and Right-to-Left texts. * Allows mixing Left-to-Right and Right-to-Left texts.
* The direction will be processed according to the Unicode Bidirectioanl Algorithm: * The direction will be processed according to the Unicode Bidirectional Algorithm:
* https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/ * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
#ifndef LV_USE_BIDI #ifndef LV_USE_BIDI
#define LV_USE_BIDI 0 #define LV_USE_BIDI 0
@@ -748,7 +748,7 @@
#endif #endif
#endif #endif
/*1: enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/ /*1: enable `lv_obj_realign()` based on `lv_obj_align()` parameters*/
#ifndef LV_USE_OBJ_REALIGN #ifndef LV_USE_OBJ_REALIGN
#define LV_USE_OBJ_REALIGN 1 #define LV_USE_OBJ_REALIGN 1
#endif #endif
+2 -2
View File
@@ -242,7 +242,7 @@ void lv_group_focus_obj(lv_obj_t * obj)
if(res != LV_RES_OK) return; if(res != LV_RES_OK) return;
lv_obj_invalidate(*g->obj_focus); lv_obj_invalidate(*g->obj_focus);
/*If the object or its parent has `top == true` bring it to the foregorund*/ /*If the object or its parent has `top == true` bring it to the foreground*/
obj_to_foreground(*g->obj_focus); obj_to_foreground(*g->obj_focus);
} }
break; break;
@@ -508,7 +508,7 @@ static void focus_next_core(lv_group_t * group, void * (*begin)(const lv_ll_t *)
lv_res_t res = lv_event_send(*group->obj_focus, LV_EVENT_FOCUSED, NULL); lv_res_t res = lv_event_send(*group->obj_focus, LV_EVENT_FOCUSED, NULL);
if(res != LV_RES_OK) return; if(res != LV_RES_OK) return;
/*If the object or its parent has `top == true` bring it to the foregorund*/ /*If the object or its parent has `top == true` bring it to the foreground*/
obj_to_foreground(*group->obj_focus); obj_to_foreground(*group->obj_focus);
lv_obj_invalidate(*group->obj_focus); lv_obj_invalidate(*group->obj_focus);
+1 -1
View File
@@ -155,7 +155,7 @@ lv_res_t lv_group_send_data(lv_group_t * group, uint32_t c);
void lv_group_set_focus_cb(lv_group_t * group, lv_group_focus_cb_t focus_cb); void lv_group_set_focus_cb(lv_group_t * group, lv_group_focus_cb_t focus_cb);
/** /**
* Set whether the next or previous item in a group is focused if the currently focussed obj is * Set whether the next or previous item in a group is focused if the currently focused obj is
* deleted. * deleted.
* @param group pointer to a group * @param group pointer to a group
* @param new refocus policy enum * @param new refocus policy enum
+4 -4
View File
@@ -791,7 +791,7 @@ static void indev_proc_press(lv_indev_proc_t * proc)
&proc->types.pointer.act_point); &proc->types.pointer.act_point);
new_obj_searched = true; new_obj_searched = true;
} }
/*If a dragable or a protected object was the last then keep it*/ /*If a draggable or a protected object was the last then keep it*/
else { else {
} }
@@ -1049,7 +1049,7 @@ static void indev_proc_reset_query_handler(lv_indev_t * indev)
/** /**
* Search the most top, clickable object by a point * Search the most top, clickable object by a point
* @param obj pointer to a start object, typically the screen * @param obj pointer to a start object, typically the screen
* @param point pointer to a point for searhing the most top child * @param point pointer to a point for searching the most top child
* @return pointer to the found object or NULL if there was no suitable object * @return pointer to the found object or NULL if there was no suitable object
*/ */
lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point) lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point)
@@ -1086,7 +1086,7 @@ lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point)
} }
/** /**
* Handle focus/defocus on click for POINTER inpt devices * Handle focus/defocus on click for POINTER input devices
* @param proc pointer to the state of the indev * @param proc pointer to the state of the indev
*/ */
static void indev_click_focus(lv_indev_proc_t * proc) static void indev_click_focus(lv_indev_proc_t * proc)
@@ -1399,7 +1399,7 @@ static void indev_drag_throw(lv_indev_proc_t * proc)
/** /**
* Get the really dragged object by taking `drag_parent` into account. * Get the really dragged object by taking `drag_parent` into account.
* @param obj the start obejct * @param obj the start object
* @return the object to really drag * @return the object to really drag
*/ */
static lv_obj_t * get_dragged_obj(lv_obj_t * obj) static lv_obj_t * get_dragged_obj(lv_obj_t * obj)
+1 -1
View File
@@ -160,7 +160,7 @@ lv_obj_t * lv_indev_get_obj_act(void);
/** /**
* Search the most top, clickable object by a point * Search the most top, clickable object by a point
* @param obj pointer to a start object, typically the screen * @param obj pointer to a start object, typically the screen
* @param point pointer to a point for searhing the most top child * @param point pointer to a point for searching the most top child
* @return pointer to the found object or NULL if there was no suitable object * @return pointer to the found object or NULL if there was no suitable object
*/ */
lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point); lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point);
+14 -14
View File
@@ -838,7 +838,7 @@ void lv_obj_set_height_fit(lv_obj_t * obj, lv_coord_t h)
/** /**
* Set the width of an object by taking the left and right margin into account. * Set the width of an object by taking the left and right margin into account.
* The object width will be `obj_w = w - margon_left - margin_right` * The object width will be `obj_w = w - margin_left - margin_right`
* @param obj pointer to an object * @param obj pointer to an object
* @param w new height including margins * @param w new height including margins
*/ */
@@ -852,7 +852,7 @@ void lv_obj_set_width_margin(lv_obj_t * obj, lv_coord_t w)
/** /**
* Set the height of an object by taking the top and bottom margin into account. * Set the height of an object by taking the top and bottom margin into account.
* The object height will be `obj_h = h - margon_top - margin_bottom` * The object height will be `obj_h = h - margin_top - margin_bottom`
* @param obj pointer to an object * @param obj pointer to an object
* @param h new height including margins * @param h new height including margins
*/ */
@@ -1073,7 +1073,7 @@ void lv_obj_realign(lv_obj_t * obj)
lv_obj_align(obj, obj->realign.base, obj->realign.align, obj->realign.xofs, obj->realign.yofs); lv_obj_align(obj, obj->realign.base, obj->realign.align, obj->realign.xofs, obj->realign.yofs);
#else #else
(void)obj; (void)obj;
LV_LOG_WARN("lv_obj_realaign: no effect because LV_USE_OBJ_REALIGN = 0"); LV_LOG_WARN("lv_obj_realign: no effect because LV_USE_OBJ_REALIGN = 0");
#endif #endif
} }
@@ -1314,7 +1314,7 @@ void _lv_obj_set_style_local_ptr(lv_obj_t * obj, uint8_t part, lv_style_property
* E.g. `LV_STYLE_TEXT_FONT | (LV_STATE_PRESSED << LV_STYLE_STATE_POS)` * E.g. `LV_STYLE_TEXT_FONT | (LV_STATE_PRESSED << LV_STYLE_STATE_POS)`
* @note shouldn't be used directly. Use the specific property remove functions instead. * @note shouldn't be used directly. Use the specific property remove functions instead.
* For example: `lv_obj_style_remove_border_opa()` * For example: `lv_obj_style_remove_border_opa()`
* @return true: the property was found and removed; false: teh property was not found * @return true: the property was found and removed; false: the property was not found
*/ */
bool lv_obj_remove_style_local_prop(lv_obj_t * obj, uint8_t part, lv_style_property_t prop) bool lv_obj_remove_style_local_prop(lv_obj_t * obj, uint8_t part, lv_style_property_t prop)
{ {
@@ -1483,7 +1483,7 @@ void lv_obj_set_top(lv_obj_t * obj, bool en)
/** /**
* Enable the dragging of an object * Enable the dragging of an object
* @param obj pointer to an object * @param obj pointer to an object
* @param en true: make the object dragable * @param en true: make the object draggable
*/ */
void lv_obj_set_drag(lv_obj_t * obj, bool en) void lv_obj_set_drag(lv_obj_t * obj, bool en)
{ {
@@ -2193,7 +2193,7 @@ lv_coord_t lv_obj_get_height_fit(const lv_obj_t * obj)
/** /**
* Get the height of an object by taking the top and bottom margin into account. * Get the height of an object by taking the top and bottom margin into account.
* The returned height will be `obj_h + margon_top + margin_bottom` * The returned height will be `obj_h + margin_top + margin_bottom`
* @param obj pointer to an object * @param obj pointer to an object
* @return the height including thee margins * @return the height including thee margins
*/ */
@@ -2207,7 +2207,7 @@ lv_coord_t lv_obj_get_height_margin(lv_obj_t * obj)
/** /**
* Get the width of an object by taking the left and right margin into account. * Get the width of an object by taking the left and right margin into account.
* The returned width will be `obj_w + margon_left + margin_right` * The returned width will be `obj_w + margin_left + margin_right`
* @param obj pointer to an object * @param obj pointer to an object
* @return the height including thee margins * @return the height including thee margins
*/ */
@@ -2679,7 +2679,7 @@ bool lv_obj_get_click(const lv_obj_t * obj)
/** /**
* Get the top enable attribute of an object * Get the top enable attribute of an object
* @param obj pointer to 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) bool lv_obj_get_top(const lv_obj_t * obj)
{ {
@@ -2691,7 +2691,7 @@ bool lv_obj_get_top(const lv_obj_t * obj)
/** /**
* Get the drag enable attribute of an object * Get the drag enable attribute of an object
* @param obj pointer to an object * @param obj pointer to an object
* @return true: the object is dragable * @return true: the object is draggable
*/ */
bool lv_obj_get_drag(const lv_obj_t * obj) bool lv_obj_get_drag(const lv_obj_t * obj)
{ {
@@ -2810,7 +2810,7 @@ lv_state_t lv_obj_get_state(const lv_obj_t * obj, uint8_t part)
/*If a real part is asked, then use the object's signal to get its state. /*If a real part is asked, then use the object's signal to get its state.
* A real object can be in different state then the main part * A real object can be in different state then the main part
* and only the object itseld knows who to get it's state. */ * and only the object itself knows who to get it's state. */
lv_get_state_info_t info; lv_get_state_info_t info;
info.part = part; info.part = part;
info.result = LV_STATE_DEFAULT; info.result = LV_STATE_DEFAULT;
@@ -3284,7 +3284,7 @@ void lv_obj_init_draw_line_dsc(lv_obj_t * obj, uint8_t part, lv_draw_line_dsc_t
/** /**
* Get the required extra size (around the object's part) to draw shadow, outline, value etc. * Get the required extra size (around the object's part) to draw shadow, outline, value etc.
* @param obj poinr to an object * @param obj pointer to an object
* @param part part of the object * @param part part of the object
*/ */
lv_coord_t lv_obj_get_draw_rect_ext_pad_size(lv_obj_t * obj, uint8_t part) lv_coord_t lv_obj_get_draw_rect_ext_pad_size(lv_obj_t * obj, uint8_t part)
@@ -3796,7 +3796,7 @@ static void base_dir_refr_children(lv_obj_t * obj)
* @param part the part of the object to apply the transaction * @param part the part of the object to apply the transaction
* @param prev_state the previous state of the objects * @param prev_state the previous state of the objects
* @param new_state the new state of the object * @param new_state the new state of the object
* @return pointer to the allocated `the transaction` variable or `NULL` if no transtion created * @return pointer to the allocated `the transaction` variable or `NULL` if no transition created
*/ */
static lv_style_trans_t * trans_create(lv_obj_t * obj, lv_style_property_t prop, uint8_t part, lv_state_t prev_state, static lv_style_trans_t * trans_create(lv_obj_t * obj, lv_style_property_t prop, uint8_t part, lv_state_t prev_state,
lv_state_t new_state) lv_state_t new_state)
@@ -3901,12 +3901,12 @@ static lv_style_trans_t * trans_create(lv_obj_t * obj, lv_style_property_t prop,
} }
/** /**
* Remove the transition from objectt's part's property. * Remove the transition from object's part's property.
* - Remove the transition from `_lv_obj_style_trans_ll` and free it * - Remove the transition from `_lv_obj_style_trans_ll` and free it
* - Delete pending transitions * - Delete pending transitions
* @param obj pointer to an object which transition(s) should be removed * @param obj pointer to an object which transition(s) should be removed
* @param part a part of object or 0xFF to remove from all parts * @param part a part of object or 0xFF to remove from all parts
* @param prop a property or 0xFF to remove all porpeties * @param prop a property or 0xFF to remove all properties
* @param tr_limit delete transitions only "older" then this. `NULL` is not used * @param tr_limit delete transitions only "older" then this. `NULL` is not used
*/ */
static void trans_del(lv_obj_t * obj, uint8_t part, lv_style_property_t prop, lv_style_trans_t * tr_limit) static void trans_del(lv_obj_t * obj, uint8_t part, lv_style_property_t prop, lv_style_trans_t * tr_limit)
+12 -13
View File
@@ -91,7 +91,7 @@ enum {
LV_EVENT_DRAG_BEGIN, LV_EVENT_DRAG_BEGIN,
LV_EVENT_DRAG_END, LV_EVENT_DRAG_END,
LV_EVENT_DRAG_THROW_BEGIN, LV_EVENT_DRAG_THROW_BEGIN,
LV_EVENT_GESTURE, /**< The object has been getture*/ LV_EVENT_GESTURE, /**< The object has been gesture*/
LV_EVENT_KEY, LV_EVENT_KEY,
LV_EVENT_FOCUSED, LV_EVENT_FOCUSED,
LV_EVENT_DEFOCUSED, LV_EVENT_DEFOCUSED,
@@ -210,7 +210,7 @@ typedef struct _lv_obj_t {
lv_area_t ext_click_pad; /**< Extra click padding area. */ lv_area_t ext_click_pad; /**< Extra click padding area. */
#endif #endif
lv_coord_t ext_draw_pad; /**< EXTtend the size in every direction for drawing. */ lv_coord_t ext_draw_pad; /**< EXTend the size in every direction for drawing. */
/*Attributes and states*/ /*Attributes and states*/
uint8_t click : 1; /**< 1: Can be pressed by an input device*/ uint8_t click : 1; /**< 1: Can be pressed by an input device*/
@@ -440,7 +440,7 @@ void lv_obj_set_height_fit(lv_obj_t * obj, lv_coord_t h);
/** /**
* Set the width of an object by taking the left and right margin into account. * Set the width of an object by taking the left and right margin into account.
* The object width will be `obj_w = w - margon_left - margin_right` * The object width will be `obj_w = w - margin_left - margin_right`
* @param obj pointer to an object * @param obj pointer to an object
* @param w new height including margins * @param w new height including margins
*/ */
@@ -448,7 +448,7 @@ void lv_obj_set_width_margin(lv_obj_t * obj, lv_coord_t w);
/** /**
* Set the height of an object by taking the top and bottom margin into account. * Set the height of an object by taking the top and bottom margin into account.
* The object height will be `obj_h = h - margon_top - margin_bottom` * The object height will be `obj_h = h - margin_top - margin_bottom`
* @param obj pointer to an object * @param obj pointer to an object
* @param h new height including margins * @param h new height including margins
*/ */
@@ -619,7 +619,7 @@ void _lv_obj_set_style_local_ptr(lv_obj_t * obj, uint8_t type, lv_style_property
* E.g. `LV_STYLE_TEXT_FONT | (LV_STATE_PRESSED << LV_STYLE_STATE_POS)` * E.g. `LV_STYLE_TEXT_FONT | (LV_STATE_PRESSED << LV_STYLE_STATE_POS)`
* @note shouldn't be used directly. Use the specific property remove functions instead. * @note shouldn't be used directly. Use the specific property remove functions instead.
* For example: `lv_obj_style_remove_border_opa()` * For example: `lv_obj_style_remove_border_opa()`
* @return true: the property was found and removed; false: teh property was not found * @return true: the property was found and removed; false: the property was not found
*/ */
bool lv_obj_remove_style_local_prop(lv_obj_t * obj, uint8_t part, lv_style_property_t prop); bool lv_obj_remove_style_local_prop(lv_obj_t * obj, uint8_t part, lv_style_property_t prop);
@@ -659,7 +659,7 @@ void lv_obj_set_top(lv_obj_t * obj, bool en);
/** /**
* Enable the dragging of an object * Enable the dragging of an object
* @param obj pointer to an object * @param obj pointer to an object
* @param en true: make the object dragable * @param en true: make the object draggable
*/ */
void lv_obj_set_drag(lv_obj_t * obj, bool en); void lv_obj_set_drag(lv_obj_t * obj, bool en);
@@ -848,7 +848,6 @@ lv_obj_t * lv_obj_get_screen(const lv_obj_t * obj);
/** /**
* Get the display of an object * Get the display of an object
* @param scr pointer to an object
* @return pointer the object's display * @return pointer the object's display
*/ */
lv_disp_t * lv_obj_get_disp(const lv_obj_t * obj); lv_disp_t * lv_obj_get_disp(const lv_obj_t * obj);
@@ -957,7 +956,7 @@ lv_coord_t lv_obj_get_height_fit(const lv_obj_t * obj);
/** /**
* Get the height of an object by taking the top and bottom margin into account. * Get the height of an object by taking the top and bottom margin into account.
* The returned height will be `obj_h + margon_top + margin_bottom` * The returned height will be `obj_h + margin_top + margin_bottom`
* @param obj pointer to an object * @param obj pointer to an object
* @return the height including thee margins * @return the height including thee margins
*/ */
@@ -965,7 +964,7 @@ lv_coord_t lv_obj_get_height_margin(lv_obj_t * obj);
/** /**
* Get the width of an object by taking the left and right margin into account. * Get the width of an object by taking the left and right margin into account.
* The returned width will be `obj_w + margon_left + margin_right` * The returned width will be `obj_w + margin_left + margin_right`
* @param obj pointer to an object * @param obj pointer to an object
* @return the height including thee margins * @return the height including thee margins
*/ */
@@ -1044,7 +1043,7 @@ lv_coord_t lv_obj_get_ext_draw_pad(const lv_obj_t * obj);
*---------------*/ *---------------*/
/** /**
* Get the style list of an obejct's part. * Get the style list of an object's part.
* @param obj pointer to an object. * @param obj pointer to an object.
* @param part part the part of the object which style list should be get. * @param part part the part of the object which style list should be get.
* E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB`
@@ -1163,7 +1162,7 @@ bool lv_obj_get_top(const lv_obj_t * obj);
/** /**
* Get the drag enable attribute of an object * Get the drag enable attribute of an object
* @param obj pointer to an object * @param obj pointer to an object
* @return true: the object is dragable * @return true: the object is draggable
*/ */
bool lv_obj_get_drag(const lv_obj_t * obj); bool lv_obj_get_drag(const lv_obj_t * obj);
@@ -1349,7 +1348,7 @@ void lv_obj_init_draw_line_dsc(lv_obj_t * obj, uint8_t part, lv_draw_line_dsc_t
/** /**
* Get the required extra size (around the object's part) to draw shadow, outline, value etc. * Get the required extra size (around the object's part) to draw shadow, outline, value etc.
* @param obj poinr to an object * @param obj pointer to an object
* @param part part of the object * @param part part of the object
*/ */
lv_coord_t lv_obj_get_draw_rect_ext_pad_size(lv_obj_t * obj, uint8_t part); lv_coord_t lv_obj_get_draw_rect_ext_pad_size(lv_obj_t * obj, uint8_t part);
@@ -1396,7 +1395,7 @@ bool lv_debug_check_obj_valid(const lv_obj_t * obj);
* Will be expanded to: `static void <name> (lv_obj_t * obj, lv_event_t e)` * Will be expanded to: `static void <name> (lv_obj_t * obj, lv_event_t e)`
* *
* Examples: * Examples:
* LV_EVENT_CB_DECLARE(my_event1); //Protoype declaration * LV_EVENT_CB_DECLARE(my_event1); //Prototype declaration
* *
* LV_EVENT_CB_DECLARE(my_event1) * LV_EVENT_CB_DECLARE(my_event1)
* { * {
+1 -1
View File
@@ -159,7 +159,7 @@ lv_disp_t * _lv_refr_get_disp_refreshing(void)
/** /**
* Set the display which is being refreshed. * Set the display which is being refreshed.
* It shouldn1t be used directly by the user. * It shouldn't be used directly by the user.
* It can be used to trick the drawing functions about there is an active display. * It can be used to trick the drawing functions about there is an active display.
* @param the display being refreshed * @param the display being refreshed
*/ */
+1 -1
View File
@@ -72,7 +72,7 @@ lv_disp_t * _lv_refr_get_disp_refreshing(void);
/** /**
* Set the display which is being refreshed. * Set the display which is being refreshed.
* It shouldn1t be used directly by the user. * It shouldn't be used directly by the user.
* It can be used to trick the drawing functions about there is an active display. * It can be used to trick the drawing functions about there is an active display.
* @param the display being refreshed * @param the display being refreshed
*/ */
+1 -1
View File
@@ -1119,7 +1119,7 @@ static lv_style_t * get_alloc_local_style(lv_style_list_t * list)
} }
lv_style_init(local_style); lv_style_init(local_style);
/*Add the local style to the furst place*/ /*Add the local style to the first place*/
_lv_style_list_add_style(list, local_style); _lv_style_list_add_style(list, local_style);
list->has_local = 1; list->has_local = 1;
+4 -4
View File
@@ -95,7 +95,7 @@ int16_t lv_draw_mask_add(void * param, void * custom_id)
} }
/** /**
* Apply the added buffers on a line. Used internally by the library's drawing routins. * Apply the added buffers on a line. Used internally by the library's drawing routines.
* @param mask_buf store the result mask here. Has to be `len` byte long. Should be initialized with `0xFF`. * @param mask_buf store the result mask here. Has to be `len` byte long. Should be initialized with `0xFF`.
* @param abs_x absolute X coordinate where the line to calculate start * @param abs_x absolute X coordinate where the line to calculate start
* @param abs_y absolute Y coordinate where the line to calculate start * @param abs_y absolute Y coordinate where the line to calculate start
@@ -272,8 +272,8 @@ void lv_draw_mask_line_points_init(lv_draw_mask_line_param_t * param, lv_coord_t
/** /**
*Initialize a line mask from a point and an angle. *Initialize a line mask from a point and an angle.
* @param param pointer to a `lv_draw_mask_param_t` to initialize * @param param pointer to a `lv_draw_mask_param_t` to initialize
* @param px X coordiante of a point of the line * @param px X coordinate of a point of the line
* @param py X coordiante of a point of the line * @param py X coordinate of a point of the line
* @param angle right 0 deg, bottom: 90 * @param angle right 0 deg, bottom: 90
* @param side and element of `lv_draw_mask_line_side_t` to describe which side to keep. * @param side and element of `lv_draw_mask_line_side_t` to describe which side to keep.
* With `LV_DRAW_MASK_LINE_SIDE_LEFT/RIGHT` and horizontal line all pixels are kept * With `LV_DRAW_MASK_LINE_SIDE_LEFT/RIGHT` and horizontal line all pixels are kept
@@ -370,7 +370,7 @@ void lv_draw_mask_angle_init(lv_draw_mask_angle_param_t * param, lv_coord_t vert
* @param param param pointer to a `lv_draw_mask_param_t` to initialize * @param param param pointer to a `lv_draw_mask_param_t` to initialize
* @param rect coordinates of the rectangle to affect (absolute coordinates) * @param rect coordinates of the rectangle to affect (absolute coordinates)
* @param radius radius of the rectangle * @param radius radius of the rectangle
* @param inv: true: keep the pixels inside teh rectangle; keep teh pixels outside of the rectangle * @param inv: true: keep the pixels inside the rectangle; keep the pixels outside of the rectangle
*/ */
void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area_t * rect, lv_coord_t radius, bool inv) void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area_t * rect, lv_coord_t radius, bool inv)
{ {
+3 -3
View File
@@ -245,8 +245,8 @@ void lv_draw_mask_line_points_init(lv_draw_mask_line_param_t * param, lv_coord_t
/** /**
*Initialize a line mask from a point and an angle. *Initialize a line mask from a point and an angle.
* @param param pointer to a `lv_draw_mask_param_t` to initialize * @param param pointer to a `lv_draw_mask_param_t` to initialize
* @param px X coordiante of a point of the line * @param px X coordinate of a point of the line
* @param py X coordiante of a point of the line * @param py X coordinate of a point of the line
* @param angle right 0 deg, bottom: 90 * @param angle right 0 deg, bottom: 90
* @param side and element of `lv_draw_mask_line_side_t` to describe which side to keep. * @param side and element of `lv_draw_mask_line_side_t` to describe which side to keep.
* With `LV_DRAW_MASK_LINE_SIDE_LEFT/RIGHT` and horizontal line all pixels are kept * With `LV_DRAW_MASK_LINE_SIDE_LEFT/RIGHT` and horizontal line all pixels are kept
@@ -271,7 +271,7 @@ void lv_draw_mask_angle_init(lv_draw_mask_angle_param_t * param, lv_coord_t vert
* @param param param pointer to a `lv_draw_mask_param_t` to initialize * @param param param pointer to a `lv_draw_mask_param_t` to initialize
* @param rect coordinates of the rectangle to affect (absolute coordinates) * @param rect coordinates of the rectangle to affect (absolute coordinates)
* @param radius radius of the rectangle * @param radius radius of the rectangle
* @param inv: true: keep the pixels inside teh rectangle; keep teh pixels outside of the rectangle * @param inv: true: keep the pixels inside the rectangle; keep the pixels outside of the rectangle
*/ */
void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area_t * rect, lv_coord_t radius, bool inv); void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area_t * rect, lv_coord_t radius, bool inv);
+1 -1
View File
@@ -275,7 +275,7 @@ LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_are
} }
/* If there is not other mask and drawing the corner area split the drawing to corner and middle areas /* If there is not other mask and drawing the corner area split the drawing to corner and middle areas
* because it the middle mask shuldn't be taken into account (therefore its faster)*/ * because it the middle mask shouldn't be taken into account (therefore its faster)*/
if(simple_mode && split && if(simple_mode && split &&
(y < coords_bg.y1 + rout + 1 || (y < coords_bg.y1 + rout + 1 ||
y > coords_bg.y2 - rout - 1)) { y > coords_bg.y2 - rout - 1)) {
+4 -4
View File
@@ -60,7 +60,7 @@ lv_color_t lv_img_buf_get_px_color(lv_img_dsc_t * dsc, lv_coord_t x, lv_coord_t
uint32_t px = dsc->header.w * y * px_size + x * px_size; uint32_t px = dsc->header.w * y * px_size + x * px_size;
_lv_memcpy_small(&p_color, &buf_u8[px], sizeof(lv_color_t)); _lv_memcpy_small(&p_color, &buf_u8[px], sizeof(lv_color_t));
#if LV_COLOR_SIZE == 32 #if LV_COLOR_SIZE == 32
p_color.ch.alpha = 0xFF; /*Only the color should be get so use a deafult alpha value*/ p_color.ch.alpha = 0xFF; /*Only the color should be get so use a default alpha value*/
#endif #endif
} }
else if(dsc->header.cf == LV_IMG_CF_INDEXED_1BIT) { else if(dsc->header.cf == LV_IMG_CF_INDEXED_1BIT) {
@@ -414,7 +414,7 @@ uint32_t lv_img_buf_get_img_size(lv_coord_t w, lv_coord_t h, lv_img_cf_t cf)
#if LV_USE_IMG_TRANSFORM #if LV_USE_IMG_TRANSFORM
/** /**
* Initialize a descriptor to tranform an image * Initialize a descriptor to transform an image
* @param dsc pointer to an `lv_img_transform_dsc_t` variable whose `cfg` field is initialized * @param dsc pointer to an `lv_img_transform_dsc_t` variable whose `cfg` field is initialized
*/ */
void _lv_img_buf_transform_init(lv_img_transform_dsc_t * dsc) void _lv_img_buf_transform_init(lv_img_transform_dsc_t * dsc)
@@ -545,7 +545,7 @@ bool _lv_img_buf_transform_anti_alias(lv_img_transform_dsc_t * dsc)
/*Get the fractional part of the source pixel*/ /*Get the fractional part of the source pixel*/
int xs_fract = dsc->tmp.xs & 0xff; int xs_fract = dsc->tmp.xs & 0xff;
int ys_fract = dsc->tmp.ys & 0xff; int ys_fract = dsc->tmp.ys & 0xff;
int32_t xn; /*x neightboor*/ int32_t xn; /*x neighbor*/
lv_opa_t xr; /*x mix ratio*/ lv_opa_t xr; /*x mix ratio*/
if(xs_fract < 0x70) { if(xs_fract < 0x70) {
@@ -563,7 +563,7 @@ bool _lv_img_buf_transform_anti_alias(lv_img_transform_dsc_t * dsc)
xr = 0xFF; xr = 0xFF;
} }
int32_t yn; /*x neightboor*/ int32_t yn; /*x neighbor*/
lv_opa_t yr; /*x mix ratio*/ lv_opa_t yr; /*x mix ratio*/
if(ys_fract < 0x70) { if(ys_fract < 0x70) {
+1 -1
View File
@@ -384,7 +384,7 @@ static inline void decompress_line(uint8_t * out, lv_coord_t w)
/** /**
* Read bits from an input buffer. The read can cross byte boundary. * Read bits from an input buffer. The read can cross byte boundary.
* @param in the input buffer to read from. * @param in the input buffer to read from.
* @param bit_pos index of teh first bit to read. * @param bit_pos index of the first bit to read.
* @param len number of bits to read (must be <= 8). * @param len number of bits to read (must be <= 8).
* @return the read bits * @return the read bits
*/ */
+2 -2
View File
@@ -135,7 +135,7 @@ typedef struct {
2 Get the class of the left and right glyphs as `left_class` and `right_class` 2 Get the class of the left and right glyphs as `left_class` and `right_class`
left_class = left_class_mapping[glyph_id_left]; left_class = left_class_mapping[glyph_id_left];
right_class = right_class_mapping[glyph_id_right]; right_class = right_class_mapping[glyph_id_right];
3. value = class_pair_values[(left_class-1)*right_class_cnt + (righ_class-1)] 3. value = class_pair_values[(left_class-1)*right_class_cnt + (right_class-1)]
*/ */
const int8_t * class_pair_values; /*left_class_num * right_class_num value*/ const int8_t * class_pair_values; /*left_class_num * right_class_num value*/
@@ -155,7 +155,7 @@ typedef enum {
/*Describe store additional data for fonts */ /*Describe store additional data for fonts */
typedef struct { typedef struct {
/*The bitmaps os all glyphs*/ /*The bitmaps of all glyphs*/
const uint8_t * glyph_bitmap; const uint8_t * glyph_bitmap;
/*Describe the glyphs*/ /*Describe the glyphs*/
+1 -1
View File
@@ -9,7 +9,7 @@ extern "C" {
#include "../lv_conf_internal.h" #include "../lv_conf_internal.h"
/*------------------------------- /*-------------------------------
* Symbols from FontAwsome font * Symbols from FontAwesome font
*-----------------------------*/ *-----------------------------*/
/* In the font converter use this list as range: /* In the font converter use this list as range:
+2 -2
View File
@@ -141,7 +141,7 @@ void lv_gpu_stm32_dma2d_fill_mask(lv_color_t * buf, lv_coord_t buf_w, lv_color_t
* @param buf a buffer where map should be copied * @param buf a buffer where map should be copied
* @param buf_w width of the buffer in pixels * @param buf_w width of the buffer in pixels
* @param map an "image" to copy * @param map an "image" to copy
* @param map_w width of teh map in pixels * @param map_w width of the map in pixels
* @param copy_w width of the area to copy in pixels (<= buf_w) * @param copy_w width of the area to copy in pixels (<= buf_w)
* @param copy_h height of the area to copy in pixels * @param copy_h height of the area to copy in pixels
* @note `map_w - fill_w` is offset to the next line after copy * @note `map_w - fill_w` is offset to the next line after copy
@@ -176,7 +176,7 @@ void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_
* @param buf_w width of the buffer in pixels * @param buf_w width of the buffer in pixels
* @param map an "image" to copy * @param map an "image" to copy
* @param opa opacity of `map` * @param opa opacity of `map`
* @param map_w width of teh map in pixels * @param map_w width of the map in pixels
* @param copy_w width of the area to copy in pixels (<= buf_w) * @param copy_w width of the area to copy in pixels (<= buf_w)
* @param copy_h height of the area to copy in pixels * @param copy_h height of the area to copy in pixels
* @note `map_w - fill_w` is offset to the next line after copy * @note `map_w - fill_w` is offset to the next line after copy
+2 -2
View File
@@ -60,7 +60,7 @@ void lv_gpu_stm32_dma2d_fill_mask(lv_color_t * buf, lv_coord_t buf_w, lv_color_t
* @param buf a buffer where map should be copied * @param buf a buffer where map should be copied
* @param buf_w width of the buffer in pixels * @param buf_w width of the buffer in pixels
* @param map an "image" to copy * @param map an "image" to copy
* @param map_w width of teh map in pixels * @param map_w width of the map in pixels
* @param copy_w width of the area to copy in pixels (<= buf_w) * @param copy_w width of the area to copy in pixels (<= buf_w)
* @param copy_h height of the area to copy in pixels * @param copy_h height of the area to copy in pixels
* @note `map_w - fill_w` is offset to the next line after copy * @note `map_w - fill_w` is offset to the next line after copy
@@ -73,7 +73,7 @@ void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_
* @param buf_w width of the buffer in pixels * @param buf_w width of the buffer in pixels
* @param map an "image" to copy * @param map an "image" to copy
* @param opa opacity of `map` * @param opa opacity of `map`
* @param map_w width of teh map in pixels * @param map_w width of the map in pixels
* @param copy_w width of the area to copy in pixels (<= buf_w) * @param copy_w width of the area to copy in pixels (<= buf_w)
* @param copy_h height of the area to copy in pixels * @param copy_h height of the area to copy in pixels
* @note `map_w - fill_w` is offset to the next line after copy * @note `map_w - fill_w` is offset to the next line after copy
+1 -1
View File
@@ -73,7 +73,7 @@ lv_indev_t * lv_indev_drv_register(lv_indev_drv_t * driver)
if(driver->disp == NULL) driver->disp = lv_disp_get_default(); if(driver->disp == NULL) driver->disp = lv_disp_get_default();
if(driver->disp == NULL) { if(driver->disp == NULL) {
LV_LOG_WARN("lv_indev_drv_register: no display registered hence can't attache the indev to " LV_LOG_WARN("lv_indev_drv_register: no display registered hence can't attach the indev to "
"a display"); "a display");
return NULL; return NULL;
} }
+1 -1
View File
@@ -137,7 +137,7 @@ typedef struct _lv_indev_proc_t {
lv_point_t drag_sum; /*Count the dragged pixels to check LV_INDEV_DEF_DRAG_LIMIT*/ lv_point_t drag_sum; /*Count the dragged pixels to check LV_INDEV_DEF_DRAG_LIMIT*/
lv_point_t drag_throw_vect; lv_point_t drag_throw_vect;
struct _lv_obj_t * act_obj; /*The object being pressed*/ struct _lv_obj_t * act_obj; /*The object being pressed*/
struct _lv_obj_t * last_obj; /*The last obejct which was pressed (used by dragthrow and struct _lv_obj_t * last_obj; /*The last object which was pressed (used by drag_throw and
other post-release event)*/ other post-release event)*/
struct _lv_obj_t * last_pressed; /*The lastly pressed object*/ struct _lv_obj_t * last_pressed; /*The lastly pressed object*/
+2 -3
View File
@@ -64,7 +64,7 @@ void _lv_anim_core_init(void)
last_task_run = lv_tick_get(); last_task_run = lv_tick_get();
_lv_anim_task = lv_task_create(anim_task, LV_DISP_DEF_REFR_PERIOD, LV_ANIM_TASK_PRIO, NULL); _lv_anim_task = lv_task_create(anim_task, LV_DISP_DEF_REFR_PERIOD, LV_ANIM_TASK_PRIO, NULL);
anim_mark_list_change(); /*Turn off the animation task*/ anim_mark_list_change(); /*Turn off the animation task*/
anim_list_changed = false; /*The list has not actaully changed*/ anim_list_changed = false; /*The list has not actually changed*/
} }
/** /**
@@ -73,7 +73,6 @@ void _lv_anim_core_init(void)
* lv_anim_t a; * lv_anim_t a;
* lv_anim_init(&a); * lv_anim_init(&a);
* lv_anim_set_...(&a); * lv_anim_set_...(&a);
* lv_anim_craete(&a);
* @param a pointer to an `lv_anim_t` variable to initialize * @param a pointer to an `lv_anim_t` variable to initialize
*/ */
void lv_anim_init(lv_anim_t * a) void lv_anim_init(lv_anim_t * a)
@@ -501,7 +500,7 @@ static void anim_task(lv_task_t * param)
* Called when an animation is ready to do the necessary thinks * Called when an animation is ready to do the necessary thinks
* e.g. repeat, play back, delete etc. * e.g. repeat, play back, delete etc.
* @param a pointer to an animation descriptor * @param a pointer to an animation descriptor
* @return true: animation delete occurred nnd the `LV_GC_ROOT(_lv_anim_ll)` has changed * @return true: animation delete occurred and the `LV_GC_ROOT(_lv_anim_ll)` has changed
* */ * */
static bool anim_ready_handler(lv_anim_t * a) static bool anim_ready_handler(lv_anim_t * a)
{ {
-1
View File
@@ -116,7 +116,6 @@ void _lv_anim_core_init(void);
* lv_anim_t a; * lv_anim_t a;
* lv_anim_init(&a); * lv_anim_init(&a);
* lv_anim_set_...(&a); * lv_anim_set_...(&a);
* lv_anim_create(&a);
* @param a pointer to an `lv_anim_t` variable to initialize * @param a pointer to an `lv_anim_t` variable to initialize
*/ */
void lv_anim_init(lv_anim_t * a); void lv_anim_init(lv_anim_t * a);
+1 -1
View File
@@ -44,7 +44,7 @@ struct _lv_obj_t;
/** /**
* Call an asynchronous function the next time lv_task_handler() is run. This function is likely to return * Call an asynchronous function the next time lv_task_handler() is run. This function is likely to return
* **before** the call actually happens! * **before** the call actually happens!
* @param task_xcb a callback which is the task itself. * @param async_xcb a callback which is the task itself.
* (the 'x' in the argument name indicates that its not a fully generic function because it not follows * (the 'x' in the argument name indicates that its not a fully generic function because it not follows
* the `func_name(object, callback, ...)` convention) * the `func_name(object, callback, ...)` convention)
* @param user_data custom parameter * @param user_data custom parameter
+3 -3
View File
@@ -130,8 +130,8 @@ lv_bidi_dir_t _lv_bidi_detect_base_dir(const char * txt)
* Can be `NULL` is unused * Can be `NULL` is unused
* @param len length of the line in character count * @param len length of the line in character count
* @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL`
* @param vicual_pos the visual character position which logical position should be get * @param visual_pos the visual character position which logical position should be get
* @param is_rtl tell the the char at `viasual_pos` is RTL or LTR context * @param is_rtl tell the the char at `visual_pos` is RTL or LTR context
* @return the logical character position * @return the logical character position
*/ */
uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir, uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir,
@@ -207,7 +207,7 @@ uint16_t _lv_bidi_get_visual_pos(const char * str_in, char ** bidi_txt, uint16_t
* Bidi process a paragraph of text * Bidi process a paragraph of text
* @param str_in the string to process * @param str_in the string to process
* @param str_out store the result here * @param str_out store the result here
* @param len length of teh text * @param len length of the text
* @param base_dir base dir of the text * @param base_dir base dir of the text
* @param pos_conv_out an `uint16_t` array to store the related logical position of the character. * @param pos_conv_out an `uint16_t` array to store the related logical position of the character.
* Can be `NULL` is unused * Can be `NULL` is unused
+3 -3
View File
@@ -71,8 +71,8 @@ lv_bidi_dir_t _lv_bidi_detect_base_dir(const char * txt);
* Can be `NULL` is unused * Can be `NULL` is unused
* @param len length of the line in character count * @param len length of the line in character count
* @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL`
* @param vicual_pos the visual character position which logical position should be get * @param visual_pos the visual character position which logical position should be get
* @param is_rtl tell the the char at `viasual_pos` is RTL or LTR context * @param is_rtl tell the the char at `visual_pos` is RTL or LTR context
* @return the logical character position * @return the logical character position
*/ */
uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir, uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir,
@@ -97,7 +97,7 @@ uint16_t _lv_bidi_get_visual_pos(const char * str_in, char ** bidi_txt, uint16_t
* Bidi process a paragraph of text * Bidi process a paragraph of text
* @param str_in the string to process * @param str_in the string to process
* @param str_out store the result here * @param str_out store the result here
* @param len length of teh text * @param len length of the text
* @param base_dir base dir of the text * @param base_dir base dir of the text
* @param pos_conv_out an `uint16_t` array to store the related logical position of the character. * @param pos_conv_out an `uint16_t` array to store the related logical position of the character.
* Can be `NULL` is unused * Can be `NULL` is unused
+1 -1
View File
@@ -60,7 +60,7 @@ void _lv_fs_init(void)
} }
/** /**
* Test if a drive is rady or not. If the `ready` function was not initialized `true` will be * Test if a drive is ready or not. If the `ready` function was not initialized `true` will be
* returned. * returned.
* @param letter letter of the drive * @param letter letter of the drive
* @return true: drive is ready; false: drive is not ready * @return true: drive is ready; false: drive is not ready
+1 -1
View File
@@ -129,7 +129,7 @@ void lv_fs_drv_register(lv_fs_drv_t * drv_p);
lv_fs_drv_t * lv_fs_get_drv(char letter); lv_fs_drv_t * lv_fs_get_drv(char letter);
/** /**
* Test if a drive is rady or not. If the `ready` function was not initialized `true` will be * Test if a drive is ready or not. If the `ready` function was not initialized `true` will be
* returned. * returned.
* @param letter letter of the drive * @param letter letter of the drive
* @return true: drive is ready; false: drive is not ready * @return true: drive is ready; false: drive is not ready
+2 -2
View File
@@ -134,7 +134,7 @@ void * _lv_ll_ins_tail(lv_ll_t * ll_p)
if(n_new != NULL) { if(n_new != NULL) {
node_set_next(ll_p, n_new, NULL); /*No next after the new tail*/ node_set_next(ll_p, n_new, NULL); /*No next after the new tail*/
node_set_prev(ll_p, n_new, ll_p->tail); /*The prev. before new is tho old tail*/ node_set_prev(ll_p, n_new, ll_p->tail); /*The prev. before new is the old tail*/
if(ll_p->tail != NULL) { /*If there is old tail then the new comes after it*/ if(ll_p->tail != NULL) { /*If there is old tail then the new comes after it*/
node_set_next(ll_p, ll_p->tail, n_new); node_set_next(ll_p, ll_p->tail, n_new);
} }
@@ -333,7 +333,7 @@ uint32_t _lv_ll_get_len(const lv_ll_t * ll_p)
} }
/** /**
* Move a nodw before an other node in the same linked list * Move a node before an other node in the same linked list
* @param ll_p pointer to a linked list * @param ll_p pointer to a linked list
* @param n_act pointer to node to move * @param n_act pointer to node to move
* @param n_after pointer to a node which should be after `n_act` * @param n_after pointer to a node which should be after `n_act`
+1 -1
View File
@@ -139,7 +139,7 @@ void lv_ll_swap(lv_ll_t * ll_p, void * n1_p, void * n2_p);
*/ */
/** /**
* Move a nodw before an other node in the same linked list * Move a node before an other node in the same linked list
* @param ll_p pointer to a linked list * @param ll_p pointer to a linked list
* @param n_act pointer to node to move * @param n_act pointer to node to move
* @param n_after pointer to a node which should be after `n_act` * @param n_after pointer to a node which should be after `n_act`
+1 -1
View File
@@ -45,7 +45,7 @@ static lv_log_print_g_cb_t custom_print_cb;
/** /**
* Register custom print/write function to call when a log is added. * Register custom print/write function to call when a log is added.
* It can format its "File path", "Line number" and "Description" as required * It can format its "File path", "Line number" and "Description" as required
* and send the formatted log message to a consol or serial port. * and send the formatted log message to a console or serial port.
* @param print_cb a function pointer to print a log * @param print_cb a function pointer to print a log
*/ */
void lv_log_register_print_cb(lv_log_print_g_cb_t print_cb) void lv_log_register_print_cb(lv_log_print_g_cb_t print_cb)
+1 -1
View File
@@ -56,7 +56,7 @@ typedef void (*lv_log_print_g_cb_t)(lv_log_level_t level, const char *, uint32_t
/** /**
* Register custom print/write function to call when a log is added. * Register custom print/write function to call when a log is added.
* It can format its "File path", "Line number" and "Description" as required * It can format its "File path", "Line number" and "Description" as required
* and send the formatted log message to a consol or serial port. * and send the formatted log message to a console or serial port.
* @param print_cb a function pointer to print a log * @param print_cb a function pointer to print a log
*/ */
void lv_log_register_print_cb(lv_log_print_g_cb_t print_cb); void lv_log_register_print_cb(lv_log_print_g_cb_t print_cb);
+1 -1
View File
@@ -103,7 +103,7 @@ int32_t _lv_bezier3(uint32_t t, int32_t u0, int32_t u1, int32_t u2, int32_t u3)
/** /**
* Get the square root of a number * Get the square root of a number
* @param x integer which square root should be calculatoed * @param x integer which square root should be calculated
* @param q store the result here. q->i: integer part, q->f: fractional part in 1/256 unit * @param q store the result here. q->i: integer part, q->f: fractional part in 1/256 unit
* @param mask: optional to skip some iterations if the magnitude of the root is known. * @param mask: optional to skip some iterations if the magnitude of the root is known.
* Set to 0x8000 by default. * Set to 0x8000 by default.
+1 -1
View File
@@ -92,7 +92,7 @@ uint16_t _lv_atan2(int x, int y);
/** /**
* Get the square root of a number * Get the square root of a number
* @param x integer which square root should be calculatoed * @param x integer which square root should be calculated
* @param q store the result here. q->i: integer part, q->f: fractional part in 1/256 unit * @param q store the result here. q->i: integer part, q->f: fractional part in 1/256 unit
* @param mask: optional to skip some iterations if the magnitude of the root is known. * @param mask: optional to skip some iterations if the magnitude of the root is known.
* Set to 0x8000 by default. * Set to 0x8000 by default.
+1 -1
View File
@@ -108,7 +108,7 @@ static lv_mem_buf_t mem_buf_small[] = {{.p = mem_buf1_32, .size = MEM_BUF_SMALL_
**********************/ **********************/
/** /**
* Initiaiize the dyn_mem module (work memory and other variables) * Initialize the dyn_mem module (work memory and other variables)
*/ */
void _lv_mem_init(void) void _lv_mem_init(void)
{ {
+1 -1
View File
@@ -59,7 +59,7 @@ extern lv_mem_buf_arr_t _lv_mem_buf;
**********************/ **********************/
/** /**
* Initiaize the dyn_mem module (work memory and other variables) * Initialize the dyn_mem module (work memory and other variables)
*/ */
void _lv_mem_init(void); void _lv_mem_init(void);
+5 -5
View File
@@ -193,9 +193,9 @@ LV_ATTRIBUTE_TASK_HANDLER uint32_t lv_task_handler(void)
return time_till_next; return time_till_next;
} }
/** /**
* Create an "empty" task. It needs to initialzed with at least * Create an "empty" task. It needs to initialized with at least
* `lv_task_set_cb` and `lv_task_set_period` * `lv_task_set_cb` and `lv_task_set_period`
* @return pointer to the craeted task * @return pointer to the created task
*/ */
lv_task_t * lv_task_create_basic(void) lv_task_t * lv_task_create_basic(void)
{ {
@@ -256,13 +256,13 @@ lv_task_t * lv_task_create_basic(void)
* @param user_data custom parameter * @param user_data custom parameter
* @return pointer to the new task * @return pointer to the new task
*/ */
lv_task_t * lv_task_create(lv_task_cb_t task_cb, uint32_t period, lv_task_prio_t prio, void * user_data) lv_task_t * lv_task_create(lv_task_cb_t task_xcb, uint32_t period, lv_task_prio_t prio, void * user_data)
{ {
lv_task_t * new_task = lv_task_create_basic(); lv_task_t * new_task = lv_task_create_basic();
LV_ASSERT_MEM(new_task); LV_ASSERT_MEM(new_task);
if(new_task == NULL) return NULL; if(new_task == NULL) return NULL;
lv_task_set_cb(new_task, task_cb); lv_task_set_cb(new_task, task_xcb);
lv_task_set_period(new_task, period); lv_task_set_period(new_task, period);
lv_task_set_prio(new_task, prio); lv_task_set_prio(new_task, prio);
new_task->user_data = user_data; new_task->user_data = user_data;
@@ -273,7 +273,7 @@ lv_task_t * lv_task_create(lv_task_cb_t task_cb, uint32_t period, lv_task_prio_t
/** /**
* Set the callback the task (the function to call periodically) * Set the callback the task (the function to call periodically)
* @param task pointer to a task * @param task pointer to a task
* @param task_cb teh function to call periodically * @param task_cb the function to call periodically
*/ */
void lv_task_set_cb(lv_task_t * task, lv_task_cb_t task_cb) void lv_task_set_cb(lv_task_t * task, lv_task_cb_t task_cb)
{ {
+2 -2
View File
@@ -88,9 +88,9 @@ LV_ATTRIBUTE_TASK_HANDLER uint32_t lv_task_handler(void);
//! @endcond //! @endcond
/** /**
* Create an "empty" task. It needs to initialzed with at least * Create an "empty" task. It needs to initialized with at least
* `lv_task_set_cb` and `lv_task_set_period` * `lv_task_set_cb` and `lv_task_set_period`
* @return pointer to the craeted task * @return pointer to the created task
*/ */
lv_task_t * lv_task_create_basic(void); lv_task_t * lv_task_create_basic(void);
+1 -1
View File
@@ -147,7 +147,7 @@ void _lv_txt_get_size(lv_point_t * size_res, const char * text, const lv_font_t
* *
* If the first character is a break character, returns the next index. * If the first character is a break character, returns the next index.
* *
* Example calls from lv_txt_get_next_line() assuming sufficent max_width and * Example calls from lv_txt_get_next_line() assuming sufficient max_width and
* txt = "Test text\n" * txt = "Test text\n"
* 0123456789 * 0123456789
* *
+1 -1
View File
@@ -101,7 +101,7 @@ lv_coord_t _lv_txt_get_width(const char * txt, uint32_t length, const lv_font_t
lv_txt_flag_t flag); lv_txt_flag_t flag);
/** /**
* Check next character in a string and decide if te character is part of the command or not * Check next character in a string and decide if the character is part of the command or not
* @param state pointer to a txt_cmd_state_t variable which stores the current state of command * @param state pointer to a txt_cmd_state_t variable which stores the current state of command
* processing * processing
* @param c the current character * @param c the current character
+2 -2
View File
@@ -148,7 +148,7 @@ lv_obj_t * lv_bar_create(lv_obj_t * par, const lv_obj_t * copy)
* Set a new value on the bar * Set a new value on the bar
* @param bar pointer to a bar object * @param bar pointer to a bar object
* @param value new value * @param value new value
* @param anim LV_ANIM_ON: set the value with an animation; LV_ANIM_OFF: change the value immediatelly * @param anim LV_ANIM_ON: set the value with an animation; LV_ANIM_OFF: change the value immediately
*/ */
void lv_bar_set_value(lv_obj_t * bar, int16_t value, lv_anim_enable_t anim) void lv_bar_set_value(lv_obj_t * bar, int16_t value, lv_anim_enable_t anim)
{ {
@@ -175,7 +175,7 @@ void lv_bar_set_value(lv_obj_t * bar, int16_t value, lv_anim_enable_t anim)
* Set a new start value on the bar * Set a new start value on the bar
* @param bar pointer to a bar object * @param bar pointer to a bar object
* @param value new start value * @param value new start value
* @param anim LV_ANIM_ON: set the value with an animation; LV_ANIM_OFF: change the value immediatelly * @param anim LV_ANIM_ON: set the value with an animation; LV_ANIM_OFF: change the value immediately
*/ */
void lv_bar_set_start_value(lv_obj_t * bar, int16_t start_value, lv_anim_enable_t anim) void lv_bar_set_start_value(lv_obj_t * bar, int16_t start_value, lv_anim_enable_t anim)
{ {
+1 -1
View File
@@ -114,7 +114,7 @@ void lv_bar_set_value(lv_obj_t * bar, int16_t value, lv_anim_enable_t anim);
* Set a new start value on the bar * Set a new start value on the bar
* @param bar pointer to a bar object * @param bar pointer to a bar object
* @param value new start value * @param value new start value
* @param anim LV_ANIM_ON: set the value with an animation; LV_ANIM_OFF: change the value immediatelly * @param anim LV_ANIM_ON: set the value with an animation; LV_ANIM_OFF: change the value immediately
*/ */
void lv_bar_set_start_value(lv_obj_t * bar, int16_t start_value, lv_anim_enable_t anim); void lv_bar_set_start_value(lv_obj_t * bar, int16_t start_value, lv_anim_enable_t anim);
+1 -1
View File
@@ -568,7 +568,7 @@ bool lv_btnmatrix_get_one_check(const lv_obj_t * btnm)
**********************/ **********************/
/** /**
* Handle the drawing related tasks of the button matrixs * Handle the drawing related tasks of the button matrix
* @param btnm pointer to a button matrix object * @param btnm pointer to a button matrix object
* @param clip_area the object will be drawn only in this area * @param clip_area the object will be drawn only in this area
* @param mode LV_DESIGN_COVER_CHK: only check if the object fully covers the 'mask_p' area * @param mode LV_DESIGN_COVER_CHK: only check if the object fully covers the 'mask_p' area
+2 -2
View File
@@ -203,9 +203,9 @@ lv_chart_series_t * lv_chart_add_series(lv_obj_t * chart, lv_color_t color)
} }
/** /**
* Clear the point of a serie * Clear the point of a series
* @param chart pointer to a chart object * @param chart pointer to a chart object
* @param serie pointer to the chart's serie to clear * @param serie pointer to the chart's series to clear
*/ */
void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * serie) void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * serie)
{ {
+2 -2
View File
@@ -126,9 +126,9 @@ lv_obj_t * lv_chart_create(lv_obj_t * par, const lv_obj_t * copy);
lv_chart_series_t * lv_chart_add_series(lv_obj_t * chart, lv_color_t color); lv_chart_series_t * lv_chart_add_series(lv_obj_t * chart, lv_color_t color);
/** /**
* Clear the point of a serie * Clear the point of a series
* @param chart pointer to a chart object * @param chart pointer to a chart object
* @param serie pointer to the chart's serie to clear * @param serie pointer to the chart's series to clear
*/ */
void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * serie); void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * serie);
+3 -3
View File
@@ -237,7 +237,7 @@ void lv_dropdown_set_options(lv_obj_t * ddlist, const char * options)
/** /**
* Set the options in a drop down list from a string * Set the options in a drop down list from a string
* @param ddlist pointer to drop down list object * @param ddlist pointer to drop down list object
* @param options a staic string with '\n' separated options. E.g. "One\nTwo\nThree" * @param options a static string with '\n' separated options. E.g. "One\nTwo\nThree"
*/ */
void lv_dropdown_set_options_static(lv_obj_t * ddlist, const char * options) void lv_dropdown_set_options_static(lv_obj_t * ddlist, const char * options)
{ {
@@ -1023,7 +1023,7 @@ static lv_res_t lv_dropdown_page_signal(lv_obj_t * page, lv_signal_t sign, void
if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) { if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) {
/* Make possible to draw on the full width of the background to redraw the selected rectangle /* Make possible to draw on the full width of the background to redraw the selected rectangle
* when the ddlist is scrolled in fix height mode. * when the ddlist is scrolled in fix height mode.
* (The scrollabel is scrolled the "select rectangle" is drawn on the bg too)*/ * (The scrollable is scrolled then "select rectangle" is drawn on the bg too)*/
lv_style_int_t left = lv_obj_get_style_pad_left(ddlist, LV_DROPDOWN_PART_LIST); lv_style_int_t left = lv_obj_get_style_pad_left(ddlist, LV_DROPDOWN_PART_LIST);
lv_style_int_t right = lv_obj_get_style_pad_right(ddlist, LV_DROPDOWN_PART_LIST); lv_style_int_t right = lv_obj_get_style_pad_right(ddlist, LV_DROPDOWN_PART_LIST);
lv_obj_t * scrl = lv_page_get_scrollable(page); lv_obj_t * scrl = lv_page_get_scrollable(page);
@@ -1081,7 +1081,7 @@ static lv_res_t lv_dropdown_page_scrl_signal(lv_obj_t * scrl, lv_signal_t sign,
else if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) { else if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) {
/* Make possible to draw on the full width of the background to redraw the selected rectangle /* Make possible to draw on the full width of the background to redraw the selected rectangle
* when the ddlist is scrolled in fix height mode. * when the ddlist is scrolled in fix height mode.
* (The scrollabel is scrolled the "select rectangle" is drawn on the bg too)*/ * (The scrollable is scrolled then "select rectangle" is drawn on the bg too)*/
lv_style_int_t left = lv_obj_get_style_pad_left(ddlist, LV_DROPDOWN_PART_LIST); lv_style_int_t left = lv_obj_get_style_pad_left(ddlist, LV_DROPDOWN_PART_LIST);
lv_style_int_t right = lv_obj_get_style_pad_right(ddlist, LV_DROPDOWN_PART_LIST); lv_style_int_t right = lv_obj_get_style_pad_right(ddlist, LV_DROPDOWN_PART_LIST);
scrl->ext_draw_pad = LV_MATH_MAX3(scrl->ext_draw_pad, left, right); scrl->ext_draw_pad = LV_MATH_MAX3(scrl->ext_draw_pad, left, right);
+1 -1
View File
@@ -39,7 +39,7 @@ typedef struct {
lv_coord_t h; /*Height of the image (Handled by the library)*/ lv_coord_t h; /*Height of the image (Handled by the library)*/
uint16_t angle; /*rotation angle of the image*/ uint16_t angle; /*rotation angle of the image*/
lv_point_t pivot; /*rotation center of the image*/ lv_point_t pivot; /*rotation center of the image*/
uint16_t zoom; /*256 means no zoom, 512 double size, 128 hasl size*/ uint16_t zoom; /*256 means no zoom, 512 double size, 128 half size*/
uint8_t src_type : 2; /*See: lv_img_src_t*/ uint8_t src_type : 2; /*See: lv_img_src_t*/
uint8_t auto_size : 1; /*1: automatically set the object size to the image size*/ uint8_t auto_size : 1; /*1: automatically set the object size to the image size*/
uint8_t cf : 5; /*Color format from `lv_img_color_format_t`*/ uint8_t cf : 5; /*Color format from `lv_img_color_format_t`*/
+1 -1
View File
@@ -430,7 +430,7 @@ static void refr_img(lv_obj_t * imgbtn)
if(info_res == LV_RES_OK) { if(info_res == LV_RES_OK) {
ext->act_cf = header.cf; ext->act_cf = header.cf;
if(ext->tiled) lv_obj_set_height(imgbtn, header.h); /*Keep the suer defined width*/ if(ext->tiled) lv_obj_set_height(imgbtn, header.h); /*Keep the sure defined width*/
else lv_obj_set_size(imgbtn, header.w, header.h); else lv_obj_set_size(imgbtn, header.w, header.h);
} }
else { else {
+1 -1
View File
@@ -180,7 +180,7 @@ static inline lv_btn_state_t lv_imgbtn_get_state(const lv_obj_t * imgbtn)
/** /**
* Get the toggle enable attribute of the image button * Get the toggle enable attribute of the image button
* @param imgbtn pointer to a image button object * @param imgbtn pointer to a image button object
* @return ture: toggle enabled, false: disabled * @return true: toggle enabled, false: disabled
*/ */
static inline bool lv_imgbtn_get_checkable(const lv_obj_t * imgbtn) static inline bool lv_imgbtn_get_checkable(const lv_obj_t * imgbtn)
{ {

Some files were not shown because too many files have changed in this diff Show More