diff --git a/lv_conf_templ.h b/lv_conf_templ.h index c4cf59cbe..a0cc5bdf8 100644 --- a/lv_conf_templ.h +++ b/lv_conf_templ.h @@ -5,6 +5,14 @@ #if 0 /*Remove this to enable the content (Delete the last #endif too!)*/ +#ifndef LV_CONF_H +#define LV_CONF_H +/** + * @file lv_conf.h + * + */ + + #ifndef LV_CONF_H #define LV_CONF_H @@ -14,45 +22,58 @@ /* Horizontal and vertical resolution of the library. * Screen resolution multiplied by LV_DOWN_SCALE*/ -#define LV_HOR_RES (320 << LV_ANTIALIAS) -#define LV_VER_RES (240 << LV_ANTIALIAS) -#define LV_DPI (80 << LV_ANTIALIAS) -/* Enable anti-aliasing - * If enabled everything will half-sized - * Use LV_DOWNSCALE to compensate he down scaling effect of anti-aliasing*/ -#define LV_ANTIALIAS 1 -#define LV_DOWNSCALE (1 << LV_ANTIALIAS) /*Set the downscaling value*/ +#define LV_HOR_RES (480 << LV_ANTIALIAS) +#define LV_VER_RES (320 << LV_ANTIALIAS) +#define LV_DPI (100 << LV_ANTIALIAS) /* Buffered rendering: >= LV_DOWNSCALE * LV_HOR_RES or 0 to disable buffering*/ -#define LV_VDB_SIZE (LV_HOR_RES * LV_VER_RES / 20) -#if LV_VDB_SIZE -/* Double virtual buffering - * One for rendering another to transfer former rendered image to frame buffer in the background*/ -#define LV_VDB_DOUBLE 0 -#endif +#define LV_VDB_SIZE (20 * LV_VER_RES) + +/* Enable anti aliasing + * If enabled everything will be rendered in double size and filtered to normal size */ +#define LV_ANTIALIAS 1 -#define LV_REFR_PERIOD 40 /*Screen refresh period in milliseconds*/ -#define LV_INV_FIFO_SIZE 32 /*The average number of objects on a screen */ /*================= Misc. setting *=================*/ -/*Display Input settings*/ -#define LV_INDEV_READ_PERIOD 50 /*Input device read period milliseconds*/ -#define LV_INDEV_TP_MARKER 0 /*Mark the pressed points (Value means marker point size)*/ -#define LV_INDEV_DRAG_LIMIT (10 << LV_ANTIALIAS) /*Drag threshold in pixels */ -#define LV_INDEV_DRAG_THROW 20 /*Drag throw slow-down in [%]. Greater value means faster slow-down */ -#define LV_INDEV_LONG_PRESS_TIME 400 /*Long press time in milliseconds*/ -#define LV_INDEV_LONG_PRESS_REP_TIME 100 /*Repeated trigger period in long press [ms] */ + +/*Screen refresh settings*/ +#define LV_REFR_PERIOD 50 /*Screen refresh period in milliseconds*/ +#define LV_INV_FIFO_SIZE 32 /*The average number of objects on a screen */ + +/*Input device settings*/ +#define LV_INDEV_READ_PERIOD 50 /*Input device read period milliseconds*/ +#define LV_INDEV_POINT_MARKER 0 /*Mark the pressed points*/ +#define LV_INDEV_DRAG_LIMIT (10 << LV_ANTIALIAS) /*Drag threshold in pixels */ +#define LV_INDEV_DRAG_THROW 20 /*Drag throw slow-down in [%]. Greater value means faster slow-down */ +#define LV_INDEV_LONG_PRESS_TIME 400 /*Long press time in milliseconds*/ +#define LV_INDEV_LONG_PRESS_REP_TIME 100 /*Repeated trigger period in long press [ms] */ /*lv_obj (base object) settings*/ -#define LV_OBJ_FREE_NUM 1 /*Enable the free number attribute*/ -#define LV_OBJ_FREE_P 1 /*Enable the free pointer attribute*/ -#define LV_OBJ_GROUP 1 /*Enable object groups*/ +#define LV_OBJ_FREE_NUM_TYPE uint32_t /*Type of free number attribute (comment out disable free number)*/ +#define LV_OBJ_FREE_PTR 1 /*Enable the free pointer attribute*/ +#define LV_OBJ_GROUP 1 /*Enable object groups*/ /*Others*/ -#define LV_COLOR_TRANSP COLOR_LIME /*This could mean transparent pixel*/ -#define USE_LV_EXAMPLE 1 /*Enable examples (lvgl/lv_examples/). Disable to save memory*/ +#define LV_COLOR_TRANSP COLOR_LIME /*Images pixels with this color will not be drawn*/ +#define LV_FONT_DEFAULT &font_dejavu_40 /*Always set a default font from the built-in fonts*/ + +/*================== + * IMAGE USAGE + * ================*/ +#define LV_IMAGE_ENABLE_ALL 1 /*Unconditionally enable all image maps*/ +//#define USE_IMG_XYZ 1 /*Enable or disable to compile you image map files*/ + +/*================== + * THEME USAGE + * ================*/ +#define USE_LV_THEME_TEMPL 1 /*Just for test*/ +#define USE_LV_THEME_DEFAULT 1 /*Built manly from the built-in styles. Consumes very few RAM*/ +#define USE_LV_THEME_ALIEN 1 /*Dark futuristic theme*/ +#define USE_LV_THEME_MATERIAL 1 /*Flat theme with bold colors and light shadows (Planned)*/ +#define USE_LV_THEME_ZEN 1 /*Peaceful, mainly black and white theme (Planned)*/ +#define USE_LV_THEME_NIGHT 1 /*Dark elegant theme (Planned)*/ /*================== * LV OBJ X USAGE @@ -65,24 +86,11 @@ /*Label (dependencies: -*/ #define USE_LV_LABEL 1 #if USE_LV_LABEL != 0 -#define LV_LABEL_SCROLL_SPEED (25 << LV_ANTIALIAS) /*Hor, or ver. scroll speed (px/sec) in 'LV_LABEL_LONG_SCROLL' mode*/ -#define LV_LABEL_SCROLL_SPEED_VER (10 << LV_ANTIALIAS) /*Ver. scroll speed if hor. scroll is applied too*/ -#define LV_LABEL_SCROLL_PLAYBACK_PAUSE 500 /*Wait before the scroll turns back in ms*/ -#define LV_LABEL_SCROLL_REPEAT_PAUSE 500 /*Wait before the scroll begins again in ms*/ +#define LV_LABEL_SCROLL_SPEED (25 << LV_ANTIALIAS) /*Hor, or ver. scroll speed (px/sec) in 'LV_LABEL_LONG_SCROLL/ROLL' mode*/ #endif /*Image (dependencies: lv_label (if symbols are enabled) from misc: FSINT, UFS)*/ #define USE_LV_IMG 1 -#if USE_LV_IMG != 0 -//#define LV_IMG_DEF_WALLPAPER img_square_x1 /*Comment this line to NOT use wallpaper*/ -/* 1: enables to interpret the file names as symbol name - * from symbol_def.h if they begin with a lower case letter. - * (driver letters are always upper case)*/ -#define LV_IMG_ENABLE_SYMBOLS 1 -#if LV_IMG_ENABLE_SYMBOLS != 0 -#define LV_IMG_DEF_SYMBOL_FONT FONT_SYMBOL_30 -#endif /*LV_IMG_ENABLE_SYMBOLS*/ -#endif /*USE_LV_IMG*/ /*Line (dependencies: -*/ #define USE_LV_LINE 1 @@ -111,16 +119,13 @@ *************************/ /*Bar (dependencies: -)*/ -#define USE_LV_BAR 1 +#define USE_LV_BAR 1 /*Line meter (dependencies: bar; misc: trigo)*/ #define USE_LV_LMETER 1 /*Gauge (dependencies:bar, lmeter; misc: trigo)*/ #define USE_LV_GAUGE 1 -#if USE_LV_GAUGE != 0 -#define LV_GAUGE_MAX_NEEDLE 4 /*Max number of needles. Used in the style.*/ -#endif /*Chart (dependencies: -)*/ #define USE_LV_CHART 1 @@ -128,13 +133,13 @@ /*LED (dependencies: -)*/ #define USE_LV_LED 1 -/*Message box (dependencies: lv_rect, lv_btn, lv_label)*/ +/*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/ #define USE_LV_MBOX 1 /*Text area (dependencies: lv_label, lv_page)*/ #define USE_LV_TA 1 #if USE_LV_TA != 0 -#define LV_TA_CUR_BLINK_TIME 400 /*ms*/ +#define LV_TA_CURSOR_BLINK_TIME 400 /*ms*/ #define LV_TA_PWD_SHOW_TIME 1500 /*ms*/ #endif @@ -149,7 +154,7 @@ #define USE_LV_BTNM 1 /*Keyboard (dependencies: lv_btnm)*/ -#define USE_LV_KB 1 +#define USE_LV_KB 1 /*Check box (dependencies: lv_btn, lv_label)*/ #define USE_LV_CB 1 @@ -157,14 +162,20 @@ /*Switch (dependencies: lv_slider)*/ #define USE_LV_SW 1 -/*List (dependencies: lv_page, lv_btn, lv_label, lv_img)*/ +/*List (dependencies: lv_page, lv_btn, lv_label, (lv_img optionally for icons ))*/ #define USE_LV_LIST 1 #if USE_LV_LIST != 0 -#define LV_LIST_FOCUS_TIME 100 /*Animation time of focusing to the a list element [ms] (0: no animation) */ +#define LV_LIST_FOCUS_TIME 100 /*Default animation time of focusing to a list element [ms] (0: no animation) */ #endif /*Drop down list (dependencies: lv_page, lv_label)*/ #define USE_LV_DDLIST 1 +#if USE_LV_DDLIST != 0 +#define LV_DDLIST_DEF_ANIM_TIME 200 /*Open and close default animation time [ms] (0: no animation)*/ +#endif + +/*Drop down list (dependencies: lv_ddlist)*/ +#define USE_LV_ROLLER 1 /*Slider (dependencies: lv_bar)*/ #define USE_LV_SLIDER 1 diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c index c8b8a5da4..a0dc26862 100644 --- a/lv_objx/lv_ddlist.c +++ b/lv_objx/lv_ddlist.c @@ -21,7 +21,7 @@ /********************* * DEFINES *********************/ -#define LV_DDLIST_DEF_ANIM_TIME 200 /*ms*/ +#define LV_DDLIST_DEF_ANIM_TIME 200 /*ms*/ /********************** * TYPEDEFS diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c index 2206d66d1..e7fa22957 100644 --- a/lv_objx/lv_mbox.c +++ b/lv_objx/lv_mbox.c @@ -77,7 +77,7 @@ lv_obj_t * lv_mbox_create(lv_obj_t * par, lv_obj_t * copy) lv_cont_set_layout(new_mbox, LV_LAYOUT_COL_M); lv_cont_set_fit(new_mbox, false, true); - lv_obj_set_width(new_mbox, LV_HOR_RES / 3); + lv_obj_set_width(new_mbox, LV_HOR_RES / 2); lv_obj_align(new_mbox, NULL, LV_ALIGN_CENTER, 0, 0); /*Set the default styles*/ diff --git a/lvgl.h b/lvgl.h index a833e3eab..ff3a325f6 100644 --- a/lvgl.h +++ b/lvgl.h @@ -86,4 +86,8 @@ extern "C" { * MACROS **********************/ +#ifdef __cplusplus +} #endif + +#endif /*LVGL_H*/