Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: BSP_DISCO_F746NG
Revision 3:1c9c6f2a7fcf, committed 2020-07-21
- Comitter:
- elelthvd
- Date:
- Tue Jul 21 19:59:09 2020 +0800
- Parent:
- 2:afc050526249
- Commit message:
- Updated to LVGLv7 and Mbed-OSv6
Changed in this revision
diff -r afc050526249 -r 1c9c6f2a7fcf .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Tue Jul 21 19:59:09 2020 +0800 @@ -0,0 +1,6 @@ +^BUILD$ +^.mbed$ +^lvgl$ +^lv_examples$ +^mbed-os$ +^Drivers/BSP_DISCO_F746NG$
diff -r afc050526249 -r 1c9c6f2a7fcf lv_conf.h
--- a/lv_conf.h Tue Apr 07 08:06:45 2020 +0000
+++ b/lv_conf.h Tue Jul 21 19:59:09 2020 +0800
@@ -1,6 +1,6 @@
/**
* @file lv_conf.h
- *
+ * Configuration file for LVGL v7.1.0
*/
/*
@@ -28,11 +28,11 @@
#define LV_VER_RES_MAX (480)
#else
# error Error: You have not set resolution for your board!
-#endif
+#endif
/* Color depth:
* - 1: 1 byte per pixel
- * - 8: RGB233
+ * - 8: RGB332
* - 16: RGB565
* - 32: ARGB8888
*/
@@ -62,6 +62,17 @@
* (Not so important, you can adjust it to modify default sizes and spaces)*/
#define LV_DPI 100 /*[px]*/
+/* The the real width of the display changes some default values:
+ * default object sizes, layout of examples, etc.
+ * According to the width of the display (hor. res. / dpi)
+ * the displays fall in 4 categories.
+ * The 4th is extra large which has no upper limit so not listed here
+ * The upper limit of the categories are set below in 0.1 inch unit.
+ */
+#define LV_DISP_SMALL_LIMIT 30
+#define LV_DISP_MEDIUM_LIMIT 50
+#define LV_DISP_LARGE_LIMIT 70
+
/* Type of coordinates. Should be `int16_t` (or `int32_t` for extreme cases) */
typedef int16_t lv_coord_t;
@@ -116,7 +127,7 @@
#define LV_INDEV_DEF_DRAG_LIMIT 10
/* Drag throw slow-down in [%]. Greater value -> faster slow-down */
-#define LV_INDEV_DEF_DRAG_THROW 20
+#define LV_INDEV_DEF_DRAG_THROW 10
/* Long press time in milliseconds.
* Time to send `LV_EVENT_LONG_PRESSSED`) */
@@ -126,6 +137,13 @@
* Time between `LV_EVENT_LONG_PRESSED_REPEAT */
#define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100
+
+/* Gesture threshold in pixels */
+#define LV_INDEV_DEF_GESTURE_LIMIT 50
+
+/* Gesture min velocity at release before swipe (pixels)*/
+#define LV_INDEV_DEF_GESTURE_MIN_VELOCITY 3
+
/*==================
* Feature usage
*==================*/
@@ -141,6 +159,22 @@
/* 1: Enable shadow drawing*/
#define LV_USE_SHADOW 1
+#if LV_USE_SHADOW
+/* Allow buffering some shadow calculation
+ * LV_SHADOW_CACHE_SIZE is the max. shadow size to buffer,
+ * where shadow size is `shadow_width + radius`
+ * Caching has LV_SHADOW_CACHE_SIZE^2 RAM cost*/
+#define LV_SHADOW_CACHE_SIZE 0
+#endif
+
+/* 1: Use other blend modes than normal (`LV_BLEND_MODE_...`)*/
+#define LV_USE_BLEND_MODES 1
+
+/* 1: Use the `opa_scale` style property to set the opacity of an object and its children at once*/
+#define LV_USE_OPA_SCALE 1
+
+/* 1: Use image zoom and rotation*/
+#define LV_USE_IMG_TRANSFORM 1
/* 1: Enable object groups (for keyboard/encoder navigation) */
#define LV_USE_GROUP 1
@@ -149,7 +183,12 @@
#endif /*LV_USE_GROUP*/
/* 1: Enable GPU interface*/
-#define LV_USE_GPU 1
+#define LV_USE_GPU 1 /*Only enables `gpu_fill_cb` and `gpu_blend_cb` in the disp. drv- */
+#define LV_USE_GPU_STM32_DMA2D 0
+/*If enabling LV_USE_GPU_STM32_DMA2D, LV_GPU_DMA2D_CMSIS_INCLUDE must be defined to include path of CMSIS header of target processor
+e.g. "stm32f769xx.h" or "stm32f429xx.h" */
+#define LV_GPU_DMA2D_CMSIS_INCLUDE "mbed-os/targets/TARGET_STM/TARGET_STM32F7/STM32Cube_FW/CMSIS/stm32f746xx.h"
+
/* 1: Enable file system (might be required for images */
#define LV_USE_FILESYSTEM 1
@@ -161,6 +200,13 @@
/*1: Add a `user_data` to drivers and objects*/
#define LV_USE_USER_DATA 0
+/*1: Show CPU usage and FPS count in the right bottom corner*/
+#define LV_USE_PERF_MONITOR 0
+
+/*1: Use the functions and types from the older API if possible */
+#define LV_USE_API_EXTENSION_V6 1
+#define LV_USE_API_EXTENSION_V7 1
+
/*========================
* Image decoder and cache
*========================*/
@@ -185,12 +231,19 @@
/*=====================
* Compiler settings
*====================*/
+
+/* For big endian systems set to 1 */
+#define LV_BIG_ENDIAN_SYSTEM 0
+
/* Define a custom attribute to `lv_tick_inc` function */
#define LV_ATTRIBUTE_TICK_INC
/* Define a custom attribute to `lv_task_handler` function */
#define LV_ATTRIBUTE_TASK_HANDLER
+/* Define a custom attribute to `lv_disp_flush_ready` function */
+#define LV_ATTRIBUTE_FLUSH_READY
+
/* With size optimization (-Os) the compiler might not align data to
* 4 or 8 byte boundary. This alignment will be explicitly applied where needed.
* E.g. __attribute__((aligned(4))) */
@@ -200,6 +253,22 @@
* font's bitmaps */
#define LV_ATTRIBUTE_LARGE_CONST
+/* Prefix performance critical functions to place them into a faster memory (e.g RAM)
+ * Uses 15-20 kB extra memory */
+#define LV_ATTRIBUTE_FAST_MEM
+
+/* Export integer constant to binding.
+ * This macro is used with constants in the form of LV_<CONST> that
+ * should also appear on lvgl binding API such as Micropython
+ *
+ * The default value just prevents a GCC warning.
+ */
+#define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning
+
+/* Prefix variables that are used in GPU accelerated operations, often these need to be
+ * placed in RAM sections that are DMA accessible */
+#define LV_ATTRIBUTE_DMA
+
/*===================
* HAL settings
*==================*/
@@ -208,8 +277,8 @@
* It removes the need to manually update the tick with `lv_tick_inc`) */
#define LV_TICK_CUSTOM 0
#if LV_TICK_CUSTOM == 1
-#define LV_TICK_CUSTOM_INCLUDE "something.h" /*Header for the sys time function*/
-#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current systime in ms*/
+#define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/
+#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/
#endif /*LV_TICK_CUSTOM*/
typedef void * lv_disp_drv_user_data_t; /*Type of user data in the display driver*/
@@ -232,23 +301,48 @@
# define LV_LOG_LEVEL LV_LOG_LEVEL_WARN
/* 1: Print the log with 'printf';
- * 0: user need to register a callback with `lv_log_register_print`*/
+ * 0: user need to register a callback with `lv_log_register_print_cb`*/
# define LV_LOG_PRINTF 0
#endif /*LV_USE_LOG*/
-/*================
- * THEME USAGE
+/*=================
+ * Debug settings
*================*/
-#define LV_THEME_LIVE_UPDATE 0 /*1: Allow theme switching at run time. Uses 8..10 kB of RAM*/
+
+/* If Debug is enabled LittelvGL validates the parameters of the functions.
+ * If an invalid parameter is found an error log message is printed and
+ * the MCU halts at the error. (`LV_USE_LOG` should be enabled)
+ * If you are debugging the MCU you can pause
+ * the debugger to see exactly where the issue is.
+ *
+ * The behavior of asserts can be overwritten by redefining them here.
+ * E.g. #define LV_ASSERT_MEM(p) <my_assert_code>
+ */
+#define LV_USE_DEBUG 1
+#if LV_USE_DEBUG
+
+/*Check if the parameter is NULL. (Quite fast) */
+#define LV_USE_ASSERT_NULL 1
-#define LV_USE_THEME_TEMPL 0 /*Just for test*/
-#define LV_USE_THEME_DEFAULT 0 /*Built mainly from the built-in styles. Consumes very few RAM*/
-#define LV_USE_THEME_ALIEN 0 /*Dark futuristic theme*/
-#define LV_USE_THEME_NIGHT 0 /*Dark elegant theme*/
-#define LV_USE_THEME_MONO 0 /*Mono color theme for monochrome displays*/
-#define LV_USE_THEME_MATERIAL 0 /*Flat theme with bold colors and light shadows*/
-#define LV_USE_THEME_ZEN 0 /*Peaceful, mainly light theme */
-#define LV_USE_THEME_NEMO 0 /*Water-like theme based on the movie "Finding Nemo"*/
+/*Checks is the memory is successfully allocated or no. (Quite fast)*/
+#define LV_USE_ASSERT_MEM 1
+
+/*Check the integrity of `lv_mem` after critical operations. (Slow)*/
+#define LV_USE_ASSERT_MEM_INTEGRITY 0
+
+/* Check the strings.
+ * Search for NULL, very long strings, invalid characters, and unnatural repetitions. (Slow)
+ * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */
+#define LV_USE_ASSERT_STR 0
+
+/* Check NULL, the object's type and existence (e.g. not deleted). (Quite slow)
+ * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */
+#define LV_USE_ASSERT_OBJ 0
+
+/*Check if the styles are properly initialized. (Fast)*/
+#define LV_USE_ASSERT_STYLE 0
+
+#endif /*LV_USE_DEBUG*/
/*==================
* FONT USAGE
@@ -256,16 +350,37 @@
/* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel.
* The symbols are available via `LV_SYMBOL_...` defines
- * More info about fonts: https://docs.littlevgl.com/#Fonts
- * To create a new font go to: https://littlevgl.com/ttf-font-to-c-array
+ * More info about fonts: https://docs.lvgl.io/v7/en/html/overview/font.html
+ * To create a new font go to: https://lvgl.com/ttf-font-to-c-array
*/
-/* Robot fonts with bpp = 4
- * https://fonts.google.com/specimen/Roboto */
-#define LV_FONT_ROBOTO_12 0
-#define LV_FONT_ROBOTO_16 1
-#define LV_FONT_ROBOTO_22 1
-#define LV_FONT_ROBOTO_28 1
+/* Montserrat fonts with bpp = 4
+ * https://fonts.google.com/specimen/Montserrat */
+#define LV_FONT_MONTSERRAT_12 0
+#define LV_FONT_MONTSERRAT_14 1
+#define LV_FONT_MONTSERRAT_16 0
+#define LV_FONT_MONTSERRAT_18 0
+#define LV_FONT_MONTSERRAT_20 0
+#define LV_FONT_MONTSERRAT_22 0
+#define LV_FONT_MONTSERRAT_24 0
+#define LV_FONT_MONTSERRAT_26 0
+#define LV_FONT_MONTSERRAT_28 0
+#define LV_FONT_MONTSERRAT_30 0
+#define LV_FONT_MONTSERRAT_32 0
+#define LV_FONT_MONTSERRAT_34 0
+#define LV_FONT_MONTSERRAT_36 0
+#define LV_FONT_MONTSERRAT_38 0
+#define LV_FONT_MONTSERRAT_40 0
+#define LV_FONT_MONTSERRAT_42 0
+#define LV_FONT_MONTSERRAT_44 0
+#define LV_FONT_MONTSERRAT_46 0
+#define LV_FONT_MONTSERRAT_48 0
+
+/* Demonstrate special features */
+#define LV_FONT_MONTSERRAT_12_SUBPX 0
+#define LV_FONT_MONTSERRAT_28_COMPRESSED 0 /*bpp = 3*/
+#define LV_FONT_DEJAVU_16_PERSIAN_HEBREW 0 /*Hebrew, Arabic, PErisan letters and all their forms*/
+#define LV_FONT_SIMSUN_16_CJK 0 /*1000 most common CJK radicals*/
/*Pixel perfect monospace font
* http://pelulamu.net/unscii/ */
@@ -279,17 +394,57 @@
*/
#define LV_FONT_CUSTOM_DECLARE
-/*Always set a default font from the built-in fonts*/
-#define LV_FONT_DEFAULT &lv_font_roboto_16
-
/* Enable it if you have fonts with a lot of characters.
* The limit depends on the font size, font face and bpp
* but with > 10,000 characters if you see issues probably you need to enable it.*/
#define LV_FONT_FMT_TXT_LARGE 0
+/* Set the pixel order of the display.
+ * Important only if "subpx fonts" are used.
+ * With "normal" font it doesn't matter.
+ */
+#define LV_FONT_SUBPX_BGR 0
+
/*Declare the type of the user data of fonts (can be e.g. `void *`, `int`, `struct`)*/
typedef void * lv_font_user_data_t;
+/*================
+ * THEME USAGE
+ *================*/
+
+/*Always enable at least on theme*/
+
+/* No theme, you can apply your styles as you need
+ * 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
+ * LV_THEME_MATERIAL_FLAG_DARK: dark theme*/
+ #define LV_USE_THEME_MATERIAL 1
+
+/* Mono-color theme for monochrome displays.
+ * If LV_THEME_DEFAULT_COLOR_PRIMARY is LV_COLOR_BLACK the
+ * texts and borders will be black and the background will be
+ * white. Else the colors are inverted.
+ * No flags. Set LV_THEME_DEFAULT_FLAG 0 */
+ #define LV_USE_THEME_MONO 1
+
+#define LV_THEME_DEFAULT_INCLUDE <stdint.h> /*Include a header for the init. function*/
+#define LV_THEME_DEFAULT_INIT lv_theme_material_init
+#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0x01a2b1)
+#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0x44d1b6)
+#define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_LIGHT
+#define LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_14
+#define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_14
+#define LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_14
+#define LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_14
+
/*=================
* Text settings
*=================*/
@@ -304,14 +459,66 @@
/*Can break (wrap) texts on these chars*/
#define LV_TXT_BREAK_CHARS " ,.;:-_"
+/* If a word is at least this long, will break wherever "prettiest"
+ * To disable, set to a value <= 0 */
+#define LV_TXT_LINE_BREAK_LONG_LEN 0
+
+/* Minimum number of characters in a long word to put on a line before a break.
+ * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */
+#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3
+
+/* Minimum number of characters in a long word to put on a line after a break.
+ * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */
+#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3
+
+/* The control character to use for signalling text recoloring. */
+#define LV_TXT_COLOR_CMD "#"
+
+/* Support bidirectional texts.
+ * Allows mixing Left-to-Right and Right-to-Left texts.
+ * The direction will be processed according to the Unicode Bidirectioanl Algorithm:
+ * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
+#define LV_USE_BIDI 0
+#if LV_USE_BIDI
+/* Set the default direction. Supported values:
+ * `LV_BIDI_DIR_LTR` Left-to-Right
+ * `LV_BIDI_DIR_RTL` Right-to-Left
+ * `LV_BIDI_DIR_AUTO` detect texts base direction */
+#define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO
+#endif
+
+/* Enable Arabic/Persian processing
+ * In these languages characters should be replaced with
+ * an other form based on their position in the text */
+#define LV_USE_ARABIC_PERSIAN_CHARS 0
+
+/*Change the built in (v)snprintf functions*/
+#define LV_SPRINTF_CUSTOM 0
+#if LV_SPRINTF_CUSTOM
+# define LV_SPRINTF_INCLUDE <stdio.h>
+# define lv_snprintf snprintf
+# define lv_vsnprintf vsnprintf
+#else /*!LV_SPRINTF_CUSTOM*/
+# define LV_SPRINTF_DISABLE_FLOAT 1
+#endif /*LV_SPRINTF_CUSTOM*/
+
/*===================
* LV_OBJ SETTINGS
*==================*/
+#if LV_USE_USER_DATA
/*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/
typedef void * lv_obj_user_data_t;
+/*Provide a function to free user data*/
+#define LV_USE_USER_DATA_FREE 0
+#if LV_USE_USER_DATA_FREE
+# define LV_USER_DATA_FREE_INCLUDE "something.h" /*Header for user data free function*/
+/* Function prototype : void user_data_free(lv_obj_t * obj); */
+# define LV_USER_DATA_FREE (user_data_free) /*Invoking for user data free function*/
+#endif
+#endif
-/*1: enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/
+/*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.
@@ -325,7 +532,7 @@
* LV OBJ X USAGE
*================*/
/*
- * Documentation of the object types: https://docs.littlevgl.com/#Object-types
+ * Documentation of the object types: https://docs.lvgl.com/#Object-types
*/
/*Arc (dependencies: -)*/
@@ -336,40 +543,42 @@
/*Button (dependencies: lv_cont*/
#define LV_USE_BTN 1
-#if LV_USE_BTN != 0
-/*Enable button-state animations - draw a circle on click (dependencies: LV_USE_ANIMATION)*/
-# define LV_BTN_INK_EFFECT 0
-#endif
/*Button matrix (dependencies: -)*/
-#define LV_USE_BTNM 1
+#define LV_USE_BTNMATRIX 1
/*Calendar (dependencies: -)*/
#define LV_USE_CALENDAR 1
+#if LV_USE_CALENDAR
+# define LV_CALENDAR_WEEK_STARTS_MONDAY 0
+#endif
/*Canvas (dependencies: lv_img)*/
#define LV_USE_CANVAS 1
/*Check box (dependencies: lv_btn, lv_label)*/
-#define LV_USE_CB 1
+#define LV_USE_CHECKBOX 1
/*Chart (dependencies: -)*/
#define LV_USE_CHART 1
#if LV_USE_CHART
-# define LV_CHART_AXIS_TICK_LABEL_MAX_LEN 20
+# define LV_CHART_AXIS_TICK_LABEL_MAX_LEN 256
#endif
/*Container (dependencies: -*/
#define LV_USE_CONT 1
+/*Color picker (dependencies: -*/
+#define LV_USE_CPICKER 1
+
/*Drop down list (dependencies: lv_page, lv_label, lv_symbol_def.h)*/
-#define LV_USE_DDLIST 1
-#if LV_USE_DDLIST != 0
+#define LV_USE_DROPDOWN 1
+#if LV_USE_DROPDOWN != 0
/*Open and close default animation time [ms] (0: no animation)*/
-# define LV_DDLIST_DEF_ANIM_TIME 200
+# define LV_DROPDOWN_DEF_ANIM_TIME 200
#endif
-/*Gauge (dependencies:lv_bar, lv_lmeter)*/
+/*Gauge (dependencies:lv_bar, lv_linemeter)*/
#define LV_USE_GAUGE 1
/*Image (dependencies: lv_label*/
@@ -383,7 +592,7 @@
#endif
/*Keyboard (dependencies: lv_btnm)*/
-#define LV_USE_KB 1
+#define LV_USE_KEYBOARD 1
/*Label (dependencies: -*/
#define LV_USE_LABEL 1
@@ -403,6 +612,10 @@
/*LED (dependencies: -)*/
#define LV_USE_LED 1
+#if LV_USE_LED
+# define LV_LED_BRIGHT_MIN 120 /*Minimal brightness*/
+# define LV_LED_BRIGHT_MAX 255 /*Maximal brightness*/
+#endif
/*Line (dependencies: -*/
#define LV_USE_LINE 1
@@ -415,10 +628,22 @@
#endif
/*Line meter (dependencies: *;)*/
-#define LV_USE_LMETER 1
+#define LV_USE_LINEMETER 1
+#if LV_USE_LINEMETER
+/* Draw line more precisely at cost of performance.
+ * Useful if there are lot of lines any minor are visible
+ * 0: No extra precision
+ * 1: Some extra precision
+ * 2: Best precision
+ */
+# define LV_LINEMETER_PRECISE 0
+#endif
+
+/*Mask (dependencies: -)*/
+#define LV_USE_OBJMASK 1
/*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/
-#define LV_USE_MBOX 1
+#define LV_USE_MSGBOX 1
/*Page (dependencies: lv_cont)*/
#define LV_USE_PAGE 1
@@ -428,11 +653,11 @@
#endif
/*Preload (dependencies: lv_arc, lv_anim)*/
-#define LV_USE_PRELOAD 1
-#if LV_USE_PRELOAD != 0
-# define LV_PRELOAD_DEF_ARC_LENGTH 60 /*[deg]*/
-# define LV_PRELOAD_DEF_SPIN_TIME 1000 /*[ms]*/
-# define LV_PRELOAD_DEF_ANIM LV_PRELOAD_TYPE_SPINNING_ARC
+#define LV_USE_SPINNER 1
+#if LV_USE_SPINNER != 0
+# define LV_SPINNER_DEF_ARC_LENGTH 60 /*[deg]*/
+# define LV_SPINNER_DEF_SPIN_TIME 1000 /*[ms]*/
+# define LV_SPINNER_DEF_ANIM LV_SPINNER_TYPE_SPINNING_ARC
#endif
/*Roller (dependencies: lv_ddlist)*/
@@ -452,13 +677,13 @@
#define LV_USE_SPINBOX 1
/*Switch (dependencies: lv_slider)*/
-#define LV_USE_SW 1
+#define LV_USE_SWITCH 1
/*Text area (dependencies: lv_label, lv_page)*/
-#define LV_USE_TA 1
-#if LV_USE_TA != 0
-# define LV_TA_DEF_CURSOR_BLINK_TIME 400 /*ms*/
-# define LV_TA_DEF_PWD_SHOW_TIME 1500 /*ms*/
+#define LV_USE_TEXTAREA 1
+#if LV_USE_TEXTAREA != 0
+# define LV_TEXTAREA_DEF_CURSOR_BLINK_TIME 400 /*ms*/
+# define LV_TEXTAREA_DEF_PWD_SHOW_TIME 1500 /*ms*/
#endif
/*Table (dependencies: lv_label)*/
@@ -494,9 +719,6 @@
/*--END OF LV_CONF_H--*/
-/*Be sure every define has a default value*/
-#include "lvgl/src/lv_conf_checker.h"
-
#endif /*LV_CONF_H*/
#endif /*End of "Content enable"*/
diff -r afc050526249 -r 1c9c6f2a7fcf lv_ex_conf.h --- a/lv_ex_conf.h Tue Apr 07 08:06:45 2020 +0000 +++ b/lv_ex_conf.h Tue Jul 21 19:59:09 2020 +0800 @@ -11,48 +11,35 @@ #ifndef LV_EX_CONF_H #define LV_EX_CONF_H + /******************* * GENERAL SETTING *******************/ -#define LV_EX_PRINTF 0 /*Enable printf-ing data*/ +#define LV_EX_PRINTF 0 /*Enable printf-ing data in demoes and examples*/ #define LV_EX_KEYBOARD 0 /*Add PC keyboard support to some examples (`lv_drivers` repository is required)*/ #define LV_EX_MOUSEWHEEL 0 /*Add 'encoder' (mouse wheel) support to some examples (`lv_drivers` repository is required)*/ -/******************* - * TEST USAGE - *******************/ -#define LV_USE_TESTS 0 - -/******************* - * TUTORIAL USAGE - *******************/ -#define LV_USE_TUTORIALS 0 - - /********************* - * APPLICATION USAGE + * DEMO USAGE *********************/ -/* Test the graphical performance of your MCU - * with different settings*/ -#define LV_USE_BENCHMARK 0 - -/*A demo application with Keyboard, Text area, List and Chart - * placed on Tab view */ -#define LV_USE_DEMO 1 -#if LV_USE_DEMO -#define LV_DEMO_WALLPAPER 0 /*Create a wallpaper too*/ -#define LV_DEMO_SLIDE_SHOW 0 /*Automatically switch between tabs*/ +/*Show some widget*/ +#define LV_USE_DEMO_WIDGETS 1 +#if LV_USE_DEMO_WIDGETS +#define LV_DEMO_WIDGETS_SLIDESHOW 0 #endif -/*MCU and memory usage monitoring*/ -#define LV_USE_SYSMON 0 +/*Printer demo, optimized for 800x480*/ +#define LV_USE_DEMO_PRINTER 0 + +/*Demonstrate the usage of encoder and keyboard*/ +#define LV_USE_DEMO_KEYPAD_AND_ENCODER 0 -/*A terminal to display received characters*/ -#define LV_USE_TERMINAL 0 +/*Benchmark your system*/ +#define LV_USE_DEMO_BENCHMARK 0 -/*Touch pad calibration with 4 points*/ -#define LV_USE_TPCAL 0 +/*Stress test for LVGL*/ +#define LV_USE_DEMO_STRESS 0 #endif /*LV_EX_CONF_H*/
diff -r afc050526249 -r 1c9c6f2a7fcf lv_examples.lib --- a/lv_examples.lib Tue Apr 07 08:06:45 2020 +0000 +++ b/lv_examples.lib Tue Jul 21 19:59:09 2020 +0800 @@ -1,1 +1,1 @@ -https://github.com/littlevgl/lv_examples/#85a6d71fe34aff8588a19fa703061434d0edca09 +https://github.com/lvgl/lv_examples.git#028cdf7958d16155a15706231de6e153b26fcab5 \ No newline at end of file
diff -r afc050526249 -r 1c9c6f2a7fcf lvgl.lib --- a/lvgl.lib Tue Apr 07 08:06:45 2020 +0000 +++ b/lvgl.lib Tue Jul 21 19:59:09 2020 +0800 @@ -1,1 +1,1 @@ -https://github.com/littlevgl/lvgl/#9083adb936a51eed98eba9b164ff31e716157de5 +https://github.com/lvgl/lvgl/#557342cc088424c48894e4acffccf40801663ddf \ No newline at end of file
diff -r afc050526249 -r 1c9c6f2a7fcf main.cpp
--- a/main.cpp Tue Apr 07 08:06:45 2020 +0000
+++ b/main.cpp Tue Jul 21 19:59:09 2020 +0800
@@ -3,18 +3,13 @@
#include "lvgl/lvgl.h"
#include "lv_port_disp.h"
#include "lv_port_indev.h"
-#include "demo.h" //Comment/uncomment will switch between LittlevGL demo and Hello word example
-
-#define LVGL_TICK 5 //Time tick value for lvgl in ms (1-10msa)
-#define TICKER_TIME 0.001 * LVGL_TICK //modified to miliseconds
-#define WAIT_TIME 1000 * LVGL_TICK //modified to microseconds
+#include "lv_examples/lv_examples.h"
Ticker ticker; //Ticker for lvgl
//Callback function for lvgl timing.
void lv_ticker_func(){
-
- lv_tick_inc(LVGL_TICK);
+ lv_tick_inc(10);
//Call lv_tick_inc(x) every x milliseconds in a Timer or Task (x should be between 1 and 10).
//It is required for the internal timing of LittlevGL.
lv_task_handler();
@@ -22,82 +17,18 @@
//It will redraw the screen if required, handle input devices etc.
}
-#ifndef DEMO_H
-//lvgl buttons object event handler
-static void event_handler(lv_obj_t * obj, lv_event_t event){
- switch(event) {
- case LV_EVENT_PRESSED:
- printf("Pressed\n");
- break;
-
- case LV_EVENT_SHORT_CLICKED:
- printf("Short clicked\n");
- break;
-
- case LV_EVENT_CLICKED:
- printf("Clicked\n");
- break;
-
- case LV_EVENT_VALUE_CHANGED:
- printf("Toggled\n");
- break;
-
- case LV_EVENT_LONG_PRESSED:
- printf("Long press\n");
- break;
-
- case LV_EVENT_LONG_PRESSED_REPEAT:
- printf("Long press repeat\n");
- break;
-
- case LV_EVENT_RELEASED:
- printf("Released\n");
- break;
- }
-}
-#endif
-
int main()
{
printf("LittlevGL GUI-");
lv_init(); //Initialize the LittlevGL
lv_port_disp_init(); //Initialize diplay
lv_port_indev_init(); //Initialize touchpad
- ticker.attach(callback(&lv_ticker_func),TICKER_TIME); //Attach callback to ticker
-
-#ifndef DEMO_H
- printf("Hello word\n");
- lv_obj_t * label_h = lv_label_create(lv_scr_act(), NULL);
- static lv_style_t st;
- lv_style_copy( &st, &lv_style_plain );
- st.text.font = &lv_font_roboto_28;
- lv_obj_set_style( label_h, &st );
- lv_obj_set_size(label_h, 50, 30);
- lv_label_set_recolor(label_h, true);
- lv_label_set_text(label_h, "#ff0000 Hello word#");
- lv_obj_align(label_h, NULL, LV_ALIGN_IN_TOP_MID, 0, 0);
-
- lv_obj_t * label;
- lv_obj_t * btn1 = lv_btn_create(lv_scr_act(), NULL);
- lv_obj_set_event_cb(btn1, event_handler);
- lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, -40);
- label = lv_label_create(btn1, NULL);
- lv_label_set_text(label, "Button");
- lv_obj_t *btn2 = lv_btn_create(lv_scr_act(), NULL);
- lv_obj_set_event_cb(btn2, event_handler);
- lv_obj_align(btn2, NULL, LV_ALIGN_CENTER, 0, 40);
- lv_btn_set_toggle(btn2, true);
- lv_btn_toggle(btn2);
- lv_btn_set_fit2(btn2, LV_FIT_NONE, LV_FIT_TIGHT);
- label = lv_label_create(btn2, NULL);
- lv_label_set_text(label, "Toggled");
-#else
- printf("Demo\n");
- demo_create(); // Demo from lv_examples
-#endif
+ ticker.attach(callback(&lv_ticker_func), 10ms); //Attach callback to ticker
+
+ lv_demo_widgets();
while(1) {
//do something
- //thread_sleep_for(WAIT_TIME);
+ thread_sleep_for(100);
}
}
diff -r afc050526249 -r 1c9c6f2a7fcf mbed-os.lib --- a/mbed-os.lib Tue Apr 07 08:06:45 2020 +0000 +++ b/mbed-os.lib Tue Jul 21 19:59:09 2020 +0800 @@ -1,1 +1,1 @@ -https://github.com/ARMmbed/mbed-os/#532654ebb31c7bf79601042a6fa976b85532ef47 +https://github.com/ARMmbed/mbed-os/#a2ada74770f043aff3e61e29d164a8e78274fcd4 \ No newline at end of file