Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion bsp/allwinner_tina/.config
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ CONFIG_RT_USING_POSIX=y
#
# RT-Thread UI Engine
#
# CONFIG_RT_USING_GUIENGINE is not set
# CONFIG_PKG_USING_GUIENGINE is not set

#
# VBUS(Virtual Software BUS)
Expand Down
2 changes: 1 addition & 1 deletion bsp/allwinner_tina/rtconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@

/* RT-Thread UI Engine */

/* RT_USING_GUIENGINE is not set */
/* PKG_USING_GUIENGINE is not set */

/* VBUS(Virtual Software BUS) */

Expand Down
2 changes: 1 addition & 1 deletion bsp/apollo2/rtconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@

/* RT-Thread UI Engine */

/* RT_USING_GUIENGINE is not set */
/* PKG_USING_GUIENGINE is not set */

/* VBUS(Virtual Software BUS) */

Expand Down
2 changes: 1 addition & 1 deletion bsp/asm9260t/.config
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ CONFIG_RT_USING_LIBC=y
#
# RT-Thread UI Engine
#
# CONFIG_RT_USING_GUIENGINE is not set
# CONFIG_PKG_USING_GUIENGINE is not set

#
# RT-Thread online packages
Expand Down
2 changes: 1 addition & 1 deletion bsp/asm9260t/rtconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@

/* RT-Thread UI Engine */

/* RT_USING_GUIENGINE is not set */
/* PKG_USING_GUIENGINE is not set */

/* RT-Thread online packages */

Expand Down
4 changes: 2 additions & 2 deletions bsp/gd32450z-eval/applications/application.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <rtthread.h>
#include <finsh.h>

#ifdef RT_USING_GUIENGINE
#ifdef PKG_USING_GUIENGINE
#include "rtgui_demo.h"
#include <rtgui/driver.h>
#endif
Expand All @@ -41,7 +41,7 @@ void rt_init_thread_entry(void* parameter)
rt_components_init();
#endif

#ifdef RT_USING_GUIENGINE
#ifdef PKG_USING_GUIENGINE
{
rt_device_t device;

Expand Down
4 changes: 2 additions & 2 deletions bsp/gd32450z-eval/applications/rtgui_demo.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define DEBUG_PRINTF(...)
#endif

#ifdef RT_USING_GUIENGINE
#ifdef PKG_USING_GUIENGINE

#include <rtgui/rtgui.h>
#include <rtgui/rtgui_system.h>
Expand Down Expand Up @@ -122,4 +122,4 @@ int rt_gui_demo_init(void)

return 0;
}
#endif /* RT_USING_GUIENGINE */
#endif /* PKG_USING_GUIENGINE */
2 changes: 1 addition & 1 deletion bsp/gd32450z-eval/drivers/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if GetDepend('RT_USING_LWIP'):
src += ['drv_enet.c', 'synopsys_emac.c']

# add lcd drivers.
if GetDepend('RT_USING_GUIENGINE'):
if GetDepend('PKG_USING_GUIENGINE'):
src += ['drv_lcd.c', 'gd32f450z_lcd_eval.c']

# add spi flash drivers.
Expand Down
2 changes: 1 addition & 1 deletion bsp/gd32450z-eval/drivers/drv_lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <board.h>
#include <finsh.h>

#ifdef RT_USING_GUIENGINE
#ifdef PKG_USING_GUIENGINE


#define RT_HW_LCD_WIDTH ((uint16_t)320) /* LCD PIXEL WIDTH */
Expand Down
2 changes: 1 addition & 1 deletion bsp/gd32450z-eval/rtconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

/* SECTION: RTGUI support */
/* using RTGUI support */
#define RT_USING_GUIENGINE
// #define PKG_USING_GUIENGINE

/* name length of RTGUI object */
#define RTGUI_NAME_MAX 16
Expand Down
44 changes: 21 additions & 23 deletions bsp/imxrt1052-evk/.config
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ CONFIG_ARCH_ARM_CORTEX_M7=y
#
CONFIG_RT_USING_COMPONENTS_INIT=y
CONFIG_RT_USING_USER_MAIN=y
CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048

#
# C++ features
Expand Down Expand Up @@ -197,34 +198,14 @@ CONFIG_SO_REUSE=1
CONFIG_LWIP_SO_RCVTIMEO=1
CONFIG_LWIP_SO_SNDTIMEO=1
CONFIG_LWIP_SO_RCVBUF=1
# CONFIG_RT_LWIP_NETIF_LOOPBACK is not set
CONFIG_LWIP_NETIF_LOOPBACK=0

