diff --git a/lv_conf_templ.h b/lv_conf_templ.h index f69d16de7..df3848e16 100644 --- a/lv_conf_templ.h +++ b/lv_conf_templ.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * + * */ #if 0 /*Remove this to enable the content (Delete the last #endif too!)*/ @@ -133,7 +133,7 @@ #define LV_OBJ_FREE_PTR 1 /*Enable the free pointer attribute*/ /*================== - * LV OBJ X USAGE + * LV OBJ X USAGE *================*/ /* * Documentation of the object types: https://littlevgl.com/object-types diff --git a/lv_core/lv_group.h b/lv_core/lv_group.h index c027bb9d0..19a0f15e7 100644 --- a/lv_core/lv_group.h +++ b/lv_core/lv_group.h @@ -49,7 +49,7 @@ typedef struct _lv_group_t lv_group_focus_cb_t focus_cb; /*A function to call when a new object is focused (optional)*/ lv_style_t style_tmp; /*Stores the modified style of the focused object */ uint8_t frozen:1; /*1: can't focus to new object*/ -}lv_group_t; +} lv_group_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_core/lv_indev.h b/lv_core/lv_indev.h index fb52c5e1a..c0b5c2808 100644 --- a/lv_core/lv_indev.h +++ b/lv_core/lv_indev.h @@ -1,6 +1,6 @@ /** * @file lv_indev_proc.h - * + * */ #ifndef LV_INDEV_H diff --git a/lv_core/lv_obj.h b/lv_core/lv_obj.h index 3497806bd..69315ab08 100644 --- a/lv_core/lv_obj.h +++ b/lv_core/lv_obj.h @@ -1,6 +1,6 @@ /** * @file lv_obj.h - * + * */ #ifndef LV_OBJ_H @@ -48,9 +48,9 @@ extern "C" { #endif -#define LV_ANIM_IN 0x00 /*Animation to show an object. 'OR' it with lv_anim_builtin_t*/ -#define LV_ANIM_OUT 0x80 /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/ -#define LV_ANIM_DIR_MASK 0x80 /*ANIM_IN/ANIM_OUT mask*/ +#define LV_ANIM_IN 0x00 /*Animation to show an object. 'OR' it with lv_anim_builtin_t*/ +#define LV_ANIM_OUT 0x80 /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/ +#define LV_ANIM_DIR_MASK 0x80 /*ANIM_IN/ANIM_OUT mask*/ #define LV_MAX_ANCESTOR_NUM 8 /********************** @@ -64,7 +64,7 @@ typedef enum LV_DESIGN_DRAW_MAIN, LV_DESIGN_DRAW_POST, LV_DESIGN_COVER_CHK, -}lv_design_mode_t; +} lv_design_mode_t; typedef bool (* lv_design_func_t) (struct _lv_obj_t * obj, const lv_area_t * mask_p, lv_design_mode_t mode); @@ -72,19 +72,19 @@ typedef enum { LV_RES_INV = 0, /*Typically indicates that the object is deleted (become invalid) in the action function*/ LV_RES_OK, /*The object is valid (no deleted) after the action*/ -}lv_res_t; +} lv_res_t; typedef enum { /*General signals*/ - LV_SIGNAL_CLEANUP, + LV_SIGNAL_CLEANUP, LV_SIGNAL_CHILD_CHG, LV_SIGNAL_CORD_CHG, LV_SIGNAL_STYLE_CHG, - LV_SIGNAL_REFR_EXT_SIZE, - LV_SIGNAL_GET_TYPE, + LV_SIGNAL_REFR_EXT_SIZE, + LV_SIGNAL_GET_TYPE, - /*Input device related*/ + /*Input device related*/ LV_SIGNAL_PRESSED, LV_SIGNAL_PRESSING, LV_SIGNAL_PRESS_LOST, @@ -94,11 +94,11 @@ typedef enum LV_SIGNAL_DRAG_BEGIN, LV_SIGNAL_DRAG_END, - /*Group related*/ + /*Group related*/ LV_SIGNAL_FOCUS, LV_SIGNAL_DEFOCUS, LV_SIGNAL_CONTROLL, -}lv_signal_t; +} lv_signal_t; typedef lv_res_t (* lv_signal_func_t) (struct _lv_obj_t * obj, lv_signal_t sign, void * param); @@ -106,12 +106,12 @@ typedef struct _lv_obj_t { struct _lv_obj_t * par; /*Pointer to the parent object*/ lv_ll_t child_ll; /*Linked list to store the children objects*/ - + lv_area_t coords; /*Coordinates of the object (x1, y1, x2, y2)*/ lv_signal_func_t signal_func; /*Object type specific signal function*/ lv_design_func_t design_func; /*Object type specific design function*/ - + void * ext_attr; /*Object type specific extended data*/ lv_style_t * style_p; /*Pointer to the object's style*/ @@ -133,12 +133,12 @@ typedef struct _lv_obj_t uint8_t protect; /*Automatically happening actions can be prevented. 'OR'ed values from lv_obj_prot_t*/ - lv_coord_t ext_size; /*EXTtend the size of the object in every direction. E.g. for shadow drawing*/ + lv_coord_t ext_size; /*EXTtend the size of the object in every direction. E.g. for shadow drawing*/ #ifdef LV_OBJ_FREE_NUM_TYPE - LV_OBJ_FREE_NUM_TYPE free_num; /*Application specific identifier (set it freely)*/ + LV_OBJ_FREE_NUM_TYPE free_num; /*Application specific identifier (set it freely)*/ #endif -}lv_obj_t; +} lv_obj_t; typedef lv_res_t (*lv_action_t) (struct _lv_obj_t * obj); @@ -151,13 +151,13 @@ typedef enum LV_PROTECT_POS = 0x04, /*Prevent automatic positioning (e.g. in lv_cont layout)*/ LV_PROTECT_FOLLOW = 0x08, /*Prevent the object be followed in automatic ordering (e.g. in lv_cont PRETTY layout)*/ LV_PROTECT_PRESS_LOST= 0x10, /*TODO */ -}lv_protect_t; +} lv_protect_t; /*Used by `lv_obj_get_type()`. The object's and its ancestor types are stored here*/ typedef struct { const char * type[LV_MAX_ANCESTOR_NUM]; /*[0]: the actual type, [1]: ancestor, [2] #1's ancestor ... [x]: "lv_obj" */ -}lv_obj_type_t; +} lv_obj_type_t; typedef enum { @@ -182,18 +182,18 @@ typedef enum LV_ALIGN_OUT_RIGHT_TOP, LV_ALIGN_OUT_RIGHT_MID, LV_ALIGN_OUT_RIGHT_BOTTOM, -}lv_align_t; +} lv_align_t; typedef enum { - LV_ANIM_NONE = 0, - LV_ANIM_FLOAT_TOP, /*Float from/to the top*/ - LV_ANIM_FLOAT_LEFT, /*Float from/to the left*/ - LV_ANIM_FLOAT_BOTTOM, /*Float from/to the bottom*/ - LV_ANIM_FLOAT_RIGHT, /*Float from/to the right*/ - LV_ANIM_GROW_H, /*Grow/shrink horizontally*/ - LV_ANIM_GROW_V, /*Grow/shrink vertically*/ -}lv_anim_builtin_t; + LV_ANIM_NONE = 0, + LV_ANIM_FLOAT_TOP, /*Float from/to the top*/ + LV_ANIM_FLOAT_LEFT, /*Float from/to the left*/ + LV_ANIM_FLOAT_BOTTOM, /*Float from/to the bottom*/ + LV_ANIM_FLOAT_RIGHT, /*Float from/to the right*/ + LV_ANIM_GROW_H, /*Grow/shrink horizontally*/ + LV_ANIM_GROW_V, /*Grow/shrink vertically*/ +} lv_anim_builtin_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_core/lv_refr.h b/lv_core/lv_refr.h index c5d022211..50b710e0f 100644 --- a/lv_core/lv_refr.h +++ b/lv_core/lv_refr.h @@ -1,6 +1,6 @@ /** * @file lv_refr.h - * + * */ #ifndef LV_REFR_H diff --git a/lv_core/lv_style.h b/lv_core/lv_style.h index aecbe5579..63c1c6736 100644 --- a/lv_core/lv_style.h +++ b/lv_core/lv_style.h @@ -37,14 +37,14 @@ typedef enum LV_BORDER_LEFT = 0x04, LV_BORDER_RIGHT = 0x08, LV_BORDER_FULL = 0x0F, -}lv_border_part_t; +} lv_border_part_t; /*Shadow types*/ typedef enum { LV_SHADOW_BOTTOM = 0, LV_SHADOW_FULL, -}lv_shadow_type_t; +} lv_shadow_type_t; typedef struct { @@ -61,22 +61,22 @@ typedef struct lv_coord_t width; lv_border_part_t part; lv_opa_t opa; - }border; + } border; struct { lv_color_t color; lv_coord_t width; uint8_t type; - }shadow; + } shadow; struct { lv_coord_t ver; lv_coord_t hor; lv_coord_t inner; - }padding; + } padding; uint8_t empty :1; /*Transparent background (border still drawn)*/ - }body; + } body; struct { @@ -85,20 +85,20 @@ typedef struct lv_coord_t letter_space; lv_coord_t line_space; lv_opa_t opa; - }text; + } text; struct { lv_color_t color; lv_opa_t intense; lv_opa_t opa; - }image; + } image; struct { lv_color_t color; lv_coord_t width; lv_opa_t opa; - }line; -}lv_style_t; + } line; +} lv_style_t; #if USE_LV_ANIMATION typedef struct { @@ -112,7 +112,7 @@ typedef struct { uint16_t repeat_pause; /*Wait before repeat*/ uint8_t playback :1; /*When the animation is ready play it back*/ uint8_t repeat :1; /*Repeat the animation infinitely*/ -}lv_style_anim_t; +} lv_style_anim_t; /* Example initialization lv_style_anim_t a; diff --git a/lv_core/lv_vdb.h b/lv_core/lv_vdb.h index f35f65599..478b66fd2 100644 --- a/lv_core/lv_vdb.h +++ b/lv_core/lv_vdb.h @@ -1,6 +1,6 @@ /** * @file lv_vdb.h - * + * */ #ifndef LV_VDB_H @@ -32,7 +32,7 @@ typedef struct { lv_area_t area; lv_color_t *buf; -}lv_vdb_t; +} lv_vdb_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h index 54bc3d6e1..a9c96b88c 100644 --- a/lv_draw/lv_draw.h +++ b/lv_draw/lv_draw.h @@ -1,6 +1,6 @@ /** * @file lv_draw.h - * + * */ #ifndef LV_DRAW_H @@ -30,20 +30,20 @@ extern "C" { /********************** * TYPEDEFS - **********************/ + **********************/ /* Image header it is compatible with * the result image converter utility*/ typedef struct { - union{ + union { struct { uint32_t chroma_keyed:1; /*1: The image contains transparent pixels with LV_COLOR_TRANSP color*/ uint32_t alpha_byte :1; /*Every pixel is extended with a 8 bit alpha channel*/ uint32_t format :6; /*See: lv_img_px_format*/ uint32_t w:12; /*Width of the image map*/ uint32_t h:12; /*Height of the image map*/ - }header; + } header; uint8_t src_type; }; @@ -51,7 +51,7 @@ typedef struct const uint8_t * pixel_map; /*For internal images (c arrays) pointer to the pixels array*/ uint8_t first_pixel; /*For external images (binary) the first byte of the pixels (just for convenient)*/ }; -}lv_img_t; +} lv_img_t; typedef enum { LV_IMG_FORMAT_UNKOWN = 0, @@ -59,7 +59,7 @@ typedef enum { LV_IMG_FORMAT_FILE_RAW_RGB332, /*8 bit*/ LV_IMG_FORMAT_FILE_RAW_RGB565, /*16 bit*/ LV_IMG_FORMAT_FILE_RAW_RGB888, /*24 bit (stored on 32 bit)*/ -}lv_img_format_t; +} lv_img_format_t; typedef enum { @@ -67,7 +67,7 @@ typedef enum { LV_IMG_SRC_FILE, LV_IMG_SRC_SYMBOL, LV_IMG_SRC_UNKNOWN, -}lv_img_src_t; +} lv_img_src_t; /********************** @@ -105,7 +105,7 @@ void lv_draw_triangle(const lv_point_t * points, const lv_area_t * mask_p, lv_co * @param offset text offset in x and y direction (NULL if unused) */ void lv_draw_label(const lv_area_t * cords_p,const lv_area_t * mask_p, const lv_style_t * style_p, - const char * txt, lv_txt_flag_t flag, lv_point_t * offset); + const char * txt, lv_txt_flag_t flag, lv_point_t * offset); #if USE_LV_IMG /** @@ -115,7 +115,7 @@ void lv_draw_label(const lv_area_t * cords_p,const lv_area_t * mask_p, const lv_ * @param map_p pointer to a lv_color_t array which contains the pixels of the image */ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask, - const lv_style_t * style, const void * src); + const lv_style_t * style, const void * src); #endif /** diff --git a/lv_draw/lv_draw_rbasic.h b/lv_draw/lv_draw_rbasic.h index d6a963178..1dbc0ea47 100644 --- a/lv_draw/lv_draw_rbasic.h +++ b/lv_draw/lv_draw_rbasic.h @@ -1,6 +1,6 @@ /** * @file lv_draw_rbasic..h - * + * */ #ifndef LV_DRAW_RBASIC_H @@ -42,7 +42,7 @@ void lv_rpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t col * @param opa opacity (ignored, only for compatibility with lv_vfill) */ void lv_rfill(const lv_area_t * cords_p, const lv_area_t * mask_p, - lv_color_t color, lv_opa_t opa); + lv_color_t color, lv_opa_t opa); /** * Draw a letter to the display @@ -76,8 +76,8 @@ void lv_rletter_set_background(lv_color_t color); * @param recolor_opa the intense of recoloring */ void lv_rmap(const lv_area_t * cords_p, const lv_area_t * mask_p, - const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte, - lv_color_t recolor, lv_opa_t recolor_opa); + const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte, + lv_color_t recolor, lv_opa_t recolor_opa); /********************** * MACROS **********************/ diff --git a/lv_draw/lv_draw_vbasic.h b/lv_draw/lv_draw_vbasic.h index 5f2141296..6c2a594e5 100644 --- a/lv_draw/lv_draw_vbasic.h +++ b/lv_draw/lv_draw_vbasic.h @@ -1,6 +1,6 @@ /** * @file lv_draw_vbasic.h - * + * */ #ifndef LV_DRAW_VBASIC_H @@ -42,7 +42,7 @@ void lv_vpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t col * @param opa opacity of the area (0..255) */ void lv_vfill(const lv_area_t * cords_p, const lv_area_t * mask_p, - lv_color_t color, lv_opa_t opa); + lv_color_t color, lv_opa_t opa); /** * Draw a letter in the Virtual Display Buffer @@ -69,8 +69,8 @@ void lv_vletter(const lv_point_t * pos_p, const lv_area_t * mask_p, * @param recolor_opa the intense of recoloring */ void lv_vmap(const lv_area_t * cords_p, const lv_area_t * mask_p, - const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte, - lv_color_t recolor, lv_opa_t recolor_opa); + const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte, + lv_color_t recolor, lv_opa_t recolor_opa); /** diff --git a/lv_hal/lv_hal_indev.h b/lv_hal/lv_hal_indev.h index 809e7a2d9..094b8be89 100644 --- a/lv_hal/lv_hal_indev.h +++ b/lv_hal/lv_hal_indev.h @@ -2,7 +2,7 @@ * @file hal_indev.h * * @description Input Device HAL interface layer header file - * + * */ #ifndef HAL_INDEV_H @@ -40,7 +40,7 @@ typedef enum { typedef enum { LV_INDEV_STATE_REL = 0, LV_INDEV_STATE_PR -}lv_indev_state_t; +} lv_indev_state_t; /*Data type when an input device is read */ typedef struct { @@ -51,14 +51,14 @@ typedef struct { }; lv_indev_state_t state; /*LV_INDEV_EVENT_REL or LV_INDEV_EVENT_PR*/ void *user_data; /*'lv_indev_drv_t.priv' for this driver*/ -}lv_indev_data_t; +} lv_indev_data_t; /*Initialized by the user and registered by 'lv_indev_add()'*/ typedef struct { lv_hal_indev_type_t type; /*Input device type*/ bool (*read)(lv_indev_data_t *data); /*Function pointer to read data. Return 'true' if there is still data to be read (buffered)*/ void *user_data; /*Pointer to user defined data, passed in 'lv_indev_data_t' on read*/ -}lv_indev_drv_t; +} lv_indev_drv_t; struct _lv_obj_t; @@ -70,7 +70,7 @@ typedef struct _lv_indev_proc_t { lv_point_t act_point; lv_point_t last_point; lv_point_t vect; - lv_point_t drag_sum; /*Count the dragged pixels to check LV_INDEV_DRAG_LIMIT*/ + lv_point_t drag_sum; /*Count the dragged pixels to check LV_INDEV_DRAG_LIMIT*/ struct _lv_obj_t * act_obj; struct _lv_obj_t * last_obj; @@ -92,7 +92,7 @@ typedef struct _lv_indev_proc_t { uint8_t long_pr_sent :1; uint8_t reset_query :1; uint8_t disabled :1; -}lv_indev_proc_t; +} lv_indev_proc_t; struct _lv_obj_t; diff --git a/lv_misc/lv_anim.h b/lv_misc/lv_anim.h index e69f98ec3..77dab04c1 100644 --- a/lv_misc/lv_anim.h +++ b/lv_misc/lv_anim.h @@ -37,21 +37,21 @@ typedef void (*lv_anim_cb_t)(void *); typedef struct _lv_anim_t { - void * var; /*Variable to animate*/ - lv_anim_fp_t fp; /*Animator function*/ - lv_anim_cb_t end_cb; /*Call it when the animation is ready*/ - lv_anim_path_t path; /*An array with the steps of animations*/ - int32_t start; /*Start value*/ - int32_t end; /*End value*/ - uint16_t time; /*Animation time in ms*/ - int16_t act_time; /*Current time in animation. Set to negative to make delay.*/ - uint16_t playback_pause; /*Wait before play back*/ - uint16_t repeat_pause; /*Wait before repeat*/ - uint8_t playback :1; /*When the animation is ready play it back*/ - uint8_t repeat :1; /*Repeat the animation infinitely*/ - /*Animation system use these - user shouldn't set*/ - uint8_t playback_now :1; /*Play back is in progress*/ -}lv_anim_t; + void * var; /*Variable to animate*/ + lv_anim_fp_t fp; /*Animator function*/ + lv_anim_cb_t end_cb; /*Call it when the animation is ready*/ + lv_anim_path_t path; /*An array with the steps of animations*/ + int32_t start; /*Start value*/ + int32_t end; /*End value*/ + uint16_t time; /*Animation time in ms*/ + int16_t act_time; /*Current time in animation. Set to negative to make delay.*/ + uint16_t playback_pause; /*Wait before play back*/ + uint16_t repeat_pause; /*Wait before repeat*/ + uint8_t playback :1; /*When the animation is ready play it back*/ + uint8_t repeat :1; /*Repeat the animation infinitely*/ + /*Animation system use these - user shouldn't set*/ + uint8_t playback_now :1; /*Play back is in progress*/ +} lv_anim_t; /*Example initialization lv_anim_t a; diff --git a/lv_misc/lv_area.h b/lv_misc/lv_area.h index 5d362980f..4663e0106 100644 --- a/lv_misc/lv_area.h +++ b/lv_misc/lv_area.h @@ -1,6 +1,6 @@ /** * @file lv_area.h - * + * */ #ifndef LV_AREA_H @@ -33,15 +33,15 @@ typedef struct { lv_coord_t x; lv_coord_t y; -}lv_point_t; +} lv_point_t; typedef struct { lv_coord_t x1; - lv_coord_t y1; + lv_coord_t y1; lv_coord_t x2; - lv_coord_t y2; -}lv_area_t; + lv_coord_t y2; +} lv_area_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_misc/lv_circ.h b/lv_misc/lv_circ.h index ae67d09d0..f2065f71b 100644 --- a/lv_misc/lv_circ.h +++ b/lv_misc/lv_circ.h @@ -1,6 +1,6 @@ /** * @file lv_circ.h - * + * */ #ifndef LV_CIRC_H diff --git a/lv_misc/lv_color.h b/lv_misc/lv_color.h index d0e0027b5..e2f30a5d6 100644 --- a/lv_misc/lv_color.h +++ b/lv_misc/lv_color.h @@ -1,6 +1,6 @@ /** * @file lv_color.h - * + * */ #ifndef LV_COLOR_H @@ -64,7 +64,7 @@ typedef union uint8_t green :1; uint8_t red :1; uint8_t full :1; -}lv_color1_t; +} lv_color1_t; typedef union { @@ -75,7 +75,7 @@ typedef union uint8_t red :3; }; uint8_t full; -}lv_color8_t; +} lv_color8_t; typedef union { @@ -86,7 +86,7 @@ typedef union uint16_t red :5; }; uint16_t full; -}lv_color16_t; +} lv_color16_t; typedef union { @@ -98,7 +98,7 @@ typedef union uint8_t alpha; }; uint32_t full; -}lv_color24_t; +} lv_color24_t; #if LV_COLOR_DEPTH == 1 typedef uint8_t lv_color_int_t; @@ -130,14 +130,14 @@ typedef struct **********************/ /*In color conversations: - * - When converting to bigger color type the LSB weight of 1 LSB is calculated + * - When converting to bigger color type the LSB weight of 1 LSB is calculated * E.g. 16 bit Red has 5 bits * 8 bit Red has 2 bits * ---------------------- * 8 bit red LSB = (2^5 - 1) / (2^2 - 1) = 31 / 3 = 10 - * + * * - When calculating to smaller color type simply shift out the LSBs - * E.g. 8 bit Red has 2 bits + * E.g. 8 bit Red has 2 bits * 16 bit Red has 5 bits * ---------------------- * Shift right with 5 - 3 = 2 @@ -146,30 +146,30 @@ typedef struct static inline uint8_t lv_color_to1(lv_color_t color) { #if LV_COLOR_DEPTH == 1 - return color.full; + return color.full; #elif LV_COLOR_DEPTH == 8 if((color.red & 0x4) || - (color.green & 0x4) || - (color.blue & 0x2)) { - return 1; + (color.green & 0x4) || + (color.blue & 0x2)) { + return 1; } else { - return 0; + return 0; } #elif LV_COLOR_DEPTH == 16 if((color.red & 0x10) || - (color.green & 0x20) || - (color.blue & 0x10)) { - return 1; + (color.green & 0x20) || + (color.blue & 0x10)) { + return 1; } else { - return 0; + return 0; } #elif LV_COLOR_DEPTH == 24 if((color.red & 0x80) || - (color.green & 0x80) || - (color.blue & 0x80)) { - return 1; + (color.green & 0x80) || + (color.blue & 0x80)) { + return 1; } else { - return 0; + return 0; } #endif } @@ -264,7 +264,7 @@ static inline lv_color_t lv_color_mix(lv_color_t c1, lv_color_t c2, uint8_t mix) * @param color a color * @return the brightness [0..255] */ -static inline uint8_t lv_color_brightness(lv_color_t color) +static inline uint8_t lv_color_brightness(lv_color_t color) { lv_color24_t c24; c24.full = lv_color_to24(color); diff --git a/lv_misc/lv_font.h b/lv_misc/lv_font.h index 462e38daf..894114615 100644 --- a/lv_misc/lv_font.h +++ b/lv_misc/lv_font.h @@ -1,6 +1,6 @@ /** * @file lv_font.h - * + * */ #ifndef LV_FONT_H @@ -33,13 +33,13 @@ typedef struct { uint32_t w_px :8; uint32_t glyph_index :24; -}lv_font_glyph_dsc_t; +} lv_font_glyph_dsc_t; typedef struct { uint32_t unicode :21; uint32_t glyph_dsc_index :11; -}lv_font_unicode_map_t; +} lv_font_unicode_map_t; typedef struct _lv_font_struct { @@ -49,11 +49,11 @@ typedef struct _lv_font_struct const uint8_t * glyph_bitmap; const lv_font_glyph_dsc_t * glyph_dsc; const uint32_t * unicode_list; - const uint8_t * (*get_bitmap)(const struct _lv_font_struct * ,uint32_t); /*Get a glyph's bitmap from a font*/ - int16_t (*get_width)(const struct _lv_font_struct * ,uint32_t); /*Get a glyph's with with a given font*/ + const uint8_t * (*get_bitmap)(const struct _lv_font_struct *,uint32_t); /*Get a glyph's bitmap from a font*/ + int16_t (*get_width)(const struct _lv_font_struct *,uint32_t); /*Get a glyph's with with a given font*/ struct _lv_font_struct * next_page; /*Pointer to a font extension*/ uint32_t bpp :4; /*Bit per pixel: 1, 2 or 4*/ -}lv_font_t; +} lv_font_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_misc/lv_fs.h b/lv_misc/lv_fs.h index f9a27f4bb..8965bfefc 100644 --- a/lv_misc/lv_fs.h +++ b/lv_misc/lv_fs.h @@ -1,6 +1,6 @@ /** * @file lv_fs.h - * + * */ #ifndef LV_FS_H @@ -45,28 +45,28 @@ typedef enum LV_FS_RES_OUT_OF_MEM, /*Not enough memory for an internal operation*/ LV_FS_RES_INV_PARAM, /*Invalid parameter among arguments*/ LV_FS_RES_UNKNOWN, /*Other unknown error*/ -}lv_fs_res_t; +} lv_fs_res_t; struct __lv_fs_drv_t; - + typedef struct { void * file_d; struct __lv_fs_drv_t* drv; -}lv_fs_file_t; +} lv_fs_file_t; typedef struct { void * dir_d; struct __lv_fs_drv_t * drv; -}lv_fs_dir_t; +} lv_fs_dir_t; typedef enum { LV_FS_MODE_WR = 0x01, LV_FS_MODE_RD = 0x02, -}lv_fs_mode_t; +} lv_fs_mode_t; typedef struct __lv_fs_drv_t { @@ -74,7 +74,7 @@ typedef struct __lv_fs_drv_t uint16_t file_size; uint16_t rddir_size; bool (*ready) (void); - + lv_fs_res_t (*open) (void * file_p, const char * path, lv_fs_mode_t mode); lv_fs_res_t (*close) (void * file_p); lv_fs_res_t (*remove) (const char * fn); @@ -85,11 +85,11 @@ typedef struct __lv_fs_drv_t lv_fs_res_t (*trunc) (void * file_p); lv_fs_res_t (*size) (void * file_p, uint32_t * size_p); lv_fs_res_t (*free) (uint32_t * total_p, uint32_t * free_p); - + lv_fs_res_t (*dir_open) (void * rddir_p, const char * path); lv_fs_res_t (*dir_read) (void * rddir_p, char * fn); lv_fs_res_t (*dir_close) (void * rddir_p); -}lv_fs_drv_t; +} lv_fs_drv_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_misc/lv_ll.h b/lv_misc/lv_ll.h index 637b67261..e472f8e06 100644 --- a/lv_misc/lv_ll.h +++ b/lv_misc/lv_ll.h @@ -35,7 +35,7 @@ typedef struct uint32_t n_size; lv_ll_node_t* head; lv_ll_node_t* tail; -}lv_ll_t; +} lv_ll_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_misc/lv_math.h b/lv_misc/lv_math.h index 4a3202d54..b215b4e17 100644 --- a/lv_misc/lv_math.h +++ b/lv_misc/lv_math.h @@ -1,6 +1,6 @@ /** * @file math_base.h - * + * */ #ifndef LV_MATH_H diff --git a/lv_misc/lv_mem.h b/lv_misc/lv_mem.h index daeb1a577..e67ed54a7 100644 --- a/lv_misc/lv_mem.h +++ b/lv_misc/lv_mem.h @@ -34,7 +34,7 @@ typedef struct uint32_t used_cnt; uint8_t used_pct; uint8_t frag_pct; -}lv_mem_monitor_t; +} lv_mem_monitor_t; /********************** * GLOBAL PROTOTYPES @@ -93,7 +93,9 @@ uint32_t lv_mem_get_size(const void * data); */ static inline void lv_mem_assert(void *p) { - if(p == NULL) {while(1);} + if(p == NULL) { + while(1); + } } diff --git a/lv_misc/lv_task.h b/lv_misc/lv_task.h index 47097df21..9e3964e16 100644 --- a/lv_misc/lv_task.h +++ b/lv_misc/lv_task.h @@ -40,7 +40,7 @@ typedef enum LV_TASK_PRIO_HIGH, LV_TASK_PRIO_HIGHEST, LV_TASK_PRIO_NUM, -}lv_task_prio_t; +} lv_task_prio_t; /** * Descriptor of a lv_task @@ -53,7 +53,7 @@ typedef struct void * param; uint8_t prio:3; uint8_t once:1; -}lv_task_t; +} lv_task_t; /********************** * GLOBAL PROTOTYPES @@ -139,4 +139,4 @@ uint8_t lv_task_get_idle(void); } /* extern "C" */ #endif -#endif +#endif diff --git a/lv_misc/lv_templ.h b/lv_misc/lv_templ.h index 6cdcba599..a5459e8d3 100644 --- a/lv_misc/lv_templ.h +++ b/lv_misc/lv_templ.h @@ -1,6 +1,6 @@ /** * @file lv_templ.h - * + * */ #ifndef LV_TEMPL_H diff --git a/lv_misc/lv_txt.h b/lv_misc/lv_txt.h index 3bb489621..9ae7f3c96 100644 --- a/lv_misc/lv_txt.h +++ b/lv_misc/lv_txt.h @@ -1,6 +1,6 @@ /** * @file lv_text.h - * + * */ #ifndef LV_TXT_H @@ -33,14 +33,14 @@ typedef enum LV_TXT_FLAG_EXPAND = 0x02, /*Ignore width (Used by the library)*/ LV_TXT_FLAG_NO_BREAK = 0x04, /*Ignore line breaks (Used by the library)*/ LV_TXT_FLAG_CENTER = 0x08, /*Align the text to the middle*/ -}lv_txt_flag_t; +} lv_txt_flag_t; typedef enum { LV_TXT_CMD_STATE_WAIT, /*Waiting for command*/ LV_TXT_CMD_STATE_PAR, /*Processing the parameter*/ LV_TXT_CMD_STATE_IN, /*Processing the command*/ -}lv_txt_cmd_state_t; +} lv_txt_cmd_state_t; /********************** * GLOBAL PROTOTYPES @@ -57,7 +57,7 @@ typedef enum * @param max_width max with of the text (break the lines to fit this size) Set CORD_MAX to avoid line breaks */ void lv_txt_get_size(lv_point_t * size_res, const char * text, const lv_font_t * font, - lv_coord_t letter_space, lv_coord_t line_space, lv_coord_t max_width, lv_txt_flag_t flag); + lv_coord_t letter_space, lv_coord_t line_space, lv_coord_t max_width, lv_txt_flag_t flag); /** * Get the next line of text. Check line length and break chars too. @@ -69,7 +69,7 @@ void lv_txt_get_size(lv_point_t * size_res, const char * text, const lv_font_t * * @return the index of the first char of the new line */ uint16_t lv_txt_get_next_line(const char * txt, const lv_font_t * font_p, - lv_coord_t letter_space, lv_coord_t max_l, lv_txt_flag_t flag); + lv_coord_t letter_space, lv_coord_t max_l, lv_txt_flag_t flag); /** * Give the length of a text with a given font @@ -81,7 +81,7 @@ uint16_t lv_txt_get_next_line(const char * txt, const lv_font_t * font_p, * @return length of a char_num long text */ lv_coord_t lv_txt_get_width(const char * txt, uint16_t char_num, - const lv_font_t * font_p, lv_coord_t letter_space, lv_txt_flag_t flag); + const lv_font_t * font_p, lv_coord_t letter_space, lv_txt_flag_t flag); /** * Check next character in a string and decide if te character is part of the command or not diff --git a/lv_misc/lv_ufs.h b/lv_misc/lv_ufs.h index 5d42c2a72..ebd9271d2 100644 --- a/lv_misc/lv_ufs.h +++ b/lv_misc/lv_ufs.h @@ -39,9 +39,9 @@ typedef struct uint32_t size; /*Data length in bytes*/ uint16_t oc; /*Open Count*/ uint8_t const_data :1; -}lv_ufs_ent_t; +} lv_ufs_ent_t; -/*File descriptor, used to handle opening an entry more times simultaneously +/*File descriptor, used to handle opening an entry more times simultaneously Contains unique informations about the specific opening*/ typedef struct { @@ -49,14 +49,14 @@ typedef struct uint32_t rwp; /*Read Write Pointer*/ uint8_t ar :1; /*1: Access for read is enabled */ uint8_t aw :1; /*1: Access for write is enabled */ -}lv_ufs_file_t; +} lv_ufs_file_t; /* Read directory descriptor. * It is used to to iterate through the entries in a directory*/ typedef struct { lv_ufs_ent_t * last_ent; -}lv_ufs_dir_t; +} lv_ufs_dir_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_bar.h b/lv_objx/lv_bar.h index 5edcecbf0..7e498b36b 100644 --- a/lv_objx/lv_bar.h +++ b/lv_objx/lv_bar.h @@ -1,6 +1,6 @@ /** * @file lv_bar.h - * + * */ #ifndef LV_BAR_H @@ -38,12 +38,12 @@ typedef struct int16_t min_value; /*Minimum value of the bar*/ int16_t max_value; /*Maximum value of the bar*/ lv_style_t *style_indic; /*Style of the indicator*/ -}lv_bar_ext_t; +} lv_bar_ext_t; typedef enum { LV_BAR_STYLE_BG, LV_BAR_STYLE_INDIC, -}lv_bar_style_t; +} lv_bar_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_btn.h b/lv_objx/lv_btn.h index 4a47e1b9d..df20a4c79 100644 --- a/lv_objx/lv_btn.h +++ b/lv_objx/lv_btn.h @@ -1,6 +1,6 @@ /** * @file lv_btn.h - * + * */ #ifndef LV_BTN_H @@ -41,7 +41,7 @@ typedef enum LV_BTN_STATE_TGL_PR, LV_BTN_STATE_INA, LV_BTN_STATE_NUM, -}lv_btn_state_t; +} lv_btn_state_t; typedef enum { @@ -50,20 +50,20 @@ typedef enum LV_BTN_ACTION_LONG_PR, LV_BTN_ACTION_LONG_PR_REPEAT, LV_BTN_ACTION_NUM, -}lv_btn_action_t; +} lv_btn_action_t; /*Data of button*/ typedef struct { - lv_cont_ext_t cont; /*Ext. of ancestor*/ - /*New data for this type */ - lv_action_t actions[LV_BTN_ACTION_NUM]; - lv_style_t * styles[LV_BTN_STATE_NUM]; /*Styles in each state*/ + lv_cont_ext_t cont; /*Ext. of ancestor*/ + /*New data for this type */ + lv_action_t actions[LV_BTN_ACTION_NUM]; + lv_style_t * styles[LV_BTN_STATE_NUM]; /*Styles in each state*/ lv_btn_state_t state; /*Current state of the button from 'lv_btn_state_t' enum*/ uint8_t toggle :1; /*1: Toggle enabled*/ uint8_t long_pr_action_executed :1; /*1: Long press action executed (Handled by the library)*/ -}lv_btn_ext_t; +} lv_btn_ext_t; /*Styles*/ typedef enum { @@ -72,7 +72,7 @@ typedef enum { LV_BTN_STYLE_TGL_REL, LV_BTN_STYLE_TGL_PR, LV_BTN_STYLE_INA, -}lv_btn_style_t; +} lv_btn_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_btnm.h b/lv_objx/lv_btnm.h index 90aea9941..0bae7927d 100644 --- a/lv_objx/lv_btnm.h +++ b/lv_objx/lv_btnm.h @@ -1,6 +1,6 @@ /** * @file lv_btnm.h - * + * */ @@ -55,7 +55,7 @@ typedef struct uint16_t btn_id_pr; /*Index of the currently pressed button (in `button_areas`) or LV_BTNM_PR_NONE*/ uint16_t btn_id_tgl; /*Index of the currently toggled button (in `button_areas`) or LV_BTNM_PR_NONE */ uint8_t toggle :1; /*Enable toggling*/ -}lv_btnm_ext_t; +} lv_btnm_ext_t; typedef enum { LV_BTNM_STYLE_BG, @@ -64,7 +64,7 @@ typedef enum { LV_BTNM_STYLE_BTN_TGL_REL, LV_BTNM_STYLE_BTN_TGL_PR, LV_BTNM_STYLE_BTN_INA, -}lv_btnm_style_t; +} lv_btnm_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_cb.h b/lv_objx/lv_cb.h index f93357229..1d25b7617 100644 --- a/lv_objx/lv_cb.h +++ b/lv_objx/lv_cb.h @@ -1,6 +1,6 @@ /** * @file lv_cb.h - * + * */ #ifndef LV_CB_H @@ -44,7 +44,7 @@ typedef struct /*New data for this type */ lv_obj_t * bullet; /*Pointer to button*/ lv_obj_t * label; /*Pointer to label*/ -}lv_cb_ext_t; +} lv_cb_ext_t; typedef enum { LV_CB_STYLE_BG, @@ -53,7 +53,7 @@ typedef enum { LV_CB_STYLE_BOX_TGL_REL, LV_CB_STYLE_BOX_TGL_PR, LV_CB_STYLE_BOX_INA, -}lv_cb_style_t; +} lv_cb_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_chart.h b/lv_objx/lv_chart.h index 04475afca..60cec31e8 100644 --- a/lv_objx/lv_chart.h +++ b/lv_objx/lv_chart.h @@ -30,7 +30,7 @@ typedef struct { lv_coord_t * points; lv_color_t color; -}lv_chart_series_t; +} lv_chart_series_t; /*Data of chart */ typedef struct @@ -49,16 +49,16 @@ typedef struct uint8_t num; /*Number of data lines in dl_ll*/ lv_opa_t opa; /*Opacity of data lines*/ lv_opa_t dark; /*Dark level of the point/column bottoms*/ - }series; -}lv_chart_ext_t; + } series; +} lv_chart_ext_t; /*Chart types*/ typedef enum { - LV_CHART_TYPE_LINE = 0x01, - LV_CHART_TYPE_COLUMN = 0x02, - LV_CHART_TYPE_POINT = 0x04, -}lv_chart_type_t; + LV_CHART_TYPE_LINE = 0x01, + LV_CHART_TYPE_COLUMN = 0x02, + LV_CHART_TYPE_POINT = 0x04, +} lv_chart_type_t; /********************** diff --git a/lv_objx/lv_cont.h b/lv_objx/lv_cont.h index 712f3cfd0..491b8dbbc 100644 --- a/lv_objx/lv_cont.h +++ b/lv_objx/lv_cont.h @@ -1,6 +1,6 @@ /** * @file lv_cont.h - * + * */ #ifndef LV_CONT_H @@ -29,17 +29,17 @@ extern "C" { /*Layout options*/ typedef enum { - LV_LAYOUT_OFF = 0, - LV_LAYOUT_CENTER, - LV_LAYOUT_COL_L, /*Column left align*/ - LV_LAYOUT_COL_M, /*Column middle align*/ - LV_LAYOUT_COL_R, /*Column right align*/ - LV_LAYOUT_ROW_T, /*Row top align*/ - LV_LAYOUT_ROW_M, /*Row middle align*/ - LV_LAYOUT_ROW_B, /*Row bottom align*/ - LV_LAYOUT_PRETTY, /*Put as many object as possible in row and begin a new row*/ - LV_LAYOUT_GRID, /*Align same-sized object into a grid*/ -}lv_layout_t; + LV_LAYOUT_OFF = 0, + LV_LAYOUT_CENTER, + LV_LAYOUT_COL_L, /*Column left align*/ + LV_LAYOUT_COL_M, /*Column middle align*/ + LV_LAYOUT_COL_R, /*Column right align*/ + LV_LAYOUT_ROW_T, /*Row top align*/ + LV_LAYOUT_ROW_M, /*Row middle align*/ + LV_LAYOUT_ROW_B, /*Row bottom align*/ + LV_LAYOUT_PRETTY, /*Put as many object as possible in row and begin a new row*/ + LV_LAYOUT_GRID, /*Align same-sized object into a grid*/ +} lv_layout_t; typedef struct { @@ -48,7 +48,7 @@ typedef struct uint8_t layout :4; /*A layout from 'lv_cont_layout_t' enum*/ uint8_t hor_fit :1; /*1: Enable horizontal fit to involve all children*/ uint8_t ver_fit :1; /*1: Enable horizontal fir to involve all children*/ -}lv_cont_ext_t; +} lv_cont_ext_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_ddlist.h b/lv_objx/lv_ddlist.h index 539c7773e..bf908e6da 100644 --- a/lv_objx/lv_ddlist.h +++ b/lv_objx/lv_ddlist.h @@ -1,6 +1,6 @@ /** * @file lv_ddlist.h - * + * */ #ifndef LV_DDLIST_H @@ -50,13 +50,13 @@ typedef struct uint16_t anim_time; /*Open/Close animation time [ms]*/ uint8_t opened :1; /*1: The list is opened*/ lv_coord_t fix_height; /*Height if the ddlist is opened. (0: auto-size)*/ -}lv_ddlist_ext_t; +} lv_ddlist_ext_t; typedef enum { LV_DDLIST_STYLE_BG, LV_DDLIST_STYLE_SEL, LV_DDLIST_STYLE_SB, -}lv_ddlist_style_t; +} lv_ddlist_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_gauge.h b/lv_objx/lv_gauge.h index 51dbfde44..112567c3c 100644 --- a/lv_objx/lv_gauge.h +++ b/lv_objx/lv_gauge.h @@ -1,6 +1,6 @@ /** * @file lv_gauge.h - * + * */ #ifndef LV_GAUGE_H @@ -43,7 +43,7 @@ typedef struct const lv_color_t * needle_colors; /*Color of the needles (lv_color_t my_colors[needle_num])*/ uint8_t needle_count; /*Number of needles*/ uint8_t label_count; /*Number of labels on the scale*/ -}lv_gauge_ext_t; +} lv_gauge_ext_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h index aa7f553a1..44f05ded1 100644 --- a/lv_objx/lv_img.h +++ b/lv_objx/lv_img.h @@ -1,6 +1,6 @@ /** * @file lv_img.h - * + * */ #ifndef LV_IMG_H @@ -42,7 +42,7 @@ typedef struct uint8_t auto_size :1; /*1: automatically set the object size to the image size*/ uint8_t chroma_keyed :1; /*1: Chroma keyed image, LV_COLOR_TRANSP (lv_conf.h) pixels will be transparent (Handled by the library)*/ uint8_t alpha_byte :1; /*1: Extra byte for every pixel to define opacity*/ -}lv_img_ext_t; +} lv_img_ext_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_kb.h b/lv_objx/lv_kb.h index 08b42f2fc..722e24bb6 100644 --- a/lv_objx/lv_kb.h +++ b/lv_objx/lv_kb.h @@ -1,6 +1,6 @@ /** * @file lv_kb.h - * + * */ #ifndef LV_KB_H @@ -39,7 +39,7 @@ extern "C" { typedef enum { LV_KB_MODE_TEXT, LV_KB_MODE_NUM, -}lv_kb_mode_t; +} lv_kb_mode_t; /*Data of keyboard*/ @@ -51,7 +51,7 @@ typedef struct { uint8_t cursor_mng :1; /*1: automatically show/hide cursor when a text area is assigned or left*/ lv_action_t ok_action; /*Called when the "Ok" button is clicked*/ lv_action_t hide_action; /*Called when the "Hide" button is clicked*/ -}lv_kb_ext_t; +} lv_kb_ext_t; typedef enum { LV_KB_STYLE_BG, @@ -60,7 +60,7 @@ typedef enum { LV_KB_STYLE_BTN_TGL_REL, LV_KB_STYLE_BTN_TGL_PR, LV_KB_STYLE_BTN_INA, -}lv_kb_style_t; +} lv_kb_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h index 48b29f713..3f7eb1f85 100644 --- a/lv_objx/lv_label.h +++ b/lv_objx/lv_label.h @@ -1,6 +1,6 @@ /** * @file lv_rect.h - * + * */ #ifndef LV_LABEL_H @@ -39,13 +39,13 @@ typedef enum LV_LABEL_LONG_SCROLL, /*Expand the object size and scroll the text on the parent (move the label object)*/ LV_LABEL_LONG_DOT, /*Keep the size and write dots at the end if the text is too long*/ LV_LABEL_LONG_ROLL, /*Keep the size and roll the text infinitely*/ -}lv_label_long_mode_t; +} lv_label_long_mode_t; /*Label align policy*/ typedef enum { LV_LABEL_ALIGN_LEFT, LV_LABEL_ALIGN_CENTER, -}lv_label_align_t; +} lv_label_align_t; /*Data of label*/ typedef struct @@ -68,7 +68,7 @@ typedef struct uint8_t expand :1; /*Ignore real width (used by the library with LV_LABEL_LONG_ROLL)*/ uint8_t no_break :1; /*Ignore new line characters*/ uint8_t body_draw :1; /*Draw background body*/ -}lv_label_ext_t; +} lv_label_ext_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_led.h b/lv_objx/lv_led.h index 218dec3a4..f262c751c 100644 --- a/lv_objx/lv_led.h +++ b/lv_objx/lv_led.h @@ -1,6 +1,6 @@ /** * @file lv_led.h - * + * */ #ifndef LV_LED_H @@ -32,7 +32,7 @@ typedef struct /*No inherited ext.*/ /*New data for this type */ uint8_t bright; /*Current brightness of the LED (0..255)*/ -}lv_led_ext_t; +} lv_led_ext_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_line.h b/lv_objx/lv_line.h index 252bd5065..3ffebf6a0 100644 --- a/lv_objx/lv_line.h +++ b/lv_objx/lv_line.h @@ -34,7 +34,7 @@ typedef struct uint16_t point_num; /*Number of points in 'point_array' */ uint8_t auto_size :1; /*1: set obj. width to x max and obj. height to y max */ uint8_t y_inv :1; /*1: y == 0 will be on the bottom*/ -}lv_line_ext_t; +} lv_line_ext_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_list.h b/lv_objx/lv_list.h index 0f1e73140..344dd64ea 100644 --- a/lv_objx/lv_list.h +++ b/lv_objx/lv_list.h @@ -1,6 +1,6 @@ /** * @file lv_list.h - * + * */ #ifndef LV_LIST_H @@ -51,7 +51,7 @@ typedef struct uint16_t anim_time; /*Scroll animation time*/ lv_style_t *styles_btn[LV_BTN_STATE_NUM]; /*Styles of the list element buttons*/ lv_style_t *style_img; /*Style of the list element images on buttons*/ -}lv_list_ext_t; +} lv_list_ext_t; typedef enum { LV_LIST_STYLE_BG, @@ -62,7 +62,7 @@ typedef enum { LV_LIST_STYLE_BTN_TGL_REL, LV_LIST_STYLE_BTN_TGL_PR, LV_LIST_STYLE_BTN_INA, -}lv_list_style_t; +} lv_list_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_lmeter.h b/lv_objx/lv_lmeter.h index aa8cac3fc..adba4b3c6 100644 --- a/lv_objx/lv_lmeter.h +++ b/lv_objx/lv_lmeter.h @@ -1,6 +1,6 @@ /** * @file lv_lmeter.h - * + * */ #ifndef LV_LMETER_H @@ -35,7 +35,7 @@ typedef struct int16_t cur_value; int16_t min_value; int16_t max_value; -}lv_lmeter_ext_t; +} lv_lmeter_ext_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_mbox.h b/lv_objx/lv_mbox.h index 3a4b5a762..459d0930b 100644 --- a/lv_objx/lv_mbox.h +++ b/lv_objx/lv_mbox.h @@ -1,6 +1,6 @@ /** * @file lv_mbox.h - * + * */ #ifndef LV_MBOX_H @@ -51,7 +51,7 @@ typedef struct lv_obj_t *text; /*Text of the message box*/ lv_obj_t *btnm; /*Button matrix for the buttons*/ uint16_t anim_time; /*Duration of close animation [ms] (0: no animation)*/ -}lv_mbox_ext_t; +} lv_mbox_ext_t; typedef enum { LV_MBOX_STYLE_BG, @@ -61,7 +61,7 @@ typedef enum { LV_MBOX_STYLE_BTN_TGL_REL, LV_MBOX_STYLE_BTN_TGL_PR, LV_MBOX_STYLE_BTN_INA, -}lv_mbox_style_t; +} lv_mbox_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_objx_templ.h b/lv_objx/lv_objx_templ.h index 8a95c9e7e..397d13693 100644 --- a/lv_objx/lv_objx_templ.h +++ b/lv_objx/lv_objx_templ.h @@ -1,6 +1,6 @@ /** * @file lv_templ.h - * + * */ @@ -37,14 +37,14 @@ extern "C" { typedef struct { lv_ANCESTOR_ext_t ANCESTOR; /*Ext. of ancestor*/ /*New data for this type */ -}lv_templ_ext_t; +} lv_templ_ext_t; /*Styles*/ typedef enum { LV_TEMPL_STYLE_X, LV_TEMPL_STYLE_Y, -}lv_templ_style_t; +} lv_templ_style_t; /********************** diff --git a/lv_objx/lv_page.h b/lv_objx/lv_page.h index 2027d8a82..7ca83ecee 100644 --- a/lv_objx/lv_page.h +++ b/lv_objx/lv_page.h @@ -1,6 +1,6 @@ /** * @file lv_page.h - * + * */ #ifndef LV_PAGE_H @@ -39,7 +39,7 @@ typedef enum LV_SB_MODE_ON, /*Always show scrollbars*/ LV_SB_MODE_DRAG, /*Show scrollbars when page is being dragged*/ LV_SB_MODE_AUTO, /*Show scrollbars when the scrollable container is large enough to be scrolled*/ -}lv_sb_mode_t; +} lv_sb_mode_t; /*Data of page*/ typedef struct @@ -56,14 +56,14 @@ typedef struct uint8_t hor_draw :1; /*1: horizontal scrollbar is visible now (Handled by the library)*/ uint8_t ver_draw :1; /*1: vertical scrollbar is visible now (Handled by the library)*/ uint8_t mode :3; /*Scrollbar visibility from 'lv_page_sb_mode_t'*/ - }sb; -}lv_page_ext_t; + } sb; +} lv_page_ext_t; typedef enum { LV_PAGE_STYLE_BG, LV_PAGE_STYLE_SCRL, LV_PAGE_STYLE_SB, -}lv_page_style_t; +} lv_page_style_t; /********************** diff --git a/lv_objx/lv_roller.h b/lv_objx/lv_roller.h index cb21fcab8..a789ea8de 100644 --- a/lv_objx/lv_roller.h +++ b/lv_objx/lv_roller.h @@ -1,6 +1,6 @@ /** * @file lv_roller.h - * + * */ #ifndef LV_ROLLER_H @@ -35,12 +35,12 @@ extern "C" { typedef struct { lv_ddlist_ext_t ddlist; /*Ext. of ancestor*/ /*New data for this type */ -}lv_roller_ext_t; +} lv_roller_ext_t; typedef enum { LV_ROLLER_STYLE_BG, LV_ROLLER_STYLE_SEL, -}lv_roller_style_t; +} lv_roller_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_slider.h b/lv_objx/lv_slider.h index 3b49e3797..2685d0230 100644 --- a/lv_objx/lv_slider.h +++ b/lv_objx/lv_slider.h @@ -1,6 +1,6 @@ /** * @file lv_slider.h - * + * */ #ifndef LV_SLIDER_H @@ -40,15 +40,15 @@ typedef struct lv_style_t *style_knob; /*Style of the knob*/ int16_t drag_value; /*Store a temporal value during press until release (Handled by the library)*/ uint8_t knob_in :1; /*1: Draw the knob inside the bar*/ -}lv_slider_ext_t; +} lv_slider_ext_t; /*Built-in styles of slider*/ typedef enum { - LV_SLIDER_STYLE_BG, + LV_SLIDER_STYLE_BG, LV_SLIDER_STYLE_INDIC, LV_SLIDER_STYLE_KNOB, -}lv_slider_style_t; +} lv_slider_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_sw.h b/lv_objx/lv_sw.h index 3baf340c0..64c40754e 100644 --- a/lv_objx/lv_sw.h +++ b/lv_objx/lv_sw.h @@ -1,6 +1,6 @@ /** * @file lv_sw.h - * + * */ #ifndef LV_SW_H @@ -39,14 +39,14 @@ typedef struct lv_style_t *style_knob_off; /*Style of the knob when the switch is OFF*/ lv_style_t *style_knob_on; /*Style of the knob when the switch is ON (NULL to use the same as OFF)*/ uint8_t changed :1; /*Indicates the switch explicitly changed by drag*/ -}lv_sw_ext_t; +} lv_sw_ext_t; typedef enum { LV_SW_STYLE_BG, LV_SW_STYLE_INDIC, LV_SW_STYLE_KNOB_OFF, LV_SW_STYLE_KNOB_ON, -}lv_sw_style_t; +} lv_sw_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_ta.h b/lv_objx/lv_ta.h index 6a2c29058..faa19508c 100644 --- a/lv_objx/lv_ta.h +++ b/lv_objx/lv_ta.h @@ -1,6 +1,6 @@ /** * @file lv_ta.h - * + * */ #ifndef LV_TA_H @@ -40,12 +40,12 @@ extern "C" { typedef enum { LV_CURSOR_NONE, - LV_CURSOR_LINE, - LV_CURSOR_BLOCK, - LV_CURSOR_OUTLINE, - LV_CURSOR_UNDERLINE, + LV_CURSOR_LINE, + LV_CURSOR_BLOCK, + LV_CURSOR_OUTLINE, + LV_CURSOR_UNDERLINE, LV_CURSOR_HIDDEN = 0x10, /*Or it to any value to hide the cursor temporally*/ -}lv_cursor_type_t; +} lv_cursor_type_t; /*Data of text area*/ typedef struct @@ -62,14 +62,14 @@ typedef struct uint16_t pos; /*The current cursor position (0: before 1. letter; 1: before 2. letter etc.)*/ lv_cursor_type_t type; /*Shape of the cursor*/ uint8_t state :1; /*Indicates that the cursor is visible now or not (Handled by the library)*/ - }cursor; -}lv_ta_ext_t; + } cursor; +} lv_ta_ext_t; typedef enum { LV_TA_STYLE_BG, LV_TA_STYLE_SB, LV_TA_STYLE_CURSOR, -}lv_ta_style_t; +} lv_ta_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_tabview.h b/lv_objx/lv_tabview.h index f76a56acc..5157f8baf 100644 --- a/lv_objx/lv_tabview.h +++ b/lv_objx/lv_tabview.h @@ -1,6 +1,6 @@ /** * @file lv_tabview.h - * + * */ #ifndef LV_TABVIEW_H @@ -44,7 +44,7 @@ typedef void (*lv_tabview_action_t)(lv_obj_t *, uint16_t); /*Data of tab*/ typedef struct { - /*Ext. of ancestor*/ + /*Ext. of ancestor*/ /*New data for this type */ lv_obj_t * btns; lv_obj_t * indic; @@ -58,7 +58,7 @@ typedef struct uint8_t draging :1; uint8_t drag_hor :1; lv_tabview_action_t tab_load_action; -}lv_tabview_ext_t; +} lv_tabview_ext_t; typedef enum { LV_TABVIEW_STYLE_BG, @@ -68,7 +68,7 @@ typedef enum { LV_TABVIEW_STYLE_BTN_PR, LV_TABVIEW_STYLE_BTN_TGL_REL, LV_TABVIEW_STYLE_BTN_TGL_PR, -}lv_tabview_style_t; +} lv_tabview_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_objx/lv_win.h b/lv_objx/lv_win.h index 7de9e416e..d0b066ad2 100644 --- a/lv_objx/lv_win.h +++ b/lv_objx/lv_win.h @@ -1,6 +1,6 @@ /** * @file lv_win.h - * + * */ #ifndef LV_WIN_H @@ -61,7 +61,7 @@ typedef struct lv_style_t * style_btn_rel; /*Control button releases style*/ lv_style_t * style_btn_pr; /*Control button pressed style*/ lv_coord_t btn_size; /*Size of the control buttons (square)*/ -}lv_win_ext_t; +} lv_win_ext_t; typedef enum { LV_WIN_STYLE_BG, @@ -71,7 +71,7 @@ typedef enum { LV_WIN_STYLE_HEADER, LV_WIN_STYLE_BTN_REL, LV_WIN_STYLE_BTN_PR, -}lv_win_style_t; +} lv_win_style_t; /********************** * GLOBAL PROTOTYPES diff --git a/lv_themes/lv_theme.h b/lv_themes/lv_theme.h index 448a2f166..97bff38fc 100644 --- a/lv_themes/lv_theme.h +++ b/lv_themes/lv_theme.h @@ -38,7 +38,7 @@ typedef struct { lv_style_t *tgl_rel; lv_style_t *tgl_pr; lv_style_t *ina; - }btn; + } btn; #endif #if USE_LV_LABEL != 0 @@ -46,20 +46,20 @@ typedef struct { lv_style_t *prim; lv_style_t *sec; lv_style_t *hint; - }label; + } label; #endif #if USE_LV_IMG != 0 struct { lv_style_t *light; lv_style_t *dark; - }img; + } img; #endif #if USE_LV_LINE != 0 struct { lv_style_t *decor; - }line; + } line; #endif #if USE_LV_LED != 0 @@ -70,7 +70,7 @@ typedef struct { struct { lv_style_t *bg; lv_style_t *indic; - }bar; + } bar; #endif #if USE_LV_SLIDER != 0 @@ -78,7 +78,7 @@ typedef struct { lv_style_t *bg; lv_style_t *indic; lv_style_t *knob; - }slider; + } slider; #endif #if USE_LV_LMETER != 0 @@ -95,7 +95,7 @@ typedef struct { lv_style_t *indic; lv_style_t *knob_off; lv_style_t *knob_on; - }sw; + } sw; #endif #if USE_LV_CHART != 0 @@ -111,8 +111,8 @@ typedef struct { lv_style_t *tgl_rel; lv_style_t *tgl_pr; lv_style_t *ina; - }box; - }cb; + } box; + } cb; #endif #if USE_LV_BTNM != 0 @@ -124,8 +124,8 @@ typedef struct { lv_style_t *tgl_rel; lv_style_t *tgl_pr; lv_style_t *ina; - }btn; - }btnm; + } btn; + } btnm; #endif #if USE_LV_KB != 0 @@ -138,7 +138,7 @@ typedef struct { lv_style_t *tgl_pr; lv_style_t *ina; } btn; - }kb; + } kb; #endif #if USE_LV_MBOX != 0 @@ -148,8 +148,8 @@ typedef struct { lv_style_t *bg; lv_style_t *rel; lv_style_t *pr; - }btn; - }mbox; + } btn; + } mbox; #endif #if USE_LV_PAGE != 0 @@ -157,7 +157,7 @@ typedef struct { lv_style_t *bg; lv_style_t *scrl; lv_style_t *sb; - }page; + } page; #endif #if USE_LV_TA != 0 @@ -166,7 +166,7 @@ typedef struct { lv_style_t *oneline; lv_style_t *cursor; lv_style_t *sb; - }ta; + } ta; #endif #if USE_LV_LIST @@ -180,8 +180,8 @@ typedef struct { lv_style_t *tgl_rel; lv_style_t *tgl_pr; lv_style_t *ina; - }btn; - }list; + } btn; + } list; #endif #if USE_LV_DDLIST != 0 @@ -189,14 +189,14 @@ typedef struct { lv_style_t *bg; lv_style_t *sel; lv_style_t *sb; - }ddlist; + } ddlist; #endif #if USE_LV_ROLLER != 0 struct { lv_style_t *bg; lv_style_t *sel; - }roller; + } roller; #endif #if USE_LV_TABVIEW != 0 @@ -209,8 +209,8 @@ typedef struct { lv_style_t *pr; lv_style_t *tgl_rel; lv_style_t *tgl_pr; - }btn; - }tabview; + } btn; + } tabview; #endif #if USE_LV_WIN != 0 @@ -221,14 +221,14 @@ typedef struct { struct { lv_style_t *bg; lv_style_t *scrl; - }content; + } content; struct { lv_style_t *rel; lv_style_t *pr; - }btn; - }win; + } btn; + } win; #endif -}lv_theme_t; +} lv_theme_t; /********************** * GLOBAL PROTOTYPES