From 4ecee47caa5f18a8f85c15ee97893711b218df22 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 19 Jan 2018 15:40:22 +0100 Subject: [PATCH] add dependecy check to some object types --- lv_conf_templ.h | 8 ++++---- lv_draw/lv_draw.c | 4 +++- lv_misc/lv_ufs.c | 4 ++-- lv_objx/lv_img.c | 9 +++++++++ lv_objx/lv_kb.h | 9 +++++++++ lv_objx/lv_roller.h | 5 +++++ lv_objx/lv_slider.h | 5 +++++ lv_objx/lv_sw.c | 5 +++++ 8 files changed, 42 insertions(+), 7 deletions(-) diff --git a/lv_conf_templ.h b/lv_conf_templ.h index 47f10ad24..9add14055 100644 --- a/lv_conf_templ.h +++ b/lv_conf_templ.h @@ -204,10 +204,10 @@ /*Page (dependencies: lv_cont)*/ #define USE_LV_PAGE 1 -/*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/ +/*Window (dependencies: lv_btn, lv_label, lv_img, lv_page)*/ #define USE_LV_WIN 1 -/*Tab (dependencies: lv_page, lv_btnm)*/ +/*Tab view (dependencies: lv_page, lv_btnm)*/ #define USE_LV_TABVIEW 1 #if USE_LV_TABVIEW != 0 #define LV_TABVIEW_ANIM_TIME 300 /*Time of slide animation [ms] (0: no animation)*/ @@ -220,7 +220,7 @@ /*Bar (dependencies: -)*/ #define USE_LV_BAR 1 -/*Line meter (dependencies: *;)*/ +/*Line meter (dependencies: - )*/ #define USE_LV_LMETER 1 /*Gauge (dependencies:bar, lmeter)*/ @@ -232,7 +232,7 @@ /*LED (dependencies: -)*/ #define USE_LV_LED 1 -/*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/ +/*Message box (dependencies: lv_cont, lv_btnm, lv_label)*/ #define USE_LV_MBOX 1 /*Text area (dependencies: lv_label, lv_page)*/ diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c index a8e1e18f8..ede3b3fd4 100644 --- a/lv_draw/lv_draw.c +++ b/lv_draw/lv_draw.c @@ -71,7 +71,9 @@ static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const static void (*map_fp)(const lv_area_t * coords, const lv_area_t * mask, const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale, lv_color_t recolor, lv_opa_t recolor_opa) = lv_vmap; #endif #else -//static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx; +/* px_fp used only by shadow drawing the shadows are not drawn with out VDB + * static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx; + */ static void (*fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rfill; static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa) = lv_rletter; #if USE_LV_IMG diff --git a/lv_misc/lv_ufs.c b/lv_misc/lv_ufs.c index 53d3e0dff..814c061a5 100644 --- a/lv_misc/lv_ufs.c +++ b/lv_misc/lv_ufs.c @@ -7,9 +7,9 @@ /********************* * INCLUDES *********************/ -#include "../../lv_conf.h" -#if USE_LV_FILESYSTEM #include "lv_ufs.h" +#if USE_LV_FILESYSTEM + #include "lv_ll.h" #include #include diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c index ae45fb54d..8cd06c267 100644 --- a/lv_objx/lv_img.c +++ b/lv_objx/lv_img.c @@ -9,6 +9,15 @@ #include "../../lv_conf.h" #if USE_LV_IMG != 0 +/*Testing of dependencies*/ +#if USE_LV_LABEL == 0 +#error "lv_img: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL 1) " +#endif + +#if USE_LV_FILESYSTEM == 0 +#error "lv_img: lv_fs is required. Enable it in lv_conf.h (USE_LV_FILESYSTEM 1) " +#endif + #include "lv_img.h" #include "../lv_draw/lv_draw.h" #include "../lv_themes/lv_theme.h" diff --git a/lv_objx/lv_kb.h b/lv_objx/lv_kb.h index dcf0a8917..08b42f2fc 100644 --- a/lv_objx/lv_kb.h +++ b/lv_objx/lv_kb.h @@ -16,6 +16,15 @@ extern "C" { #include "../../lv_conf.h" #if USE_LV_KB != 0 +/*Testing of dependencies*/ +#if USE_LV_BTNM == 0 +#error "lv_kb: lv_btnm is required. Enable it in lv_conf.h (USE_LV_BTNM 1) " +#endif + +#if USE_LV_TA == 0 +#error "lv_kb: lv_ta is required. Enable it in lv_conf.h (USE_LV_TA 1) " +#endif + #include "../lv_core/lv_obj.h" #include "lv_btnm.h" diff --git a/lv_objx/lv_roller.h b/lv_objx/lv_roller.h index f970bbfbe..cb21fcab8 100644 --- a/lv_objx/lv_roller.h +++ b/lv_objx/lv_roller.h @@ -16,6 +16,11 @@ extern "C" { #include "../../lv_conf.h" #if USE_LV_ROLLER != 0 +/*Testing of dependencies*/ +#if USE_LV_DDLIST == 0 +#error "lv_roller: lv_ddlist is required. Enable it in lv_conf.h (USE_LV_DDLIST 1) " +#endif + #include "../lv_core/lv_obj.h" #include "lv_ddlist.h" diff --git a/lv_objx/lv_slider.h b/lv_objx/lv_slider.h index d045cf958..3b49e3797 100644 --- a/lv_objx/lv_slider.h +++ b/lv_objx/lv_slider.h @@ -16,6 +16,11 @@ extern "C" { #include "../../lv_conf.h" #if USE_LV_SLIDER != 0 +/*Testing of dependencies*/ +#if USE_LV_BAR == 0 +#error "lv_slider: lv_bar is required. Enable it in lv_conf.h (USE_LV_BAR 1) " +#endif + #include "../lv_core/lv_obj.h" #include "lv_bar.h" diff --git a/lv_objx/lv_sw.c b/lv_objx/lv_sw.c index 88ca97259..1bc336616 100644 --- a/lv_objx/lv_sw.c +++ b/lv_objx/lv_sw.c @@ -9,6 +9,11 @@ #include "../../lv_conf.h" #if USE_LV_SW != 0 +/*Testing of dependencies*/ +#if USE_LV_SLIDER == 0 +#error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER 1) " +#endif + #include "lv_sw.h" #include "../lv_themes/lv_theme.h"