diff --git a/board/STM32F746NGH6_discovery/KEIL/lvgl_demo/STM32F746NGH6.uvoptx b/board/STM32F746NGH6_discovery/KEIL/lvgl_demo/STM32F746NGH6.uvoptx
index 08e63e25..eabf714b 100644
--- a/board/STM32F746NGH6_discovery/KEIL/lvgl_demo/STM32F746NGH6.uvoptx
+++ b/board/STM32F746NGH6_discovery/KEIL/lvgl_demo/STM32F746NGH6.uvoptx
@@ -125,7 +125,7 @@
0
ST-LINKIII-KEIL_SWO
- -U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F7x_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F746NGHx$CMSIS\Flash\STM32F7x_1024.FLM) -FF1STM32F7x_TCM -FS1200000 -FL1100000 -FP1($$Device:STM32F746NG$Flash\STM32F7x_TCM.FLM)
+ -U066CFF505356867767075530 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN2 -FF0STM32F7x_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F746NGHx$CMSIS\Flash\STM32F7x_1024.FLM) -FF1STM32F7x_TCM.FLM -FS1200000 -FL1100000 -FP1($$Device:STM32F746NG$Flash\STM32F7x_TCM.FLM)
@@ -283,7 +283,7 @@
examples
- 0
+ 1
0
0
0
diff --git a/board/STM32F746NGH6_discovery/KEIL/lvgl_demo/STM32F746NGH6.uvprojx b/board/STM32F746NGH6_discovery/KEIL/lvgl_demo/STM32F746NGH6.uvprojx
index 100d4bce..b3e5bc6c 100644
--- a/board/STM32F746NGH6_discovery/KEIL/lvgl_demo/STM32F746NGH6.uvprojx
+++ b/board/STM32F746NGH6_discovery/KEIL/lvgl_demo/STM32F746NGH6.uvprojx
@@ -338,7 +338,7 @@
USE_HAL_DRIVER,STM32F746xx,USE_HAL_DRIVER,STM32F746xx
- ..\..\BSP\Inc;..\..\..\..\platform\vendor_bsp\st\STM32F7xx_HAL_Driver\Inc;..\..\..\..\platform\vendor_bsp\st\STM32F7xx_HAL_Driver\Inc\Legacy;..\..\..\..\platform\vendor_bsp\st\CMSIS\Device\ST\STM32F7xx\Include;..\..\..\..\platform\vendor_bsp\st\CMSIS\Include;..\..\..\..\arch\arm\arm-v7m\common\include;..\..\..\..\arch\arm\arm-v7m\cortex-m7\armcc;..\..\..\..\kernel\core\include;..\..\..\..\kernel\pm\include;..\..\..\..\osal\cmsis_os;..\..\TOS_CONFIG;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_core;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_draw;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_font;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_hal;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_misc;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_objx;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_themes;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src;..\..\..\..\components\gui\LittlevGL\3rdparty;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples\lv_apps\demo;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples\lv_tests\lv_test_theme;..\..\BSP\Utilities\STM32746G-Discovery;..\..\BSP\hal_stm_lvgl\tft;..\..\BSP\hal_stm_lvgl\touchpad;..\..\BSP\Utilities\Components\ft5336
+ ..\..\BSP\Inc;..\..\..\..\platform\vendor_bsp\st\STM32F7xx_HAL_Driver\Inc;..\..\..\..\platform\vendor_bsp\st\STM32F7xx_HAL_Driver\Inc\Legacy;..\..\..\..\platform\vendor_bsp\st\CMSIS\Device\ST\STM32F7xx\Include;..\..\..\..\platform\vendor_bsp\st\CMSIS\Include;..\..\..\..\arch\arm\arm-v7m\common\include;..\..\..\..\arch\arm\arm-v7m\cortex-m7\armcc;..\..\..\..\kernel\core\include;..\..\..\..\kernel\pm\include;..\..\..\..\osal\cmsis_os;..\..\TOS_CONFIG;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_core;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_draw;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_font;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_hal;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_misc;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_objx;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src\lv_themes;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl;..\..\..\..\components\gui\LittlevGL\3rdparty\lvgl\src;..\..\..\..\components\gui\LittlevGL\3rdparty;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples\lv_apps\demo;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples\lv_tests\lv_test_theme;..\..\BSP\Utilities\STM32746G-Discovery;..\..\BSP\hal_stm_lvgl\tft;..\..\BSP\hal_stm_lvgl\touchpad;..\..\BSP\Utilities\Components\ft5336;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples\lv_apps\benchmark;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples\lv_apps\sysmon;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples\lv_apps\terminal;..\..\..\..\components\gui\LittlevGL\3rdparty\lv_examples\lv_apps\tpcal
diff --git a/components/gui/LittlevGL/3rdparty/lv_ex_conf.h b/components/gui/LittlevGL/3rdparty/lv_ex_conf.h
index bd6f0b4d..d1ba3b20 100644
--- a/components/gui/LittlevGL/3rdparty/lv_ex_conf.h
+++ b/components/gui/LittlevGL/3rdparty/lv_ex_conf.h
@@ -21,7 +21,7 @@
/*******************
* TEST USAGE
*******************/
-#define LV_USE_TESTS 0
+#define LV_USE_TESTS 1
/*******************
* TUTORIAL USAGE
@@ -35,7 +35,7 @@
/* Test the graphical performance of your MCU
* with different settings*/
-#define LV_USE_BENCHMARK 0
+#define LV_USE_BENCHMARK 1
/*A demo application with Keyboard, Text area, List and Chart
* placed on Tab view */
@@ -46,13 +46,13 @@
#endif
/*MCU and memory usage monitoring*/
-#define LV_USE_SYSMON 0
+#define LV_USE_SYSMON 1
/*A terminal to display received characters*/
-#define LV_USE_TERMINAL 0
+#define LV_USE_TERMINAL 1
/*Touch pad calibration with 4 points*/
-#define LV_USE_TPCAL 0
+#define LV_USE_TPCAL 1
#endif /*LV_EX_CONF_H*/
diff --git a/examples/lvgl_gui_demo/lvgl_demo.c b/examples/lvgl_gui_demo/lvgl_demo.c
index 62808074..9de0ad01 100644
--- a/examples/lvgl_gui_demo/lvgl_demo.c
+++ b/examples/lvgl_gui_demo/lvgl_demo.c
@@ -3,6 +3,14 @@
#include "tft.h"
#include "touchpad.h"
#include "lv_examples/lv_apps/demo/demo.h"
+#include "lv_theme.h"
+#include "lv_hal_disp.h"
+#include "lv_test_theme_1.h"
+#include "lv_test_theme_2.h"
+#include "sysmon.h"
+#include "benchmark.h"
+#include "terminal.h"
+#include "tpcal.h"
void application_entry(void *arg)
{
@@ -14,8 +22,17 @@ void application_entry(void *arg)
lv_init();
tft_init();
touchpad_init();
+
+ //benchmark_create();
+ //sysmon_create();
+ //terminal_create();
+ //tpcal_create();
+ //demo_create();
+
+ //lv_theme_t *th = lv_theme_alien_init(21, NULL);
+ //lv_test_theme_1(th);
+ lv_test_theme_2();
- demo_create();
while (1)
{
tos_task_delay(5);