diff --git a/bsp/stm32f429-disco/.config b/bsp/stm32f429-disco/.config index 4123e8acf8ab5d4368d930447bd80738dd0da66b..cfb4a30f16b2bb45b84a10bb3733a4ab1ed59c66 100644 --- a/bsp/stm32f429-disco/.config +++ b/bsp/stm32f429-disco/.config @@ -250,23 +250,9 @@ CONFIG_RT_USING_PIN=y # # system packages # -CONFIG_PKG_USING_GUIENGINE=y -CONFIG_PKG_GUIENGINE_PATH="/packages/system/gui_engine" +# CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_GUIENGINE_V200 is not set -CONFIG_PKG_USING_GUIENGINE_LATEST_VERSION=y -CONFIG_PKG_GUIENGINE_VER="latest" -CONFIG_GUIENGINE_NAME_MAX=16 -# CONFIG_GUIENGINE_USING_TTF is not set -# CONFIG_GUIENG_USING_FNT_FILE is not set -CONFIG_GUIENGINE_USING_FONT16=y -CONFIG_GUIENGINE_USING_FONT12=y -# CONFIG_GUIENGINE_USING_FONTHZ is not set -# CONFIG_GUIENGINE_IMAGE_XPM is not set -# CONFIG_GUIENGINE_USING_JPG is not set -# CONFIG_GUIENGINE_USING_PNG is not set -# CONFIG_GUIENGINE_IMAGE_BMP is not set -CONFIG_GUIENGINE_IMAGE_CONTAINER=y -CONFIG_GUIENGINE_USING_DEMO=y +# CONFIG_PKG_USING_GUIENGINE_LATEST_VERSION is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set # CONFIG_PKG_USING_LWEXT4 is not set diff --git a/bsp/stm32f429-disco/drivers/board.c b/bsp/stm32f429-disco/drivers/board.c index 2fe4fb7c7343b8e41cb94ebe9d840ad589f03c20..2592f7964b4e807f328ed952e6e5e0b73c400ade 100644 --- a/bsp/stm32f429-disco/drivers/board.c +++ b/bsp/stm32f429-disco/drivers/board.c @@ -138,8 +138,10 @@ void HAL_Delay(__IO uint32_t Delay) */ void rt_hw_board_init() { - rt_device_t lcd; - +#ifdef PKG_USING_GUIENGINE + rt_device_t lcd; +#endif + HAL_Init(); SystemClock_Config(); @@ -154,8 +156,8 @@ void rt_hw_board_init() rt_console_set_device(CONSOLE_DEVICE); #endif -#ifdef RT_USING_CONSOLE - lcd = rt_device_find("lcd"); +#ifdef PKG_USING_GUIENGINE + lcd = rt_device_find("lcd"); rtgui_graphic_set_device(lcd); #endif diff --git a/bsp/stm32f429-disco/project.uvproj b/bsp/stm32f429-disco/project.uvproj index e59d7d643ec1776598d082e853115377cb83b585..00d5d63c7c08cd7f71b4ca3ad74aa9f9a87cd7af 100644 --- a/bsp/stm32f429-disco/project.uvproj +++ b/bsp/stm32f429-disco/project.uvproj @@ -359,7 +359,7 @@ USE_HAL_DRIVER, STM32F429xx - applications;.;drivers;Libraries\STM32F4xx_HAL_Driver\Inc;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;packages\gui_engine-latest\include;packages\gui_engine-latest\src;packages\gui_engine-latest\example;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh + applications;.;drivers;Libraries\STM32F4xx_HAL_Driver\Inc;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh @@ -947,320 +947,6 @@ - - GuiEngine - - - asc12font.c - 1 - packages\gui_engine-latest\src\asc12font.c - - - - - asc16font.c - 1 - packages\gui_engine-latest\src\asc16font.c - - - - - blit.c - 1 - packages\gui_engine-latest\src\blit.c - - - - - box.c - 1 - packages\gui_engine-latest\src\box.c - - - - - color.c - 1 - packages\gui_engine-latest\src\color.c - - - - - container.c - 1 - packages\gui_engine-latest\src\container.c - - - - - dc.c - 1 - packages\gui_engine-latest\src\dc.c - - - - - dc_blend.c - 1 - packages\gui_engine-latest\src\dc_blend.c - - - - - dc_buffer.c - 1 - packages\gui_engine-latest\src\dc_buffer.c - - - - - dc_client.c - 1 - packages\gui_engine-latest\src\dc_client.c - - - - - dc_hw.c - 1 - packages\gui_engine-latest\src\dc_hw.c - - - - - dc_rotozoom.c - 1 - packages\gui_engine-latest\src\dc_rotozoom.c - - - - - dc_trans.c - 1 - packages\gui_engine-latest\src\dc_trans.c - - - - - filerw.c - 1 - packages\gui_engine-latest\src\filerw.c - - - - - font.c - 1 - packages\gui_engine-latest\src\font.c - - - - - font_bmp.c - 1 - packages\gui_engine-latest\src\font_bmp.c - - - - - font_fnt.c - 1 - packages\gui_engine-latest\src\font_fnt.c - - - - - font_freetype.c - 1 - packages\gui_engine-latest\src\font_freetype.c - - - - - font_hz_bmp.c - 1 - packages\gui_engine-latest\src\font_hz_bmp.c - - - - - font_hz_file.c - 1 - packages\gui_engine-latest\src\font_hz_file.c - - - - - gb2312.c - 1 - packages\gui_engine-latest\src\gb2312.c - - - - - hz12font.c - 1 - packages\gui_engine-latest\src\hz12font.c - - - - - hz16font.c - 1 - packages\gui_engine-latest\src\hz16font.c - - - - - image.c - 1 - packages\gui_engine-latest\src\image.c - - - - - image_bmp.c - 1 - packages\gui_engine-latest\src\image_bmp.c - - - - - image_container.c - 1 - packages\gui_engine-latest\src\image_container.c - - - - - image_hdc.c - 1 - packages\gui_engine-latest\src\image_hdc.c - - - - - image_jpg.c - 1 - packages\gui_engine-latest\src\image_jpg.c - - - - - image_png.c - 1 - packages\gui_engine-latest\src\image_png.c - - - - - image_xpm.c - 1 - packages\gui_engine-latest\src\image_xpm.c - - - - - matrix.c - 1 - packages\gui_engine-latest\src\matrix.c - - - - - mouse.c - 1 - packages\gui_engine-latest\src\mouse.c - - - - - region.c - 1 - packages\gui_engine-latest\src\region.c - - - - - rtgui_app.c - 1 - packages\gui_engine-latest\src\rtgui_app.c - - - - - rtgui_driver.c - 1 - packages\gui_engine-latest\src\rtgui_driver.c - - - - - rtgui_object.c - 1 - packages\gui_engine-latest\src\rtgui_object.c - - - - - rtgui_system.c - 1 - packages\gui_engine-latest\src\rtgui_system.c - - - - - server.c - 1 - packages\gui_engine-latest\src\server.c - - - - - title.c - 1 - packages\gui_engine-latest\src\title.c - - - - - topwin.c - 1 - packages\gui_engine-latest\src\topwin.c - - - - - widget.c - 1 - packages\gui_engine-latest\src\widget.c - - - - - window.c - 1 - packages\gui_engine-latest\src\window.c - - - - - gui_demo - - - gui_demo.c - 1 - packages\gui_engine-latest\example\gui_demo.c - - - - - resources.c - 1 - packages\gui_engine-latest\example\resources.c - - - Kernel diff --git a/bsp/stm32f429-disco/project.uvprojx b/bsp/stm32f429-disco/project.uvprojx index 60f42141c18121d633d68db58ff785358e1c2d33..f9915cd532a178a557f8c697cd31e42ebace6ccd 100644 --- a/bsp/stm32f429-disco/project.uvprojx +++ b/bsp/stm32f429-disco/project.uvprojx @@ -332,7 +332,7 @@ USE_HAL_DRIVER, STM32F429xx - applications;.;drivers;Libraries\STM32F4xx_HAL_Driver\Inc;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;packages\gui_engine-latest\include;packages\gui_engine-latest\src;packages\gui_engine-latest\example;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh + applications;.;drivers;Libraries\STM32F4xx_HAL_Driver\Inc;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\dfs\include;..\..\components\dfs\filesystems\devfs;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh @@ -921,320 +921,6 @@ - - GuiEngine - - - asc12font.c - 1 - packages\gui_engine-latest\src\asc12font.c - - - - - asc16font.c - 1 - packages\gui_engine-latest\src\asc16font.c - - - - - blit.c - 1 - packages\gui_engine-latest\src\blit.c - - - - - box.c - 1 - packages\gui_engine-latest\src\box.c - - - - - color.c - 1 - packages\gui_engine-latest\src\color.c - - - - - container.c - 1 - packages\gui_engine-latest\src\container.c - - - - - dc.c - 1 - packages\gui_engine-latest\src\dc.c - - - - - dc_blend.c - 1 - packages\gui_engine-latest\src\dc_blend.c - - - - - dc_buffer.c - 1 - packages\gui_engine-latest\src\dc_buffer.c - - - - - dc_client.c - 1 - packages\gui_engine-latest\src\dc_client.c - - - - - dc_hw.c - 1 - packages\gui_engine-latest\src\dc_hw.c - - - - - dc_rotozoom.c - 1 - packages\gui_engine-latest\src\dc_rotozoom.c - - - - - dc_trans.c - 1 - packages\gui_engine-latest\src\dc_trans.c - - - - - filerw.c - 1 - packages\gui_engine-latest\src\filerw.c - - - - - font.c - 1 - packages\gui_engine-latest\src\font.c - - - - - font_bmp.c - 1 - packages\gui_engine-latest\src\font_bmp.c - - - - - font_fnt.c - 1 - packages\gui_engine-latest\src\font_fnt.c - - - - - font_freetype.c - 1 - packages\gui_engine-latest\src\font_freetype.c - - - - - font_hz_bmp.c - 1 - packages\gui_engine-latest\src\font_hz_bmp.c - - - - - font_hz_file.c - 1 - packages\gui_engine-latest\src\font_hz_file.c - - - - - gb2312.c - 1 - packages\gui_engine-latest\src\gb2312.c - - - - - hz12font.c - 1 - packages\gui_engine-latest\src\hz12font.c - - - - - hz16font.c - 1 - packages\gui_engine-latest\src\hz16font.c - - - - - image.c - 1 - packages\gui_engine-latest\src\image.c - - - - - image_bmp.c - 1 - packages\gui_engine-latest\src\image_bmp.c - - - - - image_container.c - 1 - packages\gui_engine-latest\src\image_container.c - - - - - image_hdc.c - 1 - packages\gui_engine-latest\src\image_hdc.c - - - - - image_jpg.c - 1 - packages\gui_engine-latest\src\image_jpg.c - - - - - image_png.c - 1 - packages\gui_engine-latest\src\image_png.c - - - - - image_xpm.c - 1 - packages\gui_engine-latest\src\image_xpm.c - - - - - matrix.c - 1 - packages\gui_engine-latest\src\matrix.c - - - - - mouse.c - 1 - packages\gui_engine-latest\src\mouse.c - - - - - region.c - 1 - packages\gui_engine-latest\src\region.c - - - - - rtgui_app.c - 1 - packages\gui_engine-latest\src\rtgui_app.c - - - - - rtgui_driver.c - 1 - packages\gui_engine-latest\src\rtgui_driver.c - - - - - rtgui_object.c - 1 - packages\gui_engine-latest\src\rtgui_object.c - - - - - rtgui_system.c - 1 - packages\gui_engine-latest\src\rtgui_system.c - - - - - server.c - 1 - packages\gui_engine-latest\src\server.c - - - - - title.c - 1 - packages\gui_engine-latest\src\title.c - - - - - topwin.c - 1 - packages\gui_engine-latest\src\topwin.c - - - - - widget.c - 1 - packages\gui_engine-latest\src\widget.c - - - - - window.c - 1 - packages\gui_engine-latest\src\window.c - - - - - gui_demo - - - gui_demo.c - 1 - packages\gui_engine-latest\example\gui_demo.c - - - - - resources.c - 1 - packages\gui_engine-latest\example\resources.c - - - Kernel diff --git a/bsp/stm32f429-disco/rtconfig.h b/bsp/stm32f429-disco/rtconfig.h index 0b1c0850e30ef4027839bfa83c28d107e4d4aca0..933d1b1b33b92f2f26c1e43c9a208ab682ed67ed 100644 --- a/bsp/stm32f429-disco/rtconfig.h +++ b/bsp/stm32f429-disco/rtconfig.h @@ -133,13 +133,6 @@ /* system packages */ -#define PKG_USING_GUIENGINE -#define PKG_USING_GUIENGINE_LATEST_VERSION -#define GUIENGINE_NAME_MAX 16 -#define GUIENGINE_USING_FONT16 -#define GUIENGINE_USING_FONT12 -#define GUIENGINE_IMAGE_CONTAINER -#define GUIENGINE_USING_DEMO /* peripheral libraries and drivers */