未验证 提交 7dabc384 编写于 作者: G guo 提交者: GitHub

Merge pull request #5289 from mysterywolf/lvgl

[stm32l475] update lvgl driver
...@@ -121,38 +121,7 @@ CONFIG_FINSH_ARG_MAX=10 ...@@ -121,38 +121,7 @@ CONFIG_FINSH_ARG_MAX=10
# #
# Device virtual file system # Device virtual file system
# #
CONFIG_RT_USING_DFS=y # CONFIG_RT_USING_DFS is not set
CONFIG_DFS_USING_WORKDIR=y
CONFIG_DFS_FILESYSTEMS_MAX=2
CONFIG_DFS_FILESYSTEM_TYPES_MAX=2
CONFIG_DFS_FD_MAX=16
# CONFIG_RT_USING_DFS_MNTTABLE is not set
CONFIG_RT_USING_DFS_ELMFAT=y
#
# elm-chan's FatFs, Generic FAT Filesystem Module
#
CONFIG_RT_DFS_ELM_CODE_PAGE=437
CONFIG_RT_DFS_ELM_WORD_ACCESS=y
# CONFIG_RT_DFS_ELM_USE_LFN_0 is not set
# CONFIG_RT_DFS_ELM_USE_LFN_1 is not set
# CONFIG_RT_DFS_ELM_USE_LFN_2 is not set
CONFIG_RT_DFS_ELM_USE_LFN_3=y
CONFIG_RT_DFS_ELM_USE_LFN=3
CONFIG_RT_DFS_ELM_LFN_UNICODE_0=y
# CONFIG_RT_DFS_ELM_LFN_UNICODE_1 is not set
# CONFIG_RT_DFS_ELM_LFN_UNICODE_2 is not set
# CONFIG_RT_DFS_ELM_LFN_UNICODE_3 is not set
CONFIG_RT_DFS_ELM_LFN_UNICODE=0
CONFIG_RT_DFS_ELM_MAX_LFN=255
CONFIG_RT_DFS_ELM_DRIVES=2
CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512
# CONFIG_RT_DFS_ELM_USE_ERASE is not set
CONFIG_RT_DFS_ELM_REENTRANT=y
CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
CONFIG_RT_USING_DFS_DEVFS=y
# CONFIG_RT_USING_DFS_ROMFS is not set
# CONFIG_RT_USING_DFS_RAMFS is not set
# #
# Device Drivers # Device Drivers
...@@ -174,17 +143,11 @@ CONFIG_RT_USING_PIN=y ...@@ -174,17 +143,11 @@ CONFIG_RT_USING_PIN=y
# CONFIG_RT_USING_ADC is not set # CONFIG_RT_USING_ADC is not set
# CONFIG_RT_USING_DAC is not set # CONFIG_RT_USING_DAC is not set
# CONFIG_RT_USING_PWM is not set # CONFIG_RT_USING_PWM is not set
CONFIG_RT_USING_MTD_NOR=y # CONFIG_RT_USING_MTD_NOR is not set
# CONFIG_RT_USING_MTD_NAND is not set # CONFIG_RT_USING_MTD_NAND is not set
# CONFIG_RT_USING_PM is not set # CONFIG_RT_USING_PM is not set
# CONFIG_RT_USING_RTC is not set # CONFIG_RT_USING_RTC is not set
CONFIG_RT_USING_SDIO=y # CONFIG_RT_USING_SDIO is not set
CONFIG_RT_SDIO_STACK_SIZE=512
CONFIG_RT_SDIO_THREAD_PRIORITY=15
CONFIG_RT_MMCSD_STACK_SIZE=1024
CONFIG_RT_MMCSD_THREAD_PREORITY=22
CONFIG_RT_MMCSD_MAX_PARTITION=16
# CONFIG_RT_SDIO_DEBUG is not set
# CONFIG_RT_USING_SPI is not set # CONFIG_RT_USING_SPI is not set
# CONFIG_RT_USING_WDT is not set # CONFIG_RT_USING_WDT is not set
# CONFIG_RT_USING_AUDIO is not set # CONFIG_RT_USING_AUDIO is not set
......
...@@ -215,9 +215,8 @@ ...@@ -215,9 +215,8 @@
<option> <option>
<name>CCDefines</name> <name>CCDefines</name>
<state /> <state />
<state>RT_USING_DLIBC</state>
<state>_DLIB_FILE_DESCRIPTOR</state>
<state>STM32F469xx</state> <state>STM32F469xx</state>
<state>__RTTHREAD__</state>
<state>USE_HAL_DRIVER</state> <state>USE_HAL_DRIVER</state>
</option> </option>
<option> <option>
...@@ -344,21 +343,19 @@ ...@@ -344,21 +343,19 @@
<option> <option>
<name>CCIncludePath2</name> <name>CCIncludePath2</name>
<state /> <state />
<state>$PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs</state> <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc</state>
<state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Include</state> <state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Include</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state> <state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state> <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state> <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
<state>$PROJ_DIR$\..\..\..\components\dfs\include</state>
<state>$PROJ_DIR$\board\ports</state> <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state> <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state> <state>$PROJ_DIR$\..\..\..\examples\utest\testcases\kernel</state>
<state>$PROJ_DIR$\.</state> <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state> <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state> <state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib</state>
<state>$PROJ_DIR$\board</state> <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat</state> <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state> <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
<state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include</state> <state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include</state>
<state>$PROJ_DIR$\..\..\..\include</state> <state>$PROJ_DIR$\..\..\..\include</state>
...@@ -1252,9 +1249,8 @@ ...@@ -1252,9 +1249,8 @@
</option> </option>
<option> <option>
<name>CCDefines</name> <name>CCDefines</name>
<state>RT_USING_DLIBC</state>
<state>_DLIB_FILE_DESCRIPTOR</state>
<state>STM32F469xx</state> <state>STM32F469xx</state>
<state>__RTTHREAD__</state>
<state>USE_HAL_DRIVER</state> <state>USE_HAL_DRIVER</state>
</option> </option>
<option> <option>
...@@ -1381,21 +1377,19 @@ ...@@ -1381,21 +1377,19 @@
<option> <option>
<name>CCIncludePath2</name> <name>CCIncludePath2</name>
<state /> <state />
<state>$PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs</state> <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common\nogcc</state>
<state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Include</state> <state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Include</state>
<state>$PROJ_DIR$\..\..\..\components\finsh</state> <state>$PROJ_DIR$\..\..\..\components\finsh</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state> <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state> <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4</state>
<state>$PROJ_DIR$\..\..\..\components\dfs\include</state>
<state>$PROJ_DIR$\board\ports</state> <state>$PROJ_DIR$\board\ports</state>
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state> <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state> <state>$PROJ_DIR$\..\..\..\examples\utest\testcases\kernel</state>
<state>$PROJ_DIR$\.</state> <state>$PROJ_DIR$\.</state>
<state>$PROJ_DIR$\applications</state> <state>$PROJ_DIR$\applications</state>
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state> <state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib</state>
<state>$PROJ_DIR$\board</state> <state>$PROJ_DIR$\board</state>
<state>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat</state> <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
<state>$PROJ_DIR$\board\CubeMX_Config\Inc</state> <state>$PROJ_DIR$\board\CubeMX_Config\Inc</state>
<state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include</state> <state>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include</state>
<state>$PROJ_DIR$\..\..\..\include</state> <state>$PROJ_DIR$\..\..\..\include</state>
...@@ -2078,22 +2072,22 @@ ...@@ -2078,22 +2072,22 @@
<group> <group>
<name>Applications</name> <name>Applications</name>
<file> <file>
<name>$PROJ_DIR$\applications\main.c</name> <name>$PROJ_DIR$\applications\lcd_init.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\applications\lcd_init.c</name> <name>$PROJ_DIR$\applications\main.c</name>
</file> </file>
</group> </group>
<group> <group>
<name>cpu</name> <name>CPU</name>
<file> <file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c</name> <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\backtrace.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name> <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\common\showmem.c</name> <name>$PROJ_DIR$\..\..\..\libcpu\arm\common\div0.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c</name> <name>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m4\cpuport.c</name>
...@@ -2108,91 +2102,37 @@ ...@@ -2108,91 +2102,37 @@
<name>$PROJ_DIR$\..\..\..\components\drivers\misc\pin.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\misc\pin.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\mtd\mtd_nor.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\sdio\block_dev.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\sdio\mmcsd_core.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\sdio\sd.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\sdio\sdio.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\sdio\mmc.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\serial\serial.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\completion.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\src\completion.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\dataqueue.c</name>
</file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\pipe.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\src\pipe.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\ringblk_buf.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\src\ringbuffer.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\waitqueue.c</name>
</file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c</name> <name>$PROJ_DIR$\..\..\..\components\drivers\src\workqueue.c</name>
</file> </file>
</group> </group>
<group>
<name>dlib</name>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\environ.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\libc.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\rmtx.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\stdio.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_close.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_lseek.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_mem.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_open.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_read.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_remove.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\dlib\syscall_write.c</name>
</file>
</group>
<group> <group>
<name>Drivers</name> <name>Drivers</name>
<file> <file>
<name>$PROJ_DIR$\board\board.c</name> <name>$PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\board\CubeMX_Config\Src\stm32f4xx_hal_msp.c</name> <name>$PROJ_DIR$\board\board.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f469xx.s</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\iar\startup_stm32f469xx.s</name>
...@@ -2208,126 +2148,57 @@ ...@@ -2208,126 +2148,57 @@
</file> </file>
</group> </group>
<group> <group>
<name>Filesystem</name> <name>Finsh</name>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\src\dfs.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\src\dfs_file.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\src\dfs_fs.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\src\dfs_posix.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\src\poll.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\src\select.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\filesystems\devfs\devfs.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat\dfs_elm.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat\ff.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\dfs\filesystems\elmfat\option\ccsbcs.c</name>
</file>
</group>
<group>
<name>finsh</name>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name> <name>$PROJ_DIR$\..\..\..\components\finsh\shell.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name> <name>$PROJ_DIR$\..\..\..\components\finsh\msh.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\finsh\msh_file.c</name> <name>$PROJ_DIR$\..\..\..\components\finsh\cmd.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_compiler.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_error.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_heap.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_init.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_node.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_ops.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_parser.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_var.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_vm.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\components\finsh\finsh_token.c</name>
</file> </file>
</group> </group>
<group> <group>
<name>Kernel</name> <name>Kernel</name>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\clock.c</name> <name>$PROJ_DIR$\..\..\..\src\irq.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\src\components.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\device.c</name> <name>$PROJ_DIR$\..\..\..\src\device.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\idle.c</name> <name>$PROJ_DIR$\..\..\..\src\memheap.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\ipc.c</name> <name>$PROJ_DIR$\..\..\..\src\ipc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\irq.c</name> <name>$PROJ_DIR$\..\..\..\src\clock.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\kservice.c</name> <name>$PROJ_DIR$\..\..\..\src\idle.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\memheap.c</name> <name>$PROJ_DIR$\..\..\..\src\object.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\mempool.c</name> <name>$PROJ_DIR$\..\..\..\src\timer.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\object.c</name> <name>$PROJ_DIR$\..\..\..\src\thread.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\scheduler.c</name> <name>$PROJ_DIR$\..\..\..\src\mempool.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\signal.c</name> <name>$PROJ_DIR$\..\..\..\src\kservice.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\thread.c</name> <name>$PROJ_DIR$\..\..\..\src\scheduler.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\..\..\src\timer.c</name> <name>$PROJ_DIR$\..\..\..\src\components.c</name>
</file> </file>
</group> </group>
<group> <group>
...@@ -2335,71 +2206,62 @@ ...@@ -2335,71 +2206,62 @@
<file> <file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c</name> <name>$PROJ_DIR$\..\..\..\components\libc\compilers\common\time.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\..\components\libc\compilers\common\unistd.c</name>
</file>
</group> </group>
<group> <group>
<name>STM32_HAL</name> <name>Libraries</name>
<file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c</name>
</file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_sdmmc.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sd.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nor.c</name> <name>$PROJ_DIR$\..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c</name>
</file> </file>
</group> </group>
<group>
<name>utestcases</name>
</group>
</project> </project>
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<MiscControls /> <MiscControls />
<Define>USE_HAL_DRIVER, STM32F469xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define> <Define>USE_HAL_DRIVER, STM32F469xx, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define>
<Undefine /> <Undefine />
<IncludePath>applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\dfs\include;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\dfs\filesystems\elmfat;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel</IncludePath> <IncludePath>applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\nogcc;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include;..\..\..\examples\utest\testcases\kernel</IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
<Aads> <Aads>
...@@ -404,16 +404,16 @@ ...@@ -404,16 +404,16 @@
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>div0.c</FileName> <FileName>showmem.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath> <FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>showmem.c</FileName> <FileName>div0.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath> <FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
...@@ -442,65 +442,37 @@ ...@@ -442,65 +442,37 @@
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>mtd_nor.c</FileName> <FileName>serial.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\mtd\mtd_nor.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>mmc.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\sdio\mmc.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>sd.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\sdio\sd.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>block_dev.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\sdio\block_dev.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>sdio.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\components\drivers\sdio\sdio.c</FilePath> <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>mmcsd_core.c</FileName> <FileName>waitqueue.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\components\drivers\sdio\mmcsd_core.c</FilePath> <FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>serial.c</FileName> <FileName>pipe.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\components\drivers\serial\serial.c</FilePath> <FilePath>..\..\..\components\drivers\src\pipe.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>pipe.c</FileName> <FileName>workqueue.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\components\drivers\src\pipe.c</FilePath> <FilePath>..\..\..\components\drivers\src\workqueue.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>workqueue.c</FileName> <FileName>ringblk_buf.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\components\drivers\src\workqueue.c</FilePath> <FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
...@@ -524,20 +496,6 @@ ...@@ -524,20 +496,6 @@
<FilePath>..\..\..\components\drivers\src\dataqueue.c</FilePath> <FilePath>..\..\..\components\drivers\src\dataqueue.c</FilePath>
</File> </File>
</Files> </Files>
<Files>
<File>
<FileName>ringblk_buf.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>waitqueue.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath>
</File>
</Files>
</Group> </Group>
<Group> <Group>
<GroupName>Drivers</GroupName> <GroupName>Drivers</GroupName>
...@@ -584,58 +542,6 @@ ...@@ -584,58 +542,6 @@
</File> </File>
</Files> </Files>
</Group> </Group>
<Group>
<GroupName>Filesystem</GroupName>
<Files>
<File>
<FileName>dfs_fs.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\dfs\src\dfs_fs.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>dfs.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\dfs\src\dfs.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>dfs_file.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\dfs\src\dfs_file.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>devfs.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\dfs\filesystems\devfs\devfs.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>ff.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\dfs\filesystems\elmfat\ff.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>dfs_elm.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\dfs\filesystems\elmfat\dfs_elm.c</FilePath>
</File>
</Files>
<Files>
<File>
<FileName>ffunicode.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\dfs\filesystems\elmfat\ffunicode.c</FilePath>
</File>
</Files>
</Group>
<Group> <Group>
<GroupName>Finsh</GroupName> <GroupName>Finsh</GroupName>
<Files> <Files>
...@@ -664,93 +570,93 @@ ...@@ -664,93 +570,93 @@
<GroupName>Kernel</GroupName> <GroupName>Kernel</GroupName>
<Files> <Files>
<File> <File>
<FileName>timer.c</FileName> <FileName>object.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\timer.c</FilePath> <FilePath>..\..\..\src\object.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>mempool.c</FileName> <FileName>kservice.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\mempool.c</FilePath> <FilePath>..\..\..\src\kservice.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>components.c</FileName> <FileName>clock.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\components.c</FilePath> <FilePath>..\..\..\src\clock.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>scheduler.c</FileName> <FileName>memheap.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\scheduler.c</FilePath> <FilePath>..\..\..\src\memheap.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>irq.c</FileName> <FileName>mempool.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\irq.c</FilePath> <FilePath>..\..\..\src\mempool.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>memheap.c</FileName> <FileName>timer.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\memheap.c</FilePath> <FilePath>..\..\..\src\timer.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>thread.c</FileName> <FileName>scheduler.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\thread.c</FilePath> <FilePath>..\..\..\src\scheduler.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>idle.c</FileName> <FileName>thread.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\idle.c</FilePath> <FilePath>..\..\..\src\thread.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>device.c</FileName> <FileName>components.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\device.c</FilePath> <FilePath>..\..\..\src\components.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>clock.c</FileName> <FileName>device.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\clock.c</FilePath> <FilePath>..\..\..\src\device.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>object.c</FileName> <FileName>ipc.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\object.c</FilePath> <FilePath>..\..\..\src\ipc.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>kservice.c</FileName> <FileName>irq.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\kservice.c</FilePath> <FilePath>..\..\..\src\irq.c</FilePath>
</File> </File>
</Files> </Files>
<Files> <Files>
<File> <File>
<FileName>ipc.c</FileName> <FileName>idle.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\src\ipc.c</FilePath> <FilePath>..\..\..\src\idle.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>
...@@ -808,13 +714,6 @@ ...@@ -808,13 +714,6 @@
<FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c</FilePath> <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c</FilePath>
</File> </File>
</Files> </Files>
<Files>
<File>
<FileName>stm32f4xx_hal_sd.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sd.c</FilePath>
</File>
</Files>
<Files> <Files>
<File> <File>
<FileName>stm32f4xx_hal_rcc_ex.c</FileName> <FileName>stm32f4xx_hal_rcc_ex.c</FileName>
...@@ -843,13 +742,6 @@ ...@@ -843,13 +742,6 @@
<FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c</FilePath> <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c</FilePath>
</File> </File>
</Files> </Files>
<Files>
<File>
<FileName>stm32f4xx_ll_sdmmc.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_sdmmc.c</FilePath>
</File>
</Files>
<Files> <Files>
<File> <File>
<FileName>stm32f4xx_hal_dma_ex.c</FileName> <FileName>stm32f4xx_hal_dma_ex.c</FileName>
...@@ -885,13 +777,6 @@ ...@@ -885,13 +777,6 @@
<FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c</FilePath> <FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c</FilePath>
</File> </File>
</Files> </Files>
<Files>
<File>
<FileName>stm32f4xx_hal_nor.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nor.c</FilePath>
</File>
</Files>
<Files> <Files>
<File> <File>
<FileName>stm32f4xx_hal_cryp.c</FileName> <FileName>stm32f4xx_hal_cryp.c</FileName>
......
...@@ -81,27 +81,6 @@ ...@@ -81,27 +81,6 @@
/* Device virtual file system */ /* Device virtual file system */
#define RT_USING_DFS
#define DFS_USING_WORKDIR
#define DFS_FILESYSTEMS_MAX 2
#define DFS_FILESYSTEM_TYPES_MAX 2
#define DFS_FD_MAX 16
#define RT_USING_DFS_ELMFAT
/* elm-chan's FatFs, Generic FAT Filesystem Module */
#define RT_DFS_ELM_CODE_PAGE 437
#define RT_DFS_ELM_WORD_ACCESS
#define RT_DFS_ELM_USE_LFN_3
#define RT_DFS_ELM_USE_LFN 3
#define RT_DFS_ELM_LFN_UNICODE_0
#define RT_DFS_ELM_LFN_UNICODE 0
#define RT_DFS_ELM_MAX_LFN 255
#define RT_DFS_ELM_DRIVES 2
#define RT_DFS_ELM_MAX_SECTOR_SIZE 512
#define RT_DFS_ELM_REENTRANT
#define RT_DFS_ELM_MUTEX_TIMEOUT 3000
#define RT_USING_DFS_DEVFS
/* Device Drivers */ /* Device Drivers */
...@@ -112,13 +91,6 @@ ...@@ -112,13 +91,6 @@
#define RT_SERIAL_USING_DMA #define RT_SERIAL_USING_DMA
#define RT_SERIAL_RB_BUFSZ 64 #define RT_SERIAL_RB_BUFSZ 64
#define RT_USING_PIN #define RT_USING_PIN
#define RT_USING_MTD_NOR
#define RT_USING_SDIO
#define RT_SDIO_STACK_SIZE 512
#define RT_SDIO_THREAD_PRIORITY 15
#define RT_MMCSD_STACK_SIZE 1024
#define RT_MMCSD_THREAD_PREORITY 22
#define RT_MMCSD_MAX_PARTITION 16
/* Using USB */ /* Using USB */
......
...@@ -2,14 +2,14 @@ from building import * ...@@ -2,14 +2,14 @@ from building import *
import os import os
cwd = GetCurrentDir() cwd = GetCurrentDir()
src = Glob('*.c') src = ['drv_lcd.c']
CPPPATH = [cwd] CPPPATH = [cwd]
if GetDepend(['BSP_USING_LCD_QRCODE']): if GetDepend(['BSP_USING_LCD_QRCODE']):
src = src + Glob('lcd_qrcode.c') src = src + ['lcd_qrcode.c']
if GetDepend(['BSP_USING_LCD_SAMPLE']): if GetDepend(['BSP_USING_LCD_SAMPLE']):
src = src + Glob('demo/lcd_sample.c') src = src + ['demo/lcd_sample.c']
group = DefineGroup('Drivers', src, depend = ['BSP_USING_SPI_LCD'], CPPPATH = CPPPATH) group = DefineGroup('Drivers', src, depend = ['BSP_USING_SPI_LCD'], CPPPATH = CPPPATH)
......
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
#include <drv_gpio.h> #include <drv_gpio.h>
#include <drv_spi.h> #include <drv_spi.h>
#include "drv_lcd.h" #include "drv_lcd.h"
#ifndef BSP_USING_LVGL
#include "drv_lcd_font.h" #include "drv_lcd_font.h"
#endif /* BSP_USING_LVGL */
#define DBG_TAG "drv.lcd" #define DBG_TAG "drv.lcd"
#define DBG_LVL DBG_INFO #define DBG_LVL DBG_INFO
...@@ -25,9 +27,11 @@ ...@@ -25,9 +27,11 @@
#define LCD_PWR_PIN GET_PIN(B, 7) #define LCD_PWR_PIN GET_PIN(B, 7)
#define LCD_DC_PIN GET_PIN(B, 4) #define LCD_DC_PIN GET_PIN(B, 4)
#define LCD_RES_PIN GET_PIN(B, 6) #define LCD_RES_PIN GET_PIN(B, 6)
#define LCD_CLEAR_SEND_NUMBER 5760 /* 240*240/10 */
#ifndef BSP_USING_LVGL
#define LCD_CLEAR_SEND_NUMBER 5760 /* 240*240/10 */
rt_uint16_t BACK_COLOR = WHITE, FORE_COLOR = BLACK; rt_uint16_t BACK_COLOR = WHITE, FORE_COLOR = BLACK;
#endif /* BSP_USING_LVGL */
static struct rt_spi_device *spi_dev_lcd; static struct rt_spi_device *spi_dev_lcd;
...@@ -86,6 +90,7 @@ static rt_err_t lcd_write_data(const rt_uint8_t data) ...@@ -86,6 +90,7 @@ static rt_err_t lcd_write_data(const rt_uint8_t data)
} }
} }
#ifndef BSP_USING_LVGL
static rt_err_t lcd_write_half_word(const rt_uint16_t da) static rt_err_t lcd_write_half_word(const rt_uint16_t da)
{ {
rt_size_t len; rt_size_t len;
...@@ -106,6 +111,7 @@ static rt_err_t lcd_write_half_word(const rt_uint16_t da) ...@@ -106,6 +111,7 @@ static rt_err_t lcd_write_half_word(const rt_uint16_t da)
return RT_EOK; return RT_EOK;
} }
} }
#endif /* BSP_USING_LVGL */
static void lcd_gpio_init(void) static void lcd_gpio_init(void)
{ {
...@@ -214,6 +220,7 @@ static int rt_hw_lcd_init(void) ...@@ -214,6 +220,7 @@ static int rt_hw_lcd_init(void)
} }
INIT_DEVICE_EXPORT(rt_hw_lcd_init); INIT_DEVICE_EXPORT(rt_hw_lcd_init);
#ifndef BSP_USING_LVGL
/** /**
* Set background color and foreground color * Set background color and foreground color
* *
...@@ -227,6 +234,7 @@ void lcd_set_color(rt_uint16_t back, rt_uint16_t fore) ...@@ -227,6 +234,7 @@ void lcd_set_color(rt_uint16_t back, rt_uint16_t fore)
BACK_COLOR = back; BACK_COLOR = back;
FORE_COLOR = fore; FORE_COLOR = fore;
} }
#endif /* BSP_USING_LVGL */
void lcd_display_on(void) void lcd_display_on(void)
{ {
...@@ -281,6 +289,7 @@ void lcd_address_set(rt_uint16_t x1, rt_uint16_t y1, rt_uint16_t x2, rt_uint16_t ...@@ -281,6 +289,7 @@ void lcd_address_set(rt_uint16_t x1, rt_uint16_t y1, rt_uint16_t x2, rt_uint16_t
lcd_write_cmd(0x2C); lcd_write_cmd(0x2C);
} }
#ifndef BSP_USING_LVGL
/** /**
* clear the lcd. * clear the lcd.
* *
...@@ -424,6 +433,8 @@ void lcd_fill(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_ui ...@@ -424,6 +433,8 @@ void lcd_fill(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_ui
} }
} }
} }
#endif /* BSP_USING_LVGL */
/** /**
* full color array on the lcd. * full color array on the lcd.
...@@ -438,7 +449,7 @@ void lcd_fill(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_ui ...@@ -438,7 +449,7 @@ void lcd_fill(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_ui
*/ */
void lcd_fill_array(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_uint16_t y_end, void *pcolor) void lcd_fill_array(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_uint16_t y_end, void *pcolor)
{ {
rt_uint32_t size = 0, size_remain = 0; rt_uint32_t size = 0;
size = (x_end - x_start + 1) * (y_end - y_start + 1) * 2; size = (x_end - x_start + 1) * (y_end - y_start + 1) * 2;
lcd_address_set(x_start, y_start, x_end, y_end); lcd_address_set(x_start, y_start, x_end, y_end);
...@@ -446,6 +457,7 @@ void lcd_fill_array(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, ...@@ -446,6 +457,7 @@ void lcd_fill_array(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end,
rt_spi_send(spi_dev_lcd, pcolor, size); rt_spi_send(spi_dev_lcd, pcolor, size);
} }
#ifndef BSP_USING_LVGL
/** /**
* display a line on the lcd. * display a line on the lcd.
* *
...@@ -856,3 +868,5 @@ rt_err_t lcd_show_image(rt_uint16_t x, rt_uint16_t y, rt_uint16_t length, rt_uin ...@@ -856,3 +868,5 @@ rt_err_t lcd_show_image(rt_uint16_t x, rt_uint16_t y, rt_uint16_t length, rt_uin
return RT_EOK; return RT_EOK;
} }
#endif /* BSP_USING_LVGL */
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* *
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2018-08-14 flybreak the first version * 2018-08-14 flybreak the first version
* 2018-09-18 balanceTWK add sleep mode function * 2018-09-18 balanceTWK add sleep mode function
*/ */
#ifndef __DRV_LCD_H__ #ifndef __DRV_LCD_H__
...@@ -14,14 +14,10 @@ ...@@ -14,14 +14,10 @@
#include <rtthread.h> #include <rtthread.h>
#ifdef PKG_USING_QRCODE
#include <qrcode.h>
#endif
#define LCD_W 240 #define LCD_W 240
#define LCD_H 240 #define LCD_H 240
//POINT_COLOR #ifndef BSP_USING_LVGL
#define WHITE 0xFFFF #define WHITE 0xFFFF
#define BLACK 0x0000 #define BLACK 0x0000
#define BLUE 0x001F #define BLUE 0x001F
...@@ -42,25 +38,25 @@ ...@@ -42,25 +38,25 @@
#define GRAY240 0XF79E #define GRAY240 0XF79E
extern rt_uint16_t BACK_COLOR, FORE_COLOR; extern rt_uint16_t BACK_COLOR, FORE_COLOR;
void lcd_clear(rt_uint16_t color); void lcd_clear(rt_uint16_t color);
void lcd_address_set(rt_uint16_t x1, rt_uint16_t y1, rt_uint16_t x2, rt_uint16_t y2);
void lcd_set_color(rt_uint16_t back, rt_uint16_t fore); void lcd_set_color(rt_uint16_t back, rt_uint16_t fore);
void lcd_draw_point(rt_uint16_t x, rt_uint16_t y); void lcd_draw_point(rt_uint16_t x, rt_uint16_t y);
void lcd_draw_point_color(rt_uint16_t x, rt_uint16_t y, rt_uint16_t color); void lcd_draw_point_color(rt_uint16_t x, rt_uint16_t y, rt_uint16_t color);
void lcd_draw_circle(rt_uint16_t x0, rt_uint16_t y0, rt_uint8_t r); void lcd_draw_circle(rt_uint16_t x0, rt_uint16_t y0, rt_uint8_t r);
void lcd_draw_line(rt_uint16_t x1, rt_uint16_t y1, rt_uint16_t x2, rt_uint16_t y2); void lcd_draw_line(rt_uint16_t x1, rt_uint16_t y1, rt_uint16_t x2, rt_uint16_t y2);
void lcd_draw_rectangle(rt_uint16_t x1, rt_uint16_t y1, rt_uint16_t x2, rt_uint16_t y2); void lcd_draw_rectangle(rt_uint16_t x1, rt_uint16_t y1, rt_uint16_t x2, rt_uint16_t y2);
void lcd_fill(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_uint16_t y_end, rt_uint16_t color); void lcd_fill(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_uint16_t y_end, rt_uint16_t color);
void lcd_fill_array(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_uint16_t y_end, void *pcolor);
void lcd_show_num(rt_uint16_t x, rt_uint16_t y, rt_uint32_t num, rt_uint8_t len, rt_uint32_t size); void lcd_show_num(rt_uint16_t x, rt_uint16_t y, rt_uint32_t num, rt_uint8_t len, rt_uint32_t size);
rt_err_t lcd_show_string(rt_uint16_t x, rt_uint16_t y, rt_uint32_t size, const char *fmt, ...); rt_err_t lcd_show_string(rt_uint16_t x, rt_uint16_t y, rt_uint32_t size, const char *fmt, ...);
rt_err_t lcd_show_image(rt_uint16_t x, rt_uint16_t y, rt_uint16_t length, rt_uint16_t wide, const rt_uint8_t *p); rt_err_t lcd_show_image(rt_uint16_t x, rt_uint16_t y, rt_uint16_t length, rt_uint16_t wide, const rt_uint8_t *p);
#endif /* BSP_USING_LVGL */
void lcd_enter_sleep(void); void lcd_enter_sleep(void);
void lcd_exit_sleep(void); void lcd_exit_sleep(void);
void lcd_display_on(void); void lcd_display_on(void);
void lcd_display_off(void); void lcd_display_off(void);
void lcd_address_set(rt_uint16_t x1, rt_uint16_t y1, rt_uint16_t x2, rt_uint16_t y2);
void lcd_fill_array(rt_uint16_t x_start, rt_uint16_t y_start, rt_uint16_t x_end, rt_uint16_t y_end, void *pcolor);
#endif #endif
...@@ -186,4 +186,4 @@ __exit: ...@@ -186,4 +186,4 @@ __exit:
return result; return result;
} }
#endif #endif /* BSP_USING_LCD_QRCODE */
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <rtconfig.h> #include <rtconfig.h>
#ifdef PKG_USING_QRCODE #ifdef BSP_USING_LCD_QRCODE
#include <rtdef.h> #include <rtdef.h>
rt_err_t lcd_show_qrcode(rt_uint16_t x, rt_uint16_t y, rt_uint8_t version, rt_uint8_t ecc, const char *data, rt_uint8_t enlargement); rt_err_t lcd_show_qrcode(rt_uint16_t x, rt_uint16_t y, rt_uint8_t version, rt_uint8_t ecc, const char *data, rt_uint8_t enlargement);
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册