diff --git a/examples/others/xml/lv_example_xml_2.c b/examples/others/xml/lv_example_xml_2.c index 22ee818b6e..9a9671497d 100644 --- a/examples/others/xml/lv_example_xml_2.c +++ b/examples/others/xml/lv_example_xml_2.c @@ -1,5 +1,5 @@ #include "../../lv_examples.h" -#if LV_BUILD_EXAMPLES && LV_USE_XML && LV_USE_TRANSLATION +#if LV_BUILD_EXAMPLES && LV_USE_XML && LV_USE_TRANSLATION && LV_FONT_MONTSERRAT_18 void lv_example_xml_2(void) { diff --git a/lv_conf_template.h b/lv_conf_template.h index 0b1d0ef57e..40fae356fc 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -556,7 +556,7 @@ /* Used to pick the correct GPU revision header it depends on the vendor */ #define LV_VG_LITE_HAL_GPU_REVISION 0x40 - /* Base memory addres of the GPU IP it depends on SoC, default value is for NXP based devices */ + /* Base memory address of the GPU IP it depends on SoC, default value is for NXP based devices */ #define LV_VG_LITE_HAL_GPU_BASE_ADDRESS 0x40240000 #endif @@ -1064,7 +1064,7 @@ /** Get the applications idle percentage. * - Requires `LV_USE_OS == LV_OS_PTHREAD` */ #define LV_SYSMON_GET_PROC_IDLE lv_os_get_proc_idle_percent - #endif + #endif /** 1: Show CPU usage and FPS count. * - Requires `LV_USE_SYSMON = 1` */ @@ -1204,7 +1204,7 @@ #if LV_USE_TEST /** Enable `lv_test_screenshot_compare`. - * Requires libpng and a few MB of extra RAM. */ + * Requires lodepng and a few MB of extra RAM. */ #define LV_USE_TEST_SCREENSHOT_COMPARE 0 #endif /*LV_USE_TEST*/ diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index f2cfd85c15..588f9f8678 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -1587,7 +1587,7 @@ #endif #endif - /* Base memory addres of the GPU IP it depends on SoC, default value is for NXP based devices */ + /* Base memory address of the GPU IP it depends on SoC, default value is for NXP based devices */ #ifndef LV_VG_LITE_HAL_GPU_BASE_ADDRESS #ifdef CONFIG_LV_VG_LITE_HAL_GPU_BASE_ADDRESS #define LV_VG_LITE_HAL_GPU_BASE_ADDRESS CONFIG_LV_VG_LITE_HAL_GPU_BASE_ADDRESS @@ -3353,7 +3353,7 @@ #define LV_SYSMON_GET_PROC_IDLE lv_os_get_proc_idle_percent #endif #endif - #endif + #endif /** 1: Show CPU usage and FPS count. * - Requires `LV_USE_SYSMON = 1` */ @@ -3809,7 +3809,7 @@ #if LV_USE_TEST /** Enable `lv_test_screenshot_compare`. - * Requires libpng and a few MB of extra RAM. */ + * Requires lodepng and a few MB of extra RAM. */ #ifndef LV_USE_TEST_SCREENSHOT_COMPARE #ifdef CONFIG_LV_USE_TEST_SCREENSHOT_COMPARE #define LV_USE_TEST_SCREENSHOT_COMPARE CONFIG_LV_USE_TEST_SCREENSHOT_COMPARE diff --git a/src/others/xml/lv_xml.c b/src/others/xml/lv_xml.c index a2aa49c96d..9d610048aa 100644 --- a/src/others/xml/lv_xml.c +++ b/src/others/xml/lv_xml.c @@ -10,6 +10,14 @@ #include "lv_xml.h" #if LV_USE_XML +#if LV_USE_OBJ_NAME == 0 + #error "LV_USE_OBJ_NAME is required to use XMLs" +#endif + +#if LV_USE_OBSERVER == 0 + #error "LV_USE_OBSERVER is required to use XMLs" +#endif + #include "lv_xml.h" #include "lv_xml_base_types.h" #include "lv_xml_parser.h" @@ -89,42 +97,109 @@ void lv_xml_init(void) lv_xml_register_font(NULL, "lv_font_default", lv_font_get_default()); lv_xml_widget_register("lv_obj", lv_xml_obj_create, lv_xml_obj_apply); + +#if LV_USE_BUTTON lv_xml_widget_register("lv_button", lv_xml_button_create, lv_xml_button_apply); +#endif + +#if LV_USE_LABEL lv_xml_widget_register("lv_label", lv_xml_label_create, lv_xml_label_apply); +#endif + +#if LV_USE_IMAGE lv_xml_widget_register("lv_image", lv_xml_image_create, lv_xml_image_apply); +#endif + +#if LV_USE_BAR lv_xml_widget_register("lv_bar", lv_xml_bar_create, lv_xml_bar_apply); +#endif + +#if LV_USE_SLIDER lv_xml_widget_register("lv_slider", lv_xml_slider_create, lv_xml_slider_apply); +#endif + +#if LV_USE_TABVIEW lv_xml_widget_register("lv_tabview", lv_xml_tabview_create, lv_xml_tabview_apply); lv_xml_widget_register("lv_tabview-tab_bar", lv_xml_tabview_tab_bar_create, lv_xml_tabview_tab_bar_apply); lv_xml_widget_register("lv_tabview-tab", lv_xml_tabview_tab_create, lv_xml_tabview_tab_apply); lv_xml_widget_register("lv_tabview-tab_button", lv_xml_tabview_tab_button_create, lv_xml_tabview_tab_button_apply); +#endif + +#if LV_USE_CHART lv_xml_widget_register("lv_chart", lv_xml_chart_create, lv_xml_chart_apply); lv_xml_widget_register("lv_chart-cursor", lv_xml_chart_cursor_create, lv_xml_chart_cursor_apply); lv_xml_widget_register("lv_chart-series", lv_xml_chart_series_create, lv_xml_chart_series_apply); lv_xml_widget_register("lv_chart-axis", lv_xml_chart_axis_create, lv_xml_chart_axis_apply); +#endif + +#if LV_USE_TABLE lv_xml_widget_register("lv_table", lv_xml_table_create, lv_xml_table_apply); lv_xml_widget_register("lv_table-column", lv_xml_table_column_create, lv_xml_table_column_apply); lv_xml_widget_register("lv_table-cell", lv_xml_table_cell_create, lv_xml_table_cell_apply); +#endif + +#if LV_USE_DROPDOWN lv_xml_widget_register("lv_dropdown", lv_xml_dropdown_create, lv_xml_dropdown_apply); lv_xml_widget_register("lv_dropdown-list", lv_xml_dropdown_list_create, lv_xml_dropdown_list_apply); +#endif + +#if LV_USE_ROLLER lv_xml_widget_register("lv_roller", lv_xml_roller_create, lv_xml_roller_apply); +#endif + +#if LV_USE_SCALE lv_xml_widget_register("lv_scale", lv_xml_scale_create, lv_xml_scale_apply); lv_xml_widget_register("lv_scale-section", lv_xml_scale_section_create, lv_xml_scale_section_apply); +#endif + +#if LV_USE_SPAN lv_xml_widget_register("lv_spangroup", lv_xml_spangroup_create, lv_xml_spangroup_apply); lv_xml_widget_register("lv_spangroup-span", lv_xml_spangroup_span_create, lv_xml_spangroup_span_apply); +#endif + +#if LV_USE_BUTTONMATRIX lv_xml_widget_register("lv_buttonmatrix", lv_xml_buttonmatrix_create, lv_xml_buttonmatrix_apply); +#endif + +#if LV_USE_TEXTAREA lv_xml_widget_register("lv_textarea", lv_xml_textarea_create, lv_xml_textarea_apply); +#endif + +#if LV_USE_KEYBOARD lv_xml_widget_register("lv_keyboard", lv_xml_keyboard_create, lv_xml_keyboard_apply); +#endif + +#if LV_USE_ARC lv_xml_widget_register("lv_arc", lv_xml_arc_create, lv_xml_arc_apply); +#endif + +#if LV_USE_SWITCH lv_xml_widget_register("lv_switch", lv_xml_switch_create, lv_xml_switch_apply); +#endif + +#if LV_USE_CHECKBOX lv_xml_widget_register("lv_checkbox", lv_xml_checkbox_create, lv_xml_checkbox_apply); +#endif + +#if LV_USE_CANVAS lv_xml_widget_register("lv_canvas", lv_xml_canvas_create, lv_xml_canvas_apply); +#endif + +#if LV_USE_CALENDAR lv_xml_widget_register("lv_calendar", lv_xml_calendar_create, lv_xml_calendar_apply); +#if LV_USE_CALENDAR_HEADER_ARROW lv_xml_widget_register("lv_calendar-header_arrow", lv_xml_calendar_header_arrow_create, lv_xml_calendar_header_arrow_apply); +#endif +#if LV_USE_CALENDAR_HEADER_DROPDOWN lv_xml_widget_register("lv_calendar-header_dropdown", lv_xml_calendar_header_dropdown_create, lv_xml_calendar_header_dropdown_apply); +#endif +#endif + +#if LV_USE_QRCODE lv_xml_widget_register("lv_qrcode", lv_xml_qrcode_create, lv_xml_qrcode_apply); +#endif lv_xml_widget_register("lv_obj-style", lv_obj_xml_style_create, lv_obj_xml_style_apply); lv_xml_widget_register("lv_obj-remove_style", lv_obj_xml_remove_style_create, lv_obj_xml_remove_style_apply); diff --git a/src/others/xml/parsers/lv_xml_arc_parser.c b/src/others/xml/parsers/lv_xml_arc_parser.c index 84d0ab850e..af122711f4 100644 --- a/src/others/xml/parsers/lv_xml_arc_parser.c +++ b/src/others/xml/parsers/lv_xml_arc_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_arc_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_ARC #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_arc_parser.h b/src/others/xml/parsers/lv_xml_arc_parser.h index 17d781a2c6..2b8159a95f 100644 --- a/src/others/xml/parsers/lv_xml_arc_parser.h +++ b/src/others/xml/parsers/lv_xml_arc_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_ARC /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_bar_parser.c b/src/others/xml/parsers/lv_xml_bar_parser.c index 9561d6512d..c239676761 100644 --- a/src/others/xml/parsers/lv_xml_bar_parser.c +++ b/src/others/xml/parsers/lv_xml_bar_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_bar_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_BAR #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_bar_parser.h b/src/others/xml/parsers/lv_xml_bar_parser.h index 2459d32e97..5b90576840 100644 --- a/src/others/xml/parsers/lv_xml_bar_parser.h +++ b/src/others/xml/parsers/lv_xml_bar_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_BAR /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_button_parser.c b/src/others/xml/parsers/lv_xml_button_parser.c index 0ab77008bc..0267295a27 100644 --- a/src/others/xml/parsers/lv_xml_button_parser.c +++ b/src/others/xml/parsers/lv_xml_button_parser.c @@ -8,7 +8,7 @@ *********************/ #include "lv_xml_button_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_BUTTON #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_button_parser.h b/src/others/xml/parsers/lv_xml_button_parser.h index d187ce7a87..7fe59bfaf5 100644 --- a/src/others/xml/parsers/lv_xml_button_parser.h +++ b/src/others/xml/parsers/lv_xml_button_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_BUTTON /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_buttonmatrix_parser.c b/src/others/xml/parsers/lv_xml_buttonmatrix_parser.c index b92f631bc8..670afeb3f6 100644 --- a/src/others/xml/parsers/lv_xml_buttonmatrix_parser.c +++ b/src/others/xml/parsers/lv_xml_buttonmatrix_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_buttonmatrix_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_BUTTONMATRIX #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_buttonmatrix_parser.h b/src/others/xml/parsers/lv_xml_buttonmatrix_parser.h index 594ed84ef7..3fc2cff53e 100644 --- a/src/others/xml/parsers/lv_xml_buttonmatrix_parser.h +++ b/src/others/xml/parsers/lv_xml_buttonmatrix_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_BUTTONMATRIX /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_calendar_parser.c b/src/others/xml/parsers/lv_xml_calendar_parser.c index 58d1f2ddc8..d82099cb23 100644 --- a/src/others/xml/parsers/lv_xml_calendar_parser.c +++ b/src/others/xml/parsers/lv_xml_calendar_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_calendar_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_CALENDAR #include "../../../lvgl.h" #include "../../../lvgl_private.h" @@ -63,6 +63,7 @@ void lv_xml_calendar_apply(lv_xml_parser_state_t * state, const char ** attrs) } } +#if LV_USE_CALENDAR_HEADER_DROPDOWN void * lv_xml_calendar_header_dropdown_create(lv_xml_parser_state_t * state, const char ** attrs) { LV_UNUSED(attrs); @@ -74,7 +75,9 @@ void lv_xml_calendar_header_dropdown_apply(lv_xml_parser_state_t * state, const { lv_xml_obj_apply(state, attrs); /*Apply the common properties, e.g. width, height, styles flags etc*/ } +#endif +#if LV_USE_CALENDAR_HEADER_ARROW void * lv_xml_calendar_header_arrow_create(lv_xml_parser_state_t * state, const char ** attrs) { LV_UNUSED(attrs); @@ -87,6 +90,7 @@ void lv_xml_calendar_header_arrow_apply(lv_xml_parser_state_t * state, const cha { lv_xml_obj_apply(state, attrs); /*Apply the common properties, e.g. width, height, styles flags etc*/ } +#endif /********************** diff --git a/src/others/xml/parsers/lv_xml_chart_parser.c b/src/others/xml/parsers/lv_xml_chart_parser.c index df63ee35b2..a17db4088a 100644 --- a/src/others/xml/parsers/lv_xml_chart_parser.c +++ b/src/others/xml/parsers/lv_xml_chart_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_chart_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_CHART #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_chart_parser.h b/src/others/xml/parsers/lv_xml_chart_parser.h index f948456769..970a9a6f88 100644 --- a/src/others/xml/parsers/lv_xml_chart_parser.h +++ b/src/others/xml/parsers/lv_xml_chart_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_CHART /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_dropdown_parser.c b/src/others/xml/parsers/lv_xml_dropdown_parser.c index 153ec25d90..53dcf55eb1 100644 --- a/src/others/xml/parsers/lv_xml_dropdown_parser.c +++ b/src/others/xml/parsers/lv_xml_dropdown_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_dropdown_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_DROPDOWN #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_dropdown_parser.h b/src/others/xml/parsers/lv_xml_dropdown_parser.h index 578952ad80..3b4b7f7e6f 100644 --- a/src/others/xml/parsers/lv_xml_dropdown_parser.h +++ b/src/others/xml/parsers/lv_xml_dropdown_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_DROPDOWN /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_image_parser.c b/src/others/xml/parsers/lv_xml_image_parser.c index 69215b3864..952fa4eb8f 100644 --- a/src/others/xml/parsers/lv_xml_image_parser.c +++ b/src/others/xml/parsers/lv_xml_image_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_image_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_IMAGE #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_image_parser.h b/src/others/xml/parsers/lv_xml_image_parser.h index 19a978a334..356784fdf7 100644 --- a/src/others/xml/parsers/lv_xml_image_parser.h +++ b/src/others/xml/parsers/lv_xml_image_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_IMAGE /********************** * TYPEDEFS @@ -40,4 +40,4 @@ void lv_xml_check_file(const char * filepath); } /*extern "C"*/ #endif -#endif /*LV_XML_IMAGE_PARSER_H*/ \ No newline at end of file +#endif /*LV_XML_IMAGE_PARSER_H*/ diff --git a/src/others/xml/parsers/lv_xml_keyboard_parser.c b/src/others/xml/parsers/lv_xml_keyboard_parser.c index f4ed974b5d..6bb5ceedf4 100644 --- a/src/others/xml/parsers/lv_xml_keyboard_parser.c +++ b/src/others/xml/parsers/lv_xml_keyboard_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_keyboard_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_KEYBOARD #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_keyboard_parser.h b/src/others/xml/parsers/lv_xml_keyboard_parser.h index cfd80f999c..ded8355c05 100644 --- a/src/others/xml/parsers/lv_xml_keyboard_parser.h +++ b/src/others/xml/parsers/lv_xml_keyboard_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_KEYBOARD /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_label_parser.c b/src/others/xml/parsers/lv_xml_label_parser.c index 1d1f8a6fd9..44801ac44c 100644 --- a/src/others/xml/parsers/lv_xml_label_parser.c +++ b/src/others/xml/parsers/lv_xml_label_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_label_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_LABEL #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_label_parser.h b/src/others/xml/parsers/lv_xml_label_parser.h index 9a063021da..35f03976dc 100644 --- a/src/others/xml/parsers/lv_xml_label_parser.h +++ b/src/others/xml/parsers/lv_xml_label_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_LABEL /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_qrcode_parser.c b/src/others/xml/parsers/lv_xml_qrcode_parser.c index f29feb70d7..7de4ceb823 100644 --- a/src/others/xml/parsers/lv_xml_qrcode_parser.c +++ b/src/others/xml/parsers/lv_xml_qrcode_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_qrcode_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_QRCODE #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_qrcode_parser.h b/src/others/xml/parsers/lv_xml_qrcode_parser.h index cef6369543..f1925968dc 100644 --- a/src/others/xml/parsers/lv_xml_qrcode_parser.h +++ b/src/others/xml/parsers/lv_xml_qrcode_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_QRCODE /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_roller_parser.c b/src/others/xml/parsers/lv_xml_roller_parser.c index a9ce2f6591..9a96ad8a6d 100644 --- a/src/others/xml/parsers/lv_xml_roller_parser.c +++ b/src/others/xml/parsers/lv_xml_roller_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_roller_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_ROLLER #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_roller_parser.h b/src/others/xml/parsers/lv_xml_roller_parser.h index accc06ddec..a9f1f76af1 100644 --- a/src/others/xml/parsers/lv_xml_roller_parser.h +++ b/src/others/xml/parsers/lv_xml_roller_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_ROLLER /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_scale_parser.c b/src/others/xml/parsers/lv_xml_scale_parser.c index 6286692ea9..1259ddc6cc 100644 --- a/src/others/xml/parsers/lv_xml_scale_parser.c +++ b/src/others/xml/parsers/lv_xml_scale_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_scale_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_SCALE #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_scale_parser.h b/src/others/xml/parsers/lv_xml_scale_parser.h index 31679e2cde..8a923b2456 100644 --- a/src/others/xml/parsers/lv_xml_scale_parser.h +++ b/src/others/xml/parsers/lv_xml_scale_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_SCALE /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_slider_parser.c b/src/others/xml/parsers/lv_xml_slider_parser.c index 836451834f..b7f055ab8a 100644 --- a/src/others/xml/parsers/lv_xml_slider_parser.c +++ b/src/others/xml/parsers/lv_xml_slider_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_slider_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_SLIDER #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_slider_parser.h b/src/others/xml/parsers/lv_xml_slider_parser.h index 600a3a3547..d2dac45864 100644 --- a/src/others/xml/parsers/lv_xml_slider_parser.h +++ b/src/others/xml/parsers/lv_xml_slider_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_SLIDER /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_spangroup_parser.c b/src/others/xml/parsers/lv_xml_spangroup_parser.c index 8f1c51cc34..923f0626a8 100644 --- a/src/others/xml/parsers/lv_xml_spangroup_parser.c +++ b/src/others/xml/parsers/lv_xml_spangroup_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_spangroup_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_SPAN #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_spangroup_parser.h b/src/others/xml/parsers/lv_xml_spangroup_parser.h index 972c48dcb4..f97c4190ff 100644 --- a/src/others/xml/parsers/lv_xml_spangroup_parser.h +++ b/src/others/xml/parsers/lv_xml_spangroup_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_SPAN /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_table_parser.c b/src/others/xml/parsers/lv_xml_table_parser.c index c275c9d3d6..b405398a11 100644 --- a/src/others/xml/parsers/lv_xml_table_parser.c +++ b/src/others/xml/parsers/lv_xml_table_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_table_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_TABLE #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_table_parser.h b/src/others/xml/parsers/lv_xml_table_parser.h index 9f990d5c49..0b9a4f749a 100644 --- a/src/others/xml/parsers/lv_xml_table_parser.h +++ b/src/others/xml/parsers/lv_xml_table_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_TABLE /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_tabview_parser.c b/src/others/xml/parsers/lv_xml_tabview_parser.c index 4a72146c5d..689b42bf05 100644 --- a/src/others/xml/parsers/lv_xml_tabview_parser.c +++ b/src/others/xml/parsers/lv_xml_tabview_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_tabview_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_TABVIEW #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_tabview_parser.h b/src/others/xml/parsers/lv_xml_tabview_parser.h index a0860db478..bb7fa3f498 100644 --- a/src/others/xml/parsers/lv_xml_tabview_parser.h +++ b/src/others/xml/parsers/lv_xml_tabview_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_TABVIEW /********************** * TYPEDEFS diff --git a/src/others/xml/parsers/lv_xml_textarea_parser.c b/src/others/xml/parsers/lv_xml_textarea_parser.c index 4ce0fbe7a4..22c64ee2a3 100644 --- a/src/others/xml/parsers/lv_xml_textarea_parser.c +++ b/src/others/xml/parsers/lv_xml_textarea_parser.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_xml_textarea_parser.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_TEXTAREA #include "../../../lvgl.h" #include "../../../lvgl_private.h" diff --git a/src/others/xml/parsers/lv_xml_textarea_parser.h b/src/others/xml/parsers/lv_xml_textarea_parser.h index 630696ad4d..f8cf50f579 100644 --- a/src/others/xml/parsers/lv_xml_textarea_parser.h +++ b/src/others/xml/parsers/lv_xml_textarea_parser.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include "../lv_xml.h" -#if LV_USE_XML +#if LV_USE_XML && LV_USE_TEXTAREA /********************** * TYPEDEFS