From 99a0f24211cc569aef207ef983347fe79d934a2f Mon Sep 17 00:00:00 2001 From: Igor Janjatovic Date: Sun, 13 Jun 2021 12:49:14 +0200 Subject: [PATCH] use examples project at v7.11.0 --- lv_conf.h | 2 +- lv_ex_conf.h | 14 ++++++++++++++ lv_examples | 2 +- main/src/main.c | 5 +++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lv_conf.h b/lv_conf.h index ec3518c..bd2b724 100644 --- a/lv_conf.h +++ b/lv_conf.h @@ -382,7 +382,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i /* Montserrat fonts with bpp = 4 * https://fonts.google.com/specimen/Montserrat */ #define LV_FONT_MONTSERRAT_8 0 -#define LV_FONT_MONTSERRAT_10 0 +#define LV_FONT_MONTSERRAT_10 1 #define LV_FONT_MONTSERRAT_12 1 #define LV_FONT_MONTSERRAT_14 1 #define LV_FONT_MONTSERRAT_16 1 diff --git a/lv_ex_conf.h b/lv_ex_conf.h index 2af3a1e..cbd1164 100644 --- a/lv_ex_conf.h +++ b/lv_ex_conf.h @@ -1,7 +1,13 @@ /** * @file lv_ex_conf.h + * Configuration file for v7.11.0 * */ +/* + * COPY THIS FILE AS lv_ex_conf.h + */ + +#if 1 /*Set it to "1" to enable the content*/ #ifndef LV_EX_CONF_H #define LV_EX_CONF_H @@ -35,5 +41,13 @@ /*Stress test for LVGL*/ #define LV_USE_DEMO_STRESS 1 +/*Music player for LVGL*/ +#define LV_USE_DEMO_MUSIC 1 +#if LV_USE_DEMO_MUSIC +#define LV_DEMO_MUSIC_AUTO_PLAY 0 +#endif + #endif /*LV_EX_CONF_H*/ +#endif /*End of "Content enable"*/ + diff --git a/lv_examples b/lv_examples index 8aa74f4..5f68537 160000 --- a/lv_examples +++ b/lv_examples @@ -1 +1 @@ -Subproject commit 8aa74f493bac82a3078ebc98e4139b0eabd34e81 +Subproject commit 5f685373743f6999a5b6c0f2782767f2815e151b diff --git a/main/src/main.c b/main/src/main.c index 10c949c..278d7dc 100644 --- a/main/src/main.c +++ b/main/src/main.c @@ -58,7 +58,12 @@ int main(int argc, char **argv) hal_init(); lv_demo_widgets(); + /* For printer demo set resolution to 800x480 */ // lv_demo_printer(); +// lv_demo_keypad_encoder(); +// lv_demo_benchmark(); +// lv_demo_stress(); +// lv_demo_music(); while (1) { /* Periodically call the lv_task handler.