diff --git a/scripts/properties.py b/scripts/properties.py index 08ce895a01..060c8451d7 100755 --- a/scripts/properties.py +++ b/scripts/properties.py @@ -184,7 +184,7 @@ typedef enum {{ f" LV_PROPERTY_ID(STYLE, {name.upper() + ',' :25} {id_type+',' :28} LV_STYLE_{name.upper()}),\n" ) - f.write('} _lv_property_style_id_t;\n\n') + f.write('} lv_property_style_id_t;\n\n') f.write('#endif\n') f.write('#endif\n') diff --git a/src/core/lv_obj.h b/src/core/lv_obj.h index 47b7e0ec84..b67113efa2 100644 --- a/src/core/lv_obj.h +++ b/src/core/lv_obj.h @@ -59,7 +59,7 @@ typedef enum { LV_STATE_USER_4 = 0x8000, LV_STATE_ANY = 0xFFFF, /**< Special value can be used in some functions to target all states*/ -} lv_state_t; +} _lv_state_t; /** * The possible parts of widgets. @@ -80,7 +80,7 @@ typedef enum { LV_PART_CUSTOM_FIRST = 0x080000, /**< Extension point for custom widgets*/ LV_PART_ANY = 0x0F0000, /**< Special value can be used in some functions to target all parts*/ -} lv_part_t; +} _lv_part_t; /** * On/Off features controlling the object's behavior. diff --git a/src/font/lv_symbol_def.h b/src/font/lv_symbol_def.h index 4e48986a15..7097d6398b 100644 --- a/src/font/lv_symbol_def.h +++ b/src/font/lv_symbol_def.h @@ -348,7 +348,7 @@ typedef enum { LV_STR_SYMBOL_SD_CARD, LV_STR_SYMBOL_NEW_LINE, LV_STR_SYMBOL_DUMMY, -} _lv_str_symbol_id_t; +} lv_str_symbol_id_t; #ifdef __cplusplus } /*extern "C"*/ diff --git a/src/libs/svg/lv_svg.h b/src/libs/svg/lv_svg.h index bf13246a37..0ec0bf5bae 100644 --- a/src/libs/svg/lv_svg.h +++ b/src/libs/svg/lv_svg.h @@ -150,30 +150,30 @@ typedef uint8_t lv_svg_transform_type_t; typedef enum { LV_SVG_ANIM_REMOVE = 0, LV_SVG_ANIM_FREEZE, -} _lv_svg_anim_action_t; +} lv_svg_anim_action_t; typedef enum { LV_SVG_ANIM_RESTART_ALWAYS = 0, LV_SVG_ANIM_RESTART_WHEN_NOT_ACTIVE, LV_SVG_ANIM_RESTART_NEVER, -} _lv_svg_restart_type_t; +} lv_svg_restart_type_t; typedef enum { LV_SVG_ANIM_CALC_MODE_LINEAR = 0, LV_SVG_ANIM_CALC_MODE_PACED, LV_SVG_ANIM_CALC_MODE_SPLINE, LV_SVG_ANIM_CALC_MODE_DISCRETE, -} _lv_svg_anim_calc_mode_t; +} lv_svg_anim_calc_mode_t; typedef enum { LV_SVG_ANIM_ADDITIVE_REPLACE = 0, LV_SVG_ANIM_ADDITIVE_SUM, -} _lv_svg_anim_additive_type_t; +} lv_svg_anim_additive_type_t; typedef enum { LV_SVG_ANIM_ACCUMULATE_NONE = 0, LV_SVG_ANIM_ACCUMULATE_SUM, -} _lv_svg_accumulate_type_t; +} lv_svg_accumulate_type_t; #endif typedef enum { @@ -188,12 +188,12 @@ typedef enum { LV_SVG_ASPECT_RATIO_XMID_YMAX = (8 << 1), LV_SVG_ASPECT_RATIO_XMAX_YMAX = (9 << 1), } _lv_svg_aspect_ratio_t; +typedef uint32_t lv_svg_aspect_ratio_t; typedef enum { LV_SVG_ASPECT_RATIO_OPT_MEET = 0, LV_SVG_ASPECT_RATIO_OPT_SLICE, -} _lv_svg_aspect_ratio_opt_t; -typedef uint32_t lv_svg_aspect_ratio_t; +} lv_svg_aspect_ratio_opt_t; typedef struct { float x; @@ -256,7 +256,7 @@ typedef enum { LV_SVG_PATH_CMD_CURVE_TO = 67, LV_SVG_PATH_CMD_QUAD_TO = 81, LV_SVG_PATH_CMD_CLOSE = 90, -} _lv_svg_path_cmd_t; +} lv_svg_path_cmd_t; /* * to simplify list buffer management, allocate enough memory for all path data and cmd. diff --git a/src/misc/lv_style.h b/src/misc/lv_style.h index 9624f83710..46e9772bbd 100644 --- a/src/misc/lv_style.h +++ b/src/misc/lv_style.h @@ -290,7 +290,7 @@ typedef enum { LV_STYLE_PROP_ANY = 0xFF, LV_STYLE_PROP_CONST = 0xFF /* magic value for const styles */ -} _lv_style_id_t; +} lv_style_id_t; typedef enum { LV_STYLE_RES_NOT_FOUND, diff --git a/src/widgets/animimage/lv_animimage.h b/src/widgets/animimage/lv_animimage.h index 093a50bf1b..112fd097bd 100644 --- a/src/widgets/animimage/lv_animimage.h +++ b/src/widgets/animimage/lv_animimage.h @@ -42,7 +42,7 @@ typedef enum { LV_PROPERTY_ID(ANIMIMAGE, REPEAT_COUNT, LV_PROPERTY_TYPE_INT, 2), LV_PROPERTY_ID(ANIMIMAGE, SRC_COUNT, LV_PROPERTY_TYPE_INT, 3), LV_PROPERTY_ANIMIMAGE_END, -} _lv_property_animimage_id_t; +} lv_property_animimage_id_t; #endif LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_animimg_class; diff --git a/src/widgets/dropdown/lv_dropdown.h b/src/widgets/dropdown/lv_dropdown.h index ab710930e7..e8f5dcfa33 100644 --- a/src/widgets/dropdown/lv_dropdown.h +++ b/src/widgets/dropdown/lv_dropdown.h @@ -44,7 +44,7 @@ typedef enum { LV_PROPERTY_ID(DROPDOWN, LIST, LV_PROPERTY_TYPE_OBJ, 8), LV_PROPERTY_ID(DROPDOWN, IS_OPEN, LV_PROPERTY_TYPE_BOOL, 9), LV_PROPERTY_DROPDOWN_END, -} _lv_property_dropdown_id_t; +} lv_property_dropdown_id_t; #endif LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_dropdown_class; diff --git a/src/widgets/image/lv_image.h b/src/widgets/image/lv_image.h index b72a657aa1..f13e4fca76 100644 --- a/src/widgets/image/lv_image.h +++ b/src/widgets/image/lv_image.h @@ -71,7 +71,7 @@ typedef enum { LV_PROPERTY_ID(IMAGE, ANTIALIAS, LV_PROPERTY_TYPE_INT, 9), LV_PROPERTY_ID(IMAGE, INNER_ALIGN, LV_PROPERTY_TYPE_INT, 10), LV_PROPERTY_IMAGE_END, -} _lv_property_image_id_t; +} lv_property_image_id_t; #endif /********************** diff --git a/src/widgets/keyboard/lv_keyboard.h b/src/widgets/keyboard/lv_keyboard.h index 84de0becdd..d47d69ba91 100644 --- a/src/widgets/keyboard/lv_keyboard.h +++ b/src/widgets/keyboard/lv_keyboard.h @@ -57,7 +57,7 @@ typedef enum { LV_PROPERTY_ID(KEYBOARD, POPOVERS, LV_PROPERTY_TYPE_INT, 2), LV_PROPERTY_ID(KEYBOARD, SELECTED_BUTTON, LV_PROPERTY_TYPE_INT, 3), LV_PROPERTY_KEYBOARD_END, -} _lv_property_keyboard_id_t; +} lv_property_keyboard_id_t; #endif LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_keyboard_class; diff --git a/src/widgets/label/lv_label.h b/src/widgets/label/lv_label.h index ad517a9244..d66246f5c3 100644 --- a/src/widgets/label/lv_label.h +++ b/src/widgets/label/lv_label.h @@ -60,7 +60,7 @@ typedef enum { LV_PROPERTY_ID(LABEL, TEXT_SELECTION_START, LV_PROPERTY_TYPE_INT, 2), LV_PROPERTY_ID(LABEL, TEXT_SELECTION_END, LV_PROPERTY_TYPE_INT, 3), LV_PROPERTY_LABEL_END, -} _lv_property_label_id_t; +} lv_property_label_id_t; #endif LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_label_class; diff --git a/src/widgets/property/lv_style_properties.h b/src/widgets/property/lv_style_properties.h index f54d59e042..bdbe49a8c5 100644 --- a/src/widgets/property/lv_style_properties.h +++ b/src/widgets/property/lv_style_properties.h @@ -132,7 +132,7 @@ typedef enum { LV_PROPERTY_ID(STYLE, WIDTH, LV_PROPERTY_TYPE_INT, LV_STYLE_WIDTH), LV_PROPERTY_ID(STYLE, X, LV_PROPERTY_TYPE_INT, LV_STYLE_X), LV_PROPERTY_ID(STYLE, Y, LV_PROPERTY_TYPE_INT, LV_STYLE_Y), -} _lv_property_style_id_t; +} lv_property_style_id_t; #endif #endif diff --git a/src/widgets/roller/lv_roller.h b/src/widgets/roller/lv_roller.h index 05023b4e6d..3f7a8f9831 100644 --- a/src/widgets/roller/lv_roller.h +++ b/src/widgets/roller/lv_roller.h @@ -44,7 +44,7 @@ typedef enum { LV_PROPERTY_ID2(ROLLER, SELECTED, LV_PROPERTY_TYPE_INT, LV_PROPERTY_TYPE_INT, 1), LV_PROPERTY_ID(ROLLER, VISIBLE_ROW_COUNT, LV_PROPERTY_TYPE_INT, 2), LV_PROPERTY_ROLLER_END, -} _lv_property_roller_id_t; +} lv_property_roller_id_t; #endif LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_roller_class; diff --git a/src/widgets/slider/lv_slider.h b/src/widgets/slider/lv_slider.h index a14219b788..94633d2236 100644 --- a/src/widgets/slider/lv_slider.h +++ b/src/widgets/slider/lv_slider.h @@ -54,7 +54,7 @@ typedef enum { LV_PROPERTY_ID(SLIDER, IS_DRAGGED, LV_PROPERTY_TYPE_BOOL, 7), LV_PROPERTY_ID(SLIDER, IS_SYMMETRICAL, LV_PROPERTY_TYPE_BOOL, 8), LV_PROPERTY_SLIDER_END, -} _lv_property_slider_id_t; +} lv_property_slider_id_t; #endif /********************** * GLOBAL PROTOTYPES diff --git a/src/widgets/textarea/lv_textarea.h b/src/widgets/textarea/lv_textarea.h index 44ca9aee6b..fbc6e47449 100644 --- a/src/widgets/textarea/lv_textarea.h +++ b/src/widgets/textarea/lv_textarea.h @@ -51,14 +51,14 @@ typedef enum { LV_PROPERTY_ID(TEXTAREA, TEXT_IS_SELECTED, LV_PROPERTY_TYPE_INT, 13), LV_PROPERTY_ID(TEXTAREA, CURRENT_CHAR, LV_PROPERTY_TYPE_INT, 14), LV_PROPERTY_TEXTAREA_END, -} _lv_property_textarea_id_t; +} lv_property_textarea_id_t; #endif LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_textarea_class; typedef enum { LV_PART_TEXTAREA_PLACEHOLDER = LV_PART_CUSTOM_FIRST, -} _lv_textarea_part_id_t; +} lv_textarea_part_id_t; /********************** * GLOBAL PROTOTYPES