#
# Modbus master and slave stack
#
# CONFIG_RT_USING_MODBUS is not set
# CONFIG_LWIP_USING_DHCPD is not set
# CONFIG_RT_USING_NETUTILS is not set

#
# RT-Thread UI Engine
#
CONFIG_RT_USING_GUIENGINE=y
CONFIG_RTGUI_NAME_MAX=16
CONFIG_RTGUI_USING_TTF=y
CONFIG_UTF8_TO_UNICODE=y
CONFIG_RTGUI_USING_FONT16=y
CONFIG_RTGUI_USING_FONT12=y
# CONFIG_RTGUI_USING_FONTHZ is not set
# CONFIG_RTGUI_IMAGE_XPM is not set
CONFIG_RTGUI_IMAGE_JPEG_NONE=y
# CONFIG_RTGUI_IMAGE_JPEG is not set
# CONFIG_RTGUI_IMAGE_TJPGD is not set
# CONFIG_RTGUI_IMAGE_PNG_NONE is not set
# CONFIG_RTGUI_IMAGE_PNG is not set
CONFIG_RTGUI_IMAGE_LODEPNG=y
# CONFIG_RTGUI_IMAGE_BMP is not set
CONFIG_RTGUI_IMAGE_CONTAINER=y
# CONFIG_RTGUI_USING_DEMO is not set

#
# VBUS(Virtual Software BUS)
Expand All @@ -250,8 +231,22 @@ CONFIG_RTGUI_IMAGE_CONTAINER=y
#
# system packages
#
# CONFIG_PKG_USING_PARTITION is not set

#
# RT-Thread GUI Engine
#
# CONFIG_PKG_USING_GUIENGINE is not set
# CONFIG_GUIENGINE_IMAGE_JPEG_NONE is not set
# CONFIG_GUIENGINE_IMAGE_JPEG is not set
# CONFIG_GUIENGINE_IMAGE_TJPGD is not set
# CONFIG_GUIENGINE_IMAGE_PNG_NONE is not set
# CONFIG_GUIENGINE_IMAGE_PNG is not set
# CONFIG_GUIENGINE_IMAGE_LODEPNG is not set
# CONFIG_PKG_USING_GUIENGINE_V200 is not set
# CONFIG_PKG_USING_GUIENGINE_LATEST_VERSION is not set
# CONFIG_PKG_USING_PERSIMMON is not set
# CONFIG_PKG_USING_LWEXT4 is not set
# CONFIG_PKG_USING_PARTITION is not set
# CONFIG_PKG_USING_SQLITE is not set
# CONFIG_PKG_USING_RTI is not set

Expand Down Expand Up @@ -282,6 +277,7 @@ CONFIG_RTGUI_IMAGE_CONTAINER=y
#
# CONFIG_PKG_USING_WLAN_WICED is not set
# CONFIG_PKG_USING_COAP is not set
# CONFIG_PKG_USING_NOPOLL is not set

#
# security packages
Expand Down Expand Up @@ -314,11 +310,13 @@ CONFIG_RTGUI_IMAGE_CONTAINER=y
#
# CONFIG_PKG_USING_FASTLZ is not set
# CONFIG_PKG_USING_MINILZO is not set
# CONFIG_PKG_USING_QUICKLZ is not set

#
# example package: hello
#
# CONFIG_PKG_USING_HELLO is not set
# CONFIG_PKG_USING_MULTIBUTTON is not set
CONFIG_SOC_IMXRT1052=y
CONFIG_RT_USING_UART=y
CONFIG_RT_USING_UART1=y
1 change: 0 additions & 1 deletion bsp/imxrt1052-evk/BuildLog.log

This file was deleted.

2 changes: 1 addition & 1 deletion bsp/imxrt1052-evk/drivers/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if GetDepend('RT_USING_LWIP'):
if GetDepend('RT_USING_SDIO'):
src += ['drv_sdio.c']

if GetDepend('RT_USING_RTGUI') or GetDepend('RT_USING_GUIENGINE'):
if GetDepend('RT_USING_RTGUI') or GetDepend('PKG_USING_GUIENGINE'):
src += ['drv_lcd.c', 'drv_ft5406.c', 'drv_i2c.c']

group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES)
Expand Down
2 changes: 1 addition & 1 deletion bsp/imxrt1052-evk/drivers/board.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void rt_hw_board_init()
#endif
}

#ifdef RT_USING_GUIENGINE
#ifdef PKG_USING_GUIENGINE
#include <rtgui/driver.h>
#include "drv_lcd.h"

Expand Down
2 changes: 1 addition & 1 deletion bsp/imxrt1052-evk/drivers/drv_lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

//#define LCD_DEBUG

