[bsp][stm32f429-disco] Fix The Travis CI building failure

This commit is contained in:
xuzhuoyi committed 2018-09-15 16:22:54 +08:00
1 parent d5c7a63800
commit 65fff5b4b2
5 files changed
+10 -657

No files matched your search

+2 -16
View File
@@ -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
+6 -4
View File
@@ -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
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
-7
View File
@@ -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 */