diff --git a/.travis.yml b/.travis.yml index 4890ddd56f..ef09eebad4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,8 +87,8 @@ env: - RTT_BSP='stm32/stm32f405-smdz-breadfruit' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32/stm32f407-atk-explorer' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32/stm32f407-st-discovery' RTT_TOOL_CHAIN='sourcery-arm' - - RTT_BSP='stm32/stm32f411-mini-system' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32/stm32f411-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm' + - RTT_BSP='stm32/stm32f411-weact-MiniF4' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32/stm32f427-robomaster-a' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32/stm32f429-armfly-v6' RTT_TOOL_CHAIN='sourcery-arm' - RTT_BSP='stm32/stm32f429-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm' diff --git a/bsp/stm32/stm32f411-mini-system/project.uvoptx b/bsp/stm32/stm32f411-mini-system/project.uvoptx deleted file mode 100644 index 5f8d0d72ba..0000000000 --- a/bsp/stm32/stm32f411-mini-system/project.uvoptx +++ /dev/null @@ -1,967 +0,0 @@ - - - - 1.0 - -
### uVision Project, (C) Keil Software
- - - *.c - *.s*; *.src; *.a* - *.obj; *.o - *.lib - *.txt; *.h; *.inc - *.plm - *.cpp - 0 - - - - 0 - 0 - - - - rtthread - 0x4 - ARM-ADS - - 12000000 - - 1 - 1 - 0 - 1 - 0 - - - 1 - 65535 - 0 - 0 - 0 - - - 79 - 66 - 8 - .\build\keil\List\ - - - 1 - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - 0 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - - - 1 - 0 - 1 - - 18 - - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 0 - 0 - 1 - 0 - 0 - 6 - - - - - - - - - - - STLink\ST-LINKIII-KEIL_SWO.dll - - - - 0 - UL2CM3 - UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F4xx_512 -FL080000 -FS08000000 -FP0($$Device:STM32F411CEUx$CMSIS\Flash\STM32F4xx_512.FLM) - - - 0 - ST-LINKIII-KEIL_SWO - -U066CFF535155878281155143 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P2 -N00("") -D00(00000000) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F411CEUx$CMSIS\Flash\STM32F4xx_512.FLM) - - - - - 0 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - 0 - 0 - 0 - - - - - - - - - - 1 - 0 - 2 - 10000000 - - - - - - Kernel - 0 - 0 - 0 - 0 - - 1 - 1 - 1 - 0 - 0 - 0 - ..\..\..\src\clock.c - clock.c - 0 - 0 - - - 1 - 2 - 1 - 0 - 0 - 0 - ..\..\..\src\components.c - components.c - 0 - 0 - - - 1 - 3 - 1 - 0 - 0 - 0 - ..\..\..\src\device.c - device.c - 0 - 0 - - - 1 - 4 - 1 - 0 - 0 - 0 - ..\..\..\src\idle.c - idle.c - 0 - 0 - - - 1 - 5 - 1 - 0 - 0 - 0 - ..\..\..\src\ipc.c - ipc.c - 0 - 0 - - - 1 - 6 - 1 - 0 - 0 - 0 - ..\..\..\src\irq.c - irq.c - 0 - 0 - - - 1 - 7 - 1 - 0 - 0 - 0 - ..\..\..\src\kservice.c - kservice.c - 0 - 0 - - - 1 - 8 - 1 - 0 - 0 - 0 - ..\..\..\src\mem.c - mem.c - 0 - 0 - - - 1 - 9 - 1 - 0 - 0 - 0 - ..\..\..\src\mempool.c - mempool.c - 0 - 0 - - - 1 - 10 - 1 - 0 - 0 - 0 - ..\..\..\src\object.c - object.c - 0 - 0 - - - 1 - 11 - 1 - 0 - 0 - 0 - ..\..\..\src\scheduler.c - scheduler.c - 0 - 0 - - - 1 - 12 - 1 - 0 - 0 - 0 - ..\..\..\src\signal.c - signal.c - 0 - 0 - - - 1 - 13 - 1 - 0 - 0 - 0 - ..\..\..\src\thread.c - thread.c - 0 - 0 - - - 1 - 14 - 1 - 0 - 0 - 0 - ..\..\..\src\timer.c - timer.c - 0 - 0 - - - - - Applications - 0 - 0 - 0 - 0 - - 2 - 15 - 1 - 0 - 0 - 0 - applications\main.c - main.c - 0 - 0 - - - - - Drivers - 0 - 0 - 0 - 0 - - 3 - 16 - 1 - 0 - 0 - 0 - board\board.c - board.c - 0 - 0 - - - 3 - 17 - 1 - 0 - 0 - 0 - board\CubeMX_Config\Src\stm32f4xx_hal_msp.c - stm32f4xx_hal_msp.c - 0 - 0 - - - 3 - 18 - 2 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f411xe.s - startup_stm32f411xe.s - 0 - 0 - - - 3 - 19 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_gpio.c - drv_gpio.c - 0 - 0 - - - 3 - 20 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_usart.c - drv_usart.c - 0 - 0 - - - 3 - 21 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_flash\drv_flash_f4.c - drv_flash_f4.c - 0 - 0 - - - 3 - 22 - 1 - 0 - 0 - 0 - ..\libraries\HAL_Drivers\drv_common.c - drv_common.c - 0 - 0 - - - - - cpu - 0 - 0 - 0 - 0 - - 4 - 23 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c - 0 - 0 - - - 4 - 24 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c - 0 - 0 - - - 4 - 25 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c - 0 - 0 - - - 4 - 26 - 1 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c - 0 - 0 - - - 4 - 27 - 2 - 0 - 0 - 0 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S - 0 - 0 - - - - - DeviceDrivers - 0 - 0 - 0 - 0 - - 5 - 28 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\misc\pin.c - pin.c - 0 - 0 - - - 5 - 29 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\serial\serial.c - serial.c - 0 - 0 - - - 5 - 30 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\completion.c - completion.c - 0 - 0 - - - 5 - 31 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c - 0 - 0 - - - 5 - 32 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c - 0 - 0 - - - 5 - 33 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 5 - 34 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c - 0 - 0 - - - 5 - 35 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c - 0 - 0 - - - 5 - 36 - 1 - 0 - 0 - 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c - 0 - 0 - - - - - finsh - 0 - 0 - 0 - 0 - - 6 - 37 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\shell.c - shell.c - 0 - 0 - - - 6 - 38 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\cmd.c - cmd.c - 0 - 0 - - - 6 - 39 - 1 - 0 - 0 - 0 - ..\..\..\components\finsh\msh.c - msh.c - 0 - 0 - - - - - libc - 0 - 0 - 0 - 0 - - 7 - 40 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\common\time.c - time.c - 0 - 0 - - - - - STM32_HAL - 0 - 0 - 0 - 0 - - 8 - 41 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c - system_stm32f4xx.c - 0 - 0 - - - 8 - 42 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c - stm32f4xx_hal.c - 0 - 0 - - - 8 - 43 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c - stm32f4xx_hal_cec.c - 0 - 0 - - - 8 - 44 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c - stm32f4xx_hal_cortex.c - 0 - 0 - - - 8 - 45 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c - stm32f4xx_hal_crc.c - 0 - 0 - - - 8 - 46 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c - stm32f4xx_hal_cryp.c - 0 - 0 - - - 8 - 47 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c - stm32f4xx_hal_cryp_ex.c - 0 - 0 - - - 8 - 48 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c - stm32f4xx_hal_dma.c - 0 - 0 - - - 8 - 49 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c - stm32f4xx_hal_dma_ex.c - 0 - 0 - - - 8 - 50 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c - stm32f4xx_hal_pwr.c - 0 - 0 - - - 8 - 51 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c - stm32f4xx_hal_pwr_ex.c - 0 - 0 - - - 8 - 52 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c - stm32f4xx_hal_rcc.c - 0 - 0 - - - 8 - 53 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c - stm32f4xx_hal_rcc_ex.c - 0 - 0 - - - 8 - 54 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c - stm32f4xx_hal_rng.c - 0 - 0 - - - 8 - 55 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c - stm32f4xx_hal_gpio.c - 0 - 0 - - - 8 - 56 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c - stm32f4xx_hal_uart.c - 0 - 0 - - - 8 - 57 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c - stm32f4xx_hal_usart.c - 0 - 0 - - - 8 - 58 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c - stm32f4xx_hal_flash.c - 0 - 0 - - - 8 - 59 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c - stm32f4xx_hal_flash_ex.c - 0 - 0 - - - 8 - 60 - 1 - 0 - 0 - 0 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c - stm32f4xx_hal_flash_ramfunc.c - 0 - 0 - - - -
diff --git a/bsp/stm32/stm32f411-mini-system/.config b/bsp/stm32/stm32f411-weact-MiniF4/.config similarity index 94% rename from bsp/stm32/stm32f411-mini-system/.config rename to bsp/stm32/stm32f411-weact-MiniF4/.config index 0fb195dd24..75e4a89e58 100644 --- a/bsp/stm32/stm32f411-mini-system/.config +++ b/bsp/stm32/stm32f411-weact-MiniF4/.config @@ -290,15 +290,6 @@ CONFIG_RT_LIBC_USING_TIME=y # # CONFIG_PKG_USING_CMBACKTRACE is not set # CONFIG_PKG_USING_EASYFLASH is not set -# CONFIG_PKG_EASYFLASH_WRITE_GRAN_1BIT is not set -# CONFIG_PKG_EASYFLASH_WRITE_GRAN_8BITS is not set -# CONFIG_PKG_EASYFLASH_WRITE_GRAN_32BITS is not set -# CONFIG_PKG_USING_EASYFLASH_V400 is not set -# CONFIG_PKG_USING_EASYFLASH_V330 is not set -# CONFIG_PKG_USING_EASYFLASH_V321 is not set -# CONFIG_PKG_USING_EASYFLASH_V310 is not set -# CONFIG_PKG_USING_EASYFLASH_V300 is not set -# CONFIG_PKG_USING_EASYFLASH_LATEST_VERSION is not set # CONFIG_PKG_USING_EASYLOGGER is not set # CONFIG_PKG_USING_SYSTEMVIEW is not set # CONFIG_PKG_USING_RDB is not set @@ -322,11 +313,6 @@ CONFIG_RT_LIBC_USING_TIME=y # CONFIG_PKG_USING_LWEXT4 is not set # CONFIG_PKG_USING_PARTITION is not set # CONFIG_PKG_USING_FAL is not set -# CONFIG_PKG_USING_FAL_V00400 is not set -# CONFIG_PKG_USING_FAL_V00300 is not set -# CONFIG_PKG_USING_FAL_V00200 is not set -# CONFIG_PKG_USING_FAL_V00100 is not set -# CONFIG_PKG_USING_FAL_LATEST_VERSION is not set # CONFIG_PKG_USING_SQLITE is not set # CONFIG_PKG_USING_RTI is not set # CONFIG_PKG_USING_LITTLEVGL2RTT is not set @@ -430,7 +416,10 @@ CONFIG_BSP_USING_UART1=y # CONFIG_BSP_USING_I2C1 is not set # CONFIG_BSP_USING_SPI is not set # CONFIG_BSP_USING_TIM is not set -CONFIG_BSP_USING_ON_CHIP_FLASH=y +# CONFIG_BSP_USING_ON_CHIP_FLASH is not set +# CONFIG_BSP_USING_USBD is not set +# CONFIG_BSP_USING_RNG is not set +# CONFIG_BSP_USING_UDID is not set # # Board extended module Drivers diff --git a/bsp/stm32/stm32f411-mini-system/.cproject b/bsp/stm32/stm32f411-weact-MiniF4/.cproject similarity index 100% rename from bsp/stm32/stm32f411-mini-system/.cproject rename to bsp/stm32/stm32f411-weact-MiniF4/.cproject diff --git a/bsp/stm32/stm32f411-mini-system/.gitignore b/bsp/stm32/stm32f411-weact-MiniF4/.gitignore similarity index 100% rename from bsp/stm32/stm32f411-mini-system/.gitignore rename to bsp/stm32/stm32f411-weact-MiniF4/.gitignore diff --git a/bsp/stm32/stm32f411-mini-system/.project b/bsp/stm32/stm32f411-weact-MiniF4/.project similarity index 98% rename from bsp/stm32/stm32f411-mini-system/.project rename to bsp/stm32/stm32f411-weact-MiniF4/.project index b1bc357d5e..b9bfde6b48 100644 --- a/bsp/stm32/stm32f411-mini-system/.project +++ b/bsp/stm32/stm32f411-weact-MiniF4/.project @@ -1,6 +1,6 @@ - stm32f411-mini-system + stm32f411-weact-MiniF4 diff --git a/bsp/stm32/stm32f411-mini-system/.settings/language.settings.xml b/bsp/stm32/stm32f411-weact-MiniF4/.settings/language.settings.xml similarity index 100% rename from bsp/stm32/stm32f411-mini-system/.settings/language.settings.xml rename to bsp/stm32/stm32f411-weact-MiniF4/.settings/language.settings.xml diff --git a/bsp/stm32/stm32f411-mini-system/.settings/org.eclipse.core.runtime.prefs b/bsp/stm32/stm32f411-weact-MiniF4/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from bsp/stm32/stm32f411-mini-system/.settings/org.eclipse.core.runtime.prefs rename to bsp/stm32/stm32f411-weact-MiniF4/.settings/org.eclipse.core.runtime.prefs diff --git a/bsp/stm32/stm32f411-mini-system/Kconfig b/bsp/stm32/stm32f411-weact-MiniF4/Kconfig similarity index 100% rename from bsp/stm32/stm32f411-mini-system/Kconfig rename to bsp/stm32/stm32f411-weact-MiniF4/Kconfig diff --git a/bsp/stm32/stm32f411-mini-system/README.md b/bsp/stm32/stm32f411-weact-MiniF4/README.md similarity index 93% rename from bsp/stm32/stm32f411-mini-system/README.md rename to bsp/stm32/stm32f411-weact-MiniF4/README.md index 84e3413812..d06461357e 100644 --- a/bsp/stm32/stm32f411-mini-system/README.md +++ b/bsp/stm32/stm32f411-weact-MiniF4/README.md @@ -1,8 +1,8 @@ -# STM32F411-mini-system 开发板 BSP 说明 +# stm32f411-weact-MiniF4 开发板 BSP 说明 ## 简介 -本文档为 STM32F411-mini-system 开发板提供的 BSP (板级支持包) 说明。 +本文档为 stm32f411-weact-MiniF4 开发板提供的 BSP (板级支持包) 说明。 主要内容如下: @@ -14,7 +14,7 @@ ## 开发板介绍 -STM32F411-mini-system 是 WeAct 推出的一款基于 ARM Cortex-M4 内核的开发板,最高主频为 100Mhz,该开发板芯片为 STM32F411CE。 +stm32f411-weact-MiniF4 是 WeAct 推出的一款基于 ARM Cortex-M4 内核的开发板,最高主频为 100Mhz,该开发板芯片为 STM32F411CE。 开发板外观如下图所示: diff --git a/bsp/stm32/stm32f411-mini-system/SConscript b/bsp/stm32/stm32f411-weact-MiniF4/SConscript similarity index 100% rename from bsp/stm32/stm32f411-mini-system/SConscript rename to bsp/stm32/stm32f411-weact-MiniF4/SConscript diff --git a/bsp/stm32/stm32f411-mini-system/SConstruct b/bsp/stm32/stm32f411-weact-MiniF4/SConstruct similarity index 100% rename from bsp/stm32/stm32f411-mini-system/SConstruct rename to bsp/stm32/stm32f411-weact-MiniF4/SConstruct diff --git a/bsp/stm32/stm32f411-mini-system/applications/SConscript b/bsp/stm32/stm32f411-weact-MiniF4/applications/SConscript similarity index 100% rename from bsp/stm32/stm32f411-mini-system/applications/SConscript rename to bsp/stm32/stm32f411-weact-MiniF4/applications/SConscript diff --git a/bsp/stm32/stm32f411-mini-system/applications/main.c b/bsp/stm32/stm32f411-weact-MiniF4/applications/main.c similarity index 100% rename from bsp/stm32/stm32f411-mini-system/applications/main.c rename to bsp/stm32/stm32f411-weact-MiniF4/applications/main.c diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/.mxproject b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/.mxproject similarity index 97% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/.mxproject rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/.mxproject index 8683581515..30e034ac98 100644 --- a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/.mxproject +++ b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/.mxproject @@ -1,7 +1,7 @@ [PreviousGenFiles] -HeaderPath=D:/Files/github/my-rt-thread/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Inc +HeaderPath=D:/Files/github/my-rt-thread/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Inc HeaderFiles=stm32f4xx_it.h;stm32f4xx_hal_conf.h;main.h; -SourcePath=D:/Files/github/my-rt-thread/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src +SourcePath=D:/Files/github/my-rt-thread/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src SourceFiles=stm32f4xx_it.c;stm32f4xx_hal_msp.c;main.c; [PreviousLibFiles] diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/CubeMX_Config.ioc b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/CubeMX_Config.ioc similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/CubeMX_Config.ioc rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/CubeMX_Config.ioc diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Inc/main.h b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Inc/main.h similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Inc/main.h rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Inc/main.h diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Inc/stm32f4xx_hal_conf.h diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Inc/stm32f4xx_it.h b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Inc/stm32f4xx_it.h similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Inc/stm32f4xx_it.h rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Inc/stm32f4xx_it.h diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src/main.c b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src/main.c similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src/main.c rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src/main.c diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src/stm32f4xx_hal_msp.c diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src/stm32f4xx_it.c b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src/stm32f4xx_it.c similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src/stm32f4xx_it.c rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src/stm32f4xx_it.c diff --git a/bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src/system_stm32f4xx.c b/bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src/system_stm32f4xx.c similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/CubeMX_Config/Src/system_stm32f4xx.c rename to bsp/stm32/stm32f411-weact-MiniF4/board/CubeMX_Config/Src/system_stm32f4xx.c diff --git a/bsp/stm32/stm32f411-mini-system/board/Kconfig b/bsp/stm32/stm32f411-weact-MiniF4/board/Kconfig similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/Kconfig rename to bsp/stm32/stm32f411-weact-MiniF4/board/Kconfig diff --git a/bsp/stm32/stm32f411-mini-system/board/SConscript b/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/SConscript rename to bsp/stm32/stm32f411-weact-MiniF4/board/SConscript diff --git a/bsp/stm32/stm32f411-mini-system/board/board.c b/bsp/stm32/stm32f411-weact-MiniF4/board/board.c similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/board.c rename to bsp/stm32/stm32f411-weact-MiniF4/board/board.c diff --git a/bsp/stm32/stm32f411-mini-system/board/board.h b/bsp/stm32/stm32f411-weact-MiniF4/board/board.h similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/board.h rename to bsp/stm32/stm32f411-weact-MiniF4/board/board.h diff --git a/bsp/stm32/stm32f411-mini-system/board/linker_scripts/link.icf b/bsp/stm32/stm32f411-weact-MiniF4/board/linker_scripts/link.icf similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/linker_scripts/link.icf rename to bsp/stm32/stm32f411-weact-MiniF4/board/linker_scripts/link.icf diff --git a/bsp/stm32/stm32f411-mini-system/board/linker_scripts/link.lds b/bsp/stm32/stm32f411-weact-MiniF4/board/linker_scripts/link.lds similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/linker_scripts/link.lds rename to bsp/stm32/stm32f411-weact-MiniF4/board/linker_scripts/link.lds diff --git a/bsp/stm32/stm32f411-mini-system/board/linker_scripts/link.sct b/bsp/stm32/stm32f411-weact-MiniF4/board/linker_scripts/link.sct similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/linker_scripts/link.sct rename to bsp/stm32/stm32f411-weact-MiniF4/board/linker_scripts/link.sct diff --git a/bsp/stm32/stm32f411-mini-system/board/ports/fal_cfg.h b/bsp/stm32/stm32f411-weact-MiniF4/board/ports/fal_cfg.h similarity index 100% rename from bsp/stm32/stm32f411-mini-system/board/ports/fal_cfg.h rename to bsp/stm32/stm32f411-weact-MiniF4/board/ports/fal_cfg.h diff --git a/bsp/stm32/stm32f411-mini-system/figures/board.png b/bsp/stm32/stm32f411-weact-MiniF4/figures/board.png similarity index 100% rename from bsp/stm32/stm32f411-mini-system/figures/board.png rename to bsp/stm32/stm32f411-weact-MiniF4/figures/board.png diff --git a/bsp/stm32/stm32f411-mini-system/makefile.targets b/bsp/stm32/stm32f411-weact-MiniF4/makefile.targets similarity index 100% rename from bsp/stm32/stm32f411-mini-system/makefile.targets rename to bsp/stm32/stm32f411-weact-MiniF4/makefile.targets diff --git a/bsp/stm32/stm32f411-mini-system/project.ewd b/bsp/stm32/stm32f411-weact-MiniF4/project.ewd similarity index 100% rename from bsp/stm32/stm32f411-mini-system/project.ewd rename to bsp/stm32/stm32f411-weact-MiniF4/project.ewd diff --git a/bsp/stm32/stm32f411-mini-system/project.ewp b/bsp/stm32/stm32f411-weact-MiniF4/project.ewp similarity index 100% rename from bsp/stm32/stm32f411-mini-system/project.ewp rename to bsp/stm32/stm32f411-weact-MiniF4/project.ewp diff --git a/bsp/stm32/stm32f411-mini-system/project.eww b/bsp/stm32/stm32f411-weact-MiniF4/project.eww similarity index 100% rename from bsp/stm32/stm32f411-mini-system/project.eww rename to bsp/stm32/stm32f411-weact-MiniF4/project.eww diff --git a/bsp/stm32/stm32f411-mini-system/project.uvopt b/bsp/stm32/stm32f411-weact-MiniF4/project.uvopt similarity index 100% rename from bsp/stm32/stm32f411-mini-system/project.uvopt rename to bsp/stm32/stm32f411-weact-MiniF4/project.uvopt diff --git a/bsp/stm32/stm32f411-mini-system/template.uvoptx b/bsp/stm32/stm32f411-weact-MiniF4/project.uvoptx similarity index 100% rename from bsp/stm32/stm32f411-mini-system/template.uvoptx rename to bsp/stm32/stm32f411-weact-MiniF4/project.uvoptx diff --git a/bsp/stm32/stm32f411-mini-system/project.uvprojx b/bsp/stm32/stm32f411-weact-MiniF4/project.uvprojx similarity index 87% rename from bsp/stm32/stm32f411-mini-system/project.uvprojx rename to bsp/stm32/stm32f411-weact-MiniF4/project.uvprojx index 0e2d3e3f11..e16b3651e2 100644 --- a/bsp/stm32/stm32f411-mini-system/project.uvprojx +++ b/bsp/stm32/stm32f411-weact-MiniF4/project.uvprojx @@ -1,10 +1,7 @@ - 2.1 -
### uVision Project, (C) Keil Software
- rtthread @@ -19,28 +16,28 @@ Keil.STM32F4xx_DFP.2.14.0 http://www.keil.com/pack/ IRAM(0x20000000,0x00020000) IROM(0x08000000,0x00080000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_512 -FS08000000 -FL080000 -FP0($$Device:STM32F411CEUx$CMSIS\Flash\STM32F4xx_512.FLM)) 0 $$Device:STM32F411CEUx$Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f4xx.h - - - - - - - - - + + + + + + + + + $$Device:STM32F411CEUx$CMSIS\SVD\STM32F411xx.svd 0 0 - - - - - + + + + + 0 0 @@ -62,8 +59,8 @@ 0 0 - - + + 0 0 0 @@ -72,8 +69,8 @@ 0 0 - - + + 0 0 0 @@ -83,14 +80,14 @@ 1 0 fromelf --bin !L --output rtthread.bin - + 0 0 0 0 0 - + 0 @@ -104,8 +101,8 @@ 0 0 3 - - + + 1 @@ -138,11 +135,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -175,7 +172,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -307,7 +304,7 @@ 0x0 - + 1 @@ -334,10 +331,10 @@ 0 0 - + USE_HAL_DRIVER, STM32F411xE - - .;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\libraries\HAL_Drivers\drv_flash;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include + + .;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;board\ports;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Inc;..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Include;..\libraries\STM32F4xx_HAL\CMSIS\Include @@ -352,10 +349,10 @@ 0 0 - - - - + + + + @@ -367,13 +364,13 @@ 0 0x08000000 0x20000000 - + .\board\linker_scripts\link.sct - - - - - + + + + + @@ -386,66 +383,92 @@ 1 ..\..\..\src\clock.c + + components.c 1 ..\..\..\src\components.c + + device.c 1 ..\..\..\src\device.c + + idle.c 1 ..\..\..\src\idle.c + + ipc.c 1 ..\..\..\src\ipc.c + + irq.c 1 ..\..\..\src\irq.c + + kservice.c 1 ..\..\..\src\kservice.c + + mem.c 1 ..\..\..\src\mem.c + + mempool.c 1 ..\..\..\src\mempool.c + + object.c 1 ..\..\..\src\object.c + + scheduler.c 1 ..\..\..\src\scheduler.c + + signal.c 1 ..\..\..\src\signal.c + + thread.c 1 ..\..\..\src\thread.c + + timer.c 1 @@ -471,31 +494,36 @@ 1 board\board.c + + stm32f4xx_hal_msp.c 1 board\CubeMX_Config\Src\stm32f4xx_hal_msp.c + + startup_stm32f411xe.s 2 ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f411xe.s + + drv_gpio.c 1 ..\libraries\HAL_Drivers\drv_gpio.c + + drv_usart.c 1 ..\libraries\HAL_Drivers\drv_usart.c - - drv_flash_f4.c - 1 - ..\libraries\HAL_Drivers\drv_flash\drv_flash_f4.c - + + drv_common.c 1 @@ -511,21 +539,29 @@ 1 ..\..\..\libcpu\arm\common\backtrace.c + + div0.c 1 ..\..\..\libcpu\arm\common\div0.c + + showmem.c 1 ..\..\..\libcpu\arm\common\showmem.c + + cpuport.c 1 ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + context_rvds.S 2 @@ -541,41 +577,57 @@ 1 ..\..\..\components\drivers\misc\pin.c + + serial.c 1 ..\..\..\components\drivers\serial\serial.c + + completion.c 1 ..\..\..\components\drivers\src\completion.c + + dataqueue.c 1 ..\..\..\components\drivers\src\dataqueue.c + + pipe.c 1 ..\..\..\components\drivers\src\pipe.c + + ringblk_buf.c 1 ..\..\..\components\drivers\src\ringblk_buf.c + + ringbuffer.c 1 ..\..\..\components\drivers\src\ringbuffer.c + + waitqueue.c 1 ..\..\..\components\drivers\src\waitqueue.c + + workqueue.c 1 @@ -591,11 +643,15 @@ 1 ..\..\..\components\finsh\shell.c + + cmd.c 1 ..\..\..\components\finsh\cmd.c + + msh.c 1 @@ -621,111 +677,126 @@ 1 ..\libraries\STM32F4xx_HAL\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c + + stm32f4xx_hal.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c + + stm32f4xx_hal_cec.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c + + stm32f4xx_hal_cortex.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c + + stm32f4xx_hal_crc.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c + + stm32f4xx_hal_cryp.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c + + stm32f4xx_hal_cryp_ex.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c + + stm32f4xx_hal_dma.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c + + stm32f4xx_hal_dma_ex.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c + + stm32f4xx_hal_pwr.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c + + stm32f4xx_hal_pwr_ex.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c + + stm32f4xx_hal_rcc.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c + + stm32f4xx_hal_rcc_ex.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c + + stm32f4xx_hal_rng.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c + + stm32f4xx_hal_gpio.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + + stm32f4xx_hal_uart.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c + + stm32f4xx_hal_usart.c 1 ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c - - stm32f4xx_hal_flash.c - 1 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c - - - stm32f4xx_hal_flash_ex.c - 1 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c - - - stm32f4xx_hal_flash_ramfunc.c - 1 - ..\libraries\STM32F4xx_HAL\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c - - - - - + + + -
diff --git a/bsp/stm32/stm32f411-mini-system/rtconfig.h b/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.h similarity index 98% rename from bsp/stm32/stm32f411-mini-system/rtconfig.h rename to bsp/stm32/stm32f411-weact-MiniF4/rtconfig.h index 0c4e40cec2..c159ea6b39 100644 --- a/bsp/stm32/stm32f411-mini-system/rtconfig.h +++ b/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.h @@ -162,7 +162,6 @@ #define BSP_USING_GPIO #define BSP_USING_UART #define BSP_USING_UART1 -#define BSP_USING_ON_CHIP_FLASH /* Board extended module Drivers */ diff --git a/bsp/stm32/stm32f411-mini-system/rtconfig.py b/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.py similarity index 100% rename from bsp/stm32/stm32f411-mini-system/rtconfig.py rename to bsp/stm32/stm32f411-weact-MiniF4/rtconfig.py diff --git a/bsp/stm32/stm32f411-mini-system/template.ewp b/bsp/stm32/stm32f411-weact-MiniF4/template.ewp similarity index 100% rename from bsp/stm32/stm32f411-mini-system/template.ewp rename to bsp/stm32/stm32f411-weact-MiniF4/template.ewp diff --git a/bsp/stm32/stm32f411-mini-system/template.eww b/bsp/stm32/stm32f411-weact-MiniF4/template.eww similarity index 100% rename from bsp/stm32/stm32f411-mini-system/template.eww rename to bsp/stm32/stm32f411-weact-MiniF4/template.eww diff --git a/bsp/stm32/stm32f411-mini-system/template.uvopt b/bsp/stm32/stm32f411-weact-MiniF4/template.uvopt similarity index 100% rename from bsp/stm32/stm32f411-mini-system/template.uvopt rename to bsp/stm32/stm32f411-weact-MiniF4/template.uvopt diff --git a/bsp/stm32/stm32f411-weact-MiniF4/template.uvoptx b/bsp/stm32/stm32f411-weact-MiniF4/template.uvoptx new file mode 100644 index 0000000000..60c8676254 --- /dev/null +++ b/bsp/stm32/stm32f411-weact-MiniF4/template.uvoptx @@ -0,0 +1,191 @@ + + + + 1.0 + +
### uVision Project, (C) Keil Software
+ + + *.c + *.s*; *.src; *.a* + *.obj; *.o + *.lib + *.txt; *.h; *.inc + *.plm + *.cpp + 0 + + + + 0 + 0 + + + + rtthread + 0x4 + ARM-ADS + + 12000000 + + 1 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + .\build\keil\List\ + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 0 + 0 + 1 + + 18 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 6 + + + + + + + + + + + STLink\ST-LINKIII-KEIL_SWO.dll + + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F4xx_512 -FL080000 -FS08000000 -FP0($$Device:STM32F411CEUx$CMSIS\Flash\STM32F4xx_512.FLM) + + + 0 + ST-LINKIII-KEIL_SWO + -U066CFF535155878281155143 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P2 -N00("") -D00(00000000) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F411CEUx$CMSIS\Flash\STM32F4xx_512.FLM) + + + + + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + 1 + 0 + 2 + 10000000 + + + + + + Source Group 1 + 0 + 0 + 0 + 0 + + +
diff --git a/bsp/stm32/stm32f411-mini-system/template.uvprojx b/bsp/stm32/stm32f411-weact-MiniF4/template.uvprojx similarity index 100% rename from bsp/stm32/stm32f411-mini-system/template.uvprojx rename to bsp/stm32/stm32f411-weact-MiniF4/template.uvprojx