#ifdef RT_USING_GUIENGINE
#ifdef PKG_USING_GUIENGINE

#define APP_HSW 41
#define APP_HFP 4
Expand Down
41 changes: 19 additions & 22 deletions bsp/imxrt1052-evk/rtconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@

#define RT_USING_COMPONENTS_INIT
#define RT_USING_USER_MAIN
#define RT_MAIN_THREAD_STACK_SIZE 2048

/* C++ features */

Expand Down Expand Up @@ -182,32 +183,13 @@
#define LWIP_SO_RCVTIMEO 1
#define LWIP_SO_SNDTIMEO 1
#define LWIP_SO_RCVBUF 1
/* RT_LWIP_NETIF_LOOPBACK is not set */
#define LWIP_NETIF_LOOPBACK 0

/* Modbus master and slave stack */

/* RT_USING_MODBUS is not set */
/* LWIP_USING_DHCPD is not set */
/* RT_USING_NETUTILS is not set */

/* RT-Thread UI Engine */

#define RT_USING_GUIENGINE
#define RTGUI_NAME_MAX 16
#define RTGUI_USING_TTF
#define UTF8_TO_UNICODE
#define RTGUI_USING_FONT16
#define RTGUI_USING_FONT12
/* RTGUI_USING_FONTHZ is not set */
/* RTGUI_IMAGE_XPM is not set */
#define RTGUI_IMAGE_JPEG_NONE
/* RTGUI_IMAGE_JPEG is not set */
/* RTGUI_IMAGE_TJPGD is not set */
/* RTGUI_IMAGE_PNG_NONE is not set */
/* RTGUI_IMAGE_PNG is not set */
#define RTGUI_IMAGE_LODEPNG
/* RTGUI_IMAGE_BMP is not set */
#define RTGUI_IMAGE_CONTAINER
/* RTGUI_USING_DEMO is not set */

/* VBUS(Virtual Software BUS) */

Expand All @@ -227,8 +209,20 @@

/* system packages */

/* PKG_USING_PARTITION is not set */
/* RT-Thread GUI Engine */

/* PKG_USING_GUIENGINE is not set */
/* GUIENGINE_IMAGE_JPEG_NONE is not set */
/* GUIENGINE_IMAGE_JPEG is not set */
/* GUIENGINE_IMAGE_TJPGD is not set */
/* GUIENGINE_IMAGE_PNG_NONE is not set */
/* GUIENGINE_IMAGE_PNG is not set */
/* GUIENGINE_IMAGE_LODEPNG is not set */
/* PKG_USING_GUIENGINE_V200 is not set */
/* PKG_USING_GUIENGINE_LATEST_VERSION is not set */
/* PKG_USING_PERSIMMON is not set */
/* PKG_USING_LWEXT4 is not set */
/* PKG_USING_PARTITION is not set */
/* PKG_USING_SQLITE is not set */
/* PKG_USING_RTI is not set */

Expand All @@ -254,6 +248,7 @@

/* PKG_USING_WLAN_WICED is not set */
/* PKG_USING_COAP is not set */
/* PKG_USING_NOPOLL is not set */

/* security packages */

Expand Down Expand Up @@ -281,10 +276,12 @@

/* PKG_USING_FASTLZ is not set */
/* PKG_USING_MINILZO is not set */
/* PKG_USING_QUICKLZ is not set */

/* example package: hello */

/* PKG_USING_HELLO is not set */
/* PKG_USING_MULTIBUTTON is not set */
#define SOC_IMXRT1052
#define RT_USING_UART
#define RT_USING_UART1
Expand Down
2 changes: 1 addition & 1 deletion bsp/lpc54608-LPCXpresso/.config
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ CONFIG_LWIP_SO_RCVBUF=1
#
# RT-Thread UI Engine
#
# CONFIG_RT_USING_GUIENGINE is not set
# CONFIG_PKG_USING_GUIENGINE is not set

#
# VBUS(Virtual Software BUS)
Expand Down
2 changes: 1 addition & 1 deletion bsp/lpc54608-LPCXpresso/drivers/board.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void rt_hw_board_init()
#endif
}

#ifdef RT_USING_GUIENGINE
#ifdef PKG_USING_GUIENGINE
#include <rtgui/driver.h>
#include "drv_lcd.h"

Expand Down
2 changes: 1 addition & 1 deletion bsp/lpc54608-LPCXpresso/rtconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@

/* RT-Thread UI Engine */

/* RT_USING_GUIENGINE is not set */
/* PKG_USING_GUIENGINE is not set */

/* VBUS(Virtual Software BUS) */

Expand Down
Loading