diff --git a/lv_conf_template.h b/lv_conf_template.h index ccb01f402..5f27e7c69 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -20,8 +20,8 @@ *====================*/ /* Maximal horizontal and vertical resolution to support by the library.*/ -#define LV_HOR_RES_MAX (480) -#define LV_VER_RES_MAX (320) +#define LV_HOR_RES_DEF (480) +#define LV_VER_RES_DEF (320) /* Color depth: * - 1: 1 byte per pixel @@ -453,10 +453,6 @@ typedef void * lv_font_user_data_t; * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ #define LV_USE_THEME_EMPTY 1 -/*Simple to the create your theme based on it - * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ -#define LV_USE_THEME_TEMPLATE 1 - /* A fast and impressive theme. * Flags: * LV_THEME_MATERIAL_FLAG_LIGHT: light theme @@ -556,9 +552,6 @@ typedef void * lv_obj_user_data_t; #endif #endif -/*1: enable `lv_obj_realign()` based on `lv_obj_align()` parameters*/ -#define LV_USE_OBJ_REALIGN 1 - /* Enable to make the object clickable on a larger area. * LV_EXT_CLICK_AREA_OFF or 0: Disable this feature * LV_EXT_CLICK_AREA_TINY: The extra area can be adjusted horizontally and vertically (0..255 px) @@ -636,6 +629,9 @@ typedef void * lv_obj_user_data_t; /*Line (dependencies: -*/ #define LV_USE_LINE 1 +/*Linemeter (dependencies: -*/ +#define LV_USE_LINEMETER 1 + /*Mask (dependencies: -)*/ #define LV_USE_OBJMASK 1 diff --git a/src/lv_api_map.h b/src/lv_api_map.h index ab0d019b9..b0b6d4eb3 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -27,42 +27,14 @@ extern "C" { * GLOBAL PROTOTYPES **********************/ -/*--------------------- - * V7.0 COMPATIBILITY - *--------------------*/ -#if LV_USE_API_EXTENSION_V7 - -#if LV_USE_CHART -static inline void lv_chart_set_range(lv_obj_t * chart, lv_coord_t ymin, lv_coord_t ymax) -{ - lv_chart_set_y_range(chart, LV_CHART_AXIS_PRIMARY_Y, ymin, ymax); -} - - -static inline void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * series) -{ - lv_chart_clear_series(chart, series); -} - +#ifndef LV_HOR_RES_MAX +# define LV_HOR_RES_MAX LV_HOR_RES_DEF #endif -static inline void lv_obj_align_origo(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_ofs, - lv_coord_t y_ofs) -{ -// lv_obj_align_mid(obj, base, align, x_ofs, y_ofs); -} +#ifndef LV_VER_RES_MAX +# define LV_VER_RES_MAX LV_VER_RES_DEF +#endif -static inline void lv_obj_align_origo_x(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_ofs) -{ -// lv_obj_align_mid_y(obj, base, align, x_ofs); -} - -static inline void lv_obj_align_origo_y(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t y_ofs) -{ -// lv_obj_align_mid_y(obj, base, align, y_ofs); -} - -#endif /*LV_USE_API_EXTENSION_V6*/ /********************** * MACROS **********************/