From 3bccfdd797054f28915af27957d0368cea41d734 Mon Sep 17 00:00:00 2001 From: zyh Date: Sat, 19 May 2018 09:58:38 +0800 Subject: [PATCH] [Bsp][STM32F4xx-HAL]fix build error default --- bsp/stm32f4xx-HAL/project.uvoptx | 470 +++++++++++++++-------------- bsp/stm32f4xx-HAL/project.uvprojx | 275 ++++++++--------- bsp/stm32f4xx-HAL/template.uvoptx | 17 +- bsp/stm32f4xx-HAL/template.uvprojx | 31 +- 4 files changed, 407 insertions(+), 386 deletions(-) diff --git a/bsp/stm32f4xx-HAL/project.uvoptx b/bsp/stm32f4xx-HAL/project.uvoptx index 737a535dc..6a0421fb7 100644 --- a/bsp/stm32f4xx-HAL/project.uvoptx +++ b/bsp/stm32f4xx-HAL/project.uvoptx @@ -101,7 +101,9 @@ 0 0 1 - 0 + 0 + 0 + 4 @@ -112,14 +114,24 @@ - BIN\UL2CM3.DLL + Segger\JL2CM3.dll + + 0 + JL2CM3 + -U -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM) + 0 UL2CM3 UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F4xx_1024 -FL0100000 -FS08000000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM) + + 0 + ST-LINKIII-KEIL_SWO + -U0664FF545449677267026033 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P2 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_256.FLM -FS08000000 -FL040000 -FP0($$Device:STM32F401RCTx$CMSIS\Flash\STM32F4xx_256.FLM) + @@ -186,7 +198,7 @@ 0 0 0 - drivers/board.c + drivers\board.c board.c 0 0 @@ -198,7 +210,7 @@ 0 0 0 - drivers/stm32f4xx_it.c + drivers\stm32f4xx_it.c stm32f4xx_it.c 0 0 @@ -210,7 +222,7 @@ 0 0 0 - drivers/drv_gpio.c + drivers\drv_gpio.c drv_gpio.c 0 0 @@ -222,7 +234,7 @@ 0 0 0 - drivers/drv_usart.c + drivers\drv_usart.c drv_usart.c 0 0 @@ -230,7 +242,7 @@ - Applications + CMSIS 0 0 0 @@ -242,8 +254,20 @@ 0 0 0 - applications/main.c - main.c + Libraries\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c + system_stm32f4xx.c + 0 + 0 + + + 2 + 6 + 2 + 0 + 0 + 0 + Libraries\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s + startup_stm32f407xx.s 0 0 @@ -257,1020 +281,1020 @@ 0 3 - 6 + 7 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c stm32f4xx_hal.c 0 0 3 - 7 + 8 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_adc.c stm32f4xx_hal_adc.c 0 0 3 - 8 + 9 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_adc_ex.c stm32f4xx_hal_adc_ex.c 0 0 3 - 9 + 10 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_can.c stm32f4xx_hal_can.c 0 0 3 - 10 + 11 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c stm32f4xx_hal_cec.c 0 0 3 - 11 + 12 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c stm32f4xx_hal_cortex.c 0 0 3 - 12 + 13 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c stm32f4xx_hal_crc.c 0 0 3 - 13 + 14 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c stm32f4xx_hal_cryp.c 0 0 3 - 14 + 15 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c stm32f4xx_hal_cryp_ex.c 0 0 3 - 15 + 16 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dac.c stm32f4xx_hal_dac.c 0 0 3 - 16 + 17 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dac_ex.c stm32f4xx_hal_dac_ex.c 0 0 3 - 17 + 18 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dcmi.c stm32f4xx_hal_dcmi.c 0 0 3 - 18 + 19 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dcmi_ex.c stm32f4xx_hal_dcmi_ex.c 0 0 3 - 19 + 20 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dfsdm.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dfsdm.c stm32f4xx_hal_dfsdm.c 0 0 3 - 20 + 21 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c stm32f4xx_hal_dma.c 0 0 3 - 21 + 22 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma2d.c stm32f4xx_hal_dma2d.c 0 0 3 - 22 + 23 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c stm32f4xx_hal_dma_ex.c 0 0 3 - 23 + 24 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dsi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dsi.c stm32f4xx_hal_dsi.c 0 0 3 - 24 + 25 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_eth.c stm32f4xx_hal_eth.c 0 0 3 - 25 + 26 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c stm32f4xx_hal_flash.c 0 0 3 - 26 + 27 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c stm32f4xx_hal_flash_ex.c 0 0 3 - 27 + 28 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c stm32f4xx_hal_flash_ramfunc.c 0 0 3 - 28 + 29 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_fmpi2c.c stm32f4xx_hal_fmpi2c.c 0 0 3 - 29 + 30 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_fmpi2c_ex.c stm32f4xx_hal_fmpi2c_ex.c 0 0 3 - 30 + 31 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c stm32f4xx_hal_gpio.c 0 0 3 - 31 + 32 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hash.c stm32f4xx_hal_hash.c 0 0 3 - 32 + 33 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hash_ex.c stm32f4xx_hal_hash_ex.c 0 0 3 - 33 + 34 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hcd.c stm32f4xx_hal_hcd.c 0 0 3 - 34 + 35 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c.c stm32f4xx_hal_i2c.c 0 0 3 - 35 + 36 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c_ex.c stm32f4xx_hal_i2c_ex.c 0 0 3 - 36 + 37 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2s.c stm32f4xx_hal_i2s.c 0 0 3 - 37 + 38 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2s_ex.c stm32f4xx_hal_i2s_ex.c 0 0 3 - 38 + 39 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_irda.c stm32f4xx_hal_irda.c 0 0 3 - 39 + 40 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_iwdg.c stm32f4xx_hal_iwdg.c 0 0 3 - 40 + 41 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_lptim.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_lptim.c stm32f4xx_hal_lptim.c 0 0 3 - 41 + 42 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_ltdc.c stm32f4xx_hal_ltdc.c 0 0 3 - 42 + 43 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_ltdc_ex.c stm32f4xx_hal_ltdc_ex.c 0 0 3 - 43 + 44 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_mmc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_mmc.c stm32f4xx_hal_mmc.c 0 0 3 - 44 + 45 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nand.c stm32f4xx_hal_nand.c 0 0 3 - 45 + 46 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nor.c stm32f4xx_hal_nor.c 0 0 3 - 46 + 47 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pccard.c stm32f4xx_hal_pccard.c 0 0 3 - 47 + 48 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pcd.c stm32f4xx_hal_pcd.c 0 0 3 - 48 + 49 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pcd_ex.c stm32f4xx_hal_pcd_ex.c 0 0 3 - 49 + 50 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c stm32f4xx_hal_pwr.c 0 0 3 - 50 + 51 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c stm32f4xx_hal_pwr_ex.c 0 0 3 - 51 + 52 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_qspi.c stm32f4xx_hal_qspi.c 0 0 3 - 52 + 53 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c stm32f4xx_hal_rcc.c 0 0 3 - 53 + 54 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c stm32f4xx_hal_rcc_ex.c 0 0 3 - 54 + 55 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c stm32f4xx_hal_rng.c 0 0 3 - 55 + 56 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rtc.c stm32f4xx_hal_rtc.c 0 0 3 - 56 + 57 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rtc_ex.c stm32f4xx_hal_rtc_ex.c 0 0 3 - 57 + 58 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sai.c stm32f4xx_hal_sai.c 0 0 3 - 58 + 59 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sai_ex.c stm32f4xx_hal_sai_ex.c 0 0 3 - 59 + 60 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sd.c stm32f4xx_hal_sd.c 0 0 3 - 60 + 61 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sdram.c stm32f4xx_hal_sdram.c 0 0 3 - 61 + 62 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_smartcard.c stm32f4xx_hal_smartcard.c 0 0 3 - 62 + 63 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_spdifrx.c stm32f4xx_hal_spdifrx.c 0 0 3 - 63 + 64 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_spi.c stm32f4xx_hal_spi.c 0 0 3 - 64 + 65 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sram.c stm32f4xx_hal_sram.c 0 0 3 - 65 + 66 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim.c stm32f4xx_hal_tim.c 0 0 3 - 66 + 67 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim_ex.c stm32f4xx_hal_tim_ex.c 0 0 3 - 67 + 68 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c stm32f4xx_hal_uart.c 0 0 3 - 68 + 69 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c stm32f4xx_hal_usart.c 0 0 3 - 69 + 70 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c stm32f4xx_hal_wwdg.c 0 0 3 - 70 + 71 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_adc.c stm32f4xx_ll_adc.c 0 0 3 - 71 + 72 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_crc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_crc.c stm32f4xx_ll_crc.c 0 0 3 - 72 + 73 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dac.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dac.c stm32f4xx_ll_dac.c 0 0 3 - 73 + 74 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dma.c stm32f4xx_ll_dma.c 0 0 3 - 74 + 75 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma2d.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dma2d.c stm32f4xx_ll_dma2d.c 0 0 3 - 75 + 76 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_exti.c stm32f4xx_ll_exti.c 0 0 3 - 76 + 77 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_fmc.c stm32f4xx_ll_fmc.c 0 0 3 - 77 + 78 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_fsmc.c stm32f4xx_ll_fsmc.c 0 0 3 - 78 + 79 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_gpio.c stm32f4xx_ll_gpio.c 0 0 3 - 79 + 80 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_i2c.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_i2c.c stm32f4xx_ll_i2c.c 0 0 3 - 80 + 81 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_lptim.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_lptim.c stm32f4xx_ll_lptim.c 0 0 3 - 81 + 82 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_pwr.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_pwr.c stm32f4xx_ll_pwr.c 0 0 3 - 82 + 83 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rcc.c stm32f4xx_ll_rcc.c 0 0 3 - 83 + 84 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rng.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rng.c stm32f4xx_ll_rng.c 0 0 3 - 84 + 85 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rtc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rtc.c stm32f4xx_ll_rtc.c 0 0 3 - 85 + 86 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_sdmmc.c stm32f4xx_ll_sdmmc.c 0 0 3 - 86 + 87 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_spi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_spi.c stm32f4xx_ll_spi.c 0 0 3 - 87 + 88 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_tim.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_tim.c stm32f4xx_ll_tim.c 0 0 3 - 88 + 89 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usart.c stm32f4xx_ll_usart.c 0 0 3 - 89 + 90 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usb.c stm32f4xx_ll_usb.c 0 0 3 - 90 + 91 1 0 0 0 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_utils.c stm32f4xx_ll_utils.c 0 0 @@ -1278,32 +1302,20 @@ - CMSIS + Applications 0 0 0 0 - - 4 - 91 - 1 - 0 - 0 - 0 - Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c - system_stm32f4xx.c - 0 - 0 - 4 92 - 2 + 1 0 0 0 - Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s - startup_stm32f407xx.s + applications\main.c + main.c 0 0 @@ -1322,7 +1334,7 @@ 0 0 0 - ../../src/clock.c + ..\..\src\clock.c clock.c 0 0 @@ -1334,7 +1346,7 @@ 0 0 0 - ../../src/components.c + ..\..\src\components.c components.c 0 0 @@ -1346,7 +1358,7 @@ 0 0 0 - ../../src/device.c + ..\..\src\device.c device.c 0 0 @@ -1358,7 +1370,7 @@ 0 0 0 - ../../src/idle.c + ..\..\src\idle.c idle.c 0 0 @@ -1370,7 +1382,7 @@ 0 0 0 - ../../src/ipc.c + ..\..\src\ipc.c ipc.c 0 0 @@ -1382,7 +1394,7 @@ 0 0 0 - ../../src/irq.c + ..\..\src\irq.c irq.c 0 0 @@ -1394,7 +1406,7 @@ 0 0 0 - ../../src/kservice.c + ..\..\src\kservice.c kservice.c 0 0 @@ -1406,7 +1418,7 @@ 0 0 0 - ../../src/mem.c + ..\..\src\mem.c mem.c 0 0 @@ -1418,7 +1430,7 @@ 0 0 0 - ../../src/memheap.c + ..\..\src\memheap.c memheap.c 0 0 @@ -1430,7 +1442,7 @@ 0 0 0 - ../../src/mempool.c + ..\..\src\mempool.c mempool.c 0 0 @@ -1442,7 +1454,7 @@ 0 0 0 - ../../src/object.c + ..\..\src\object.c object.c 0 0 @@ -1454,7 +1466,7 @@ 0 0 0 - ../../src/scheduler.c + ..\..\src\scheduler.c scheduler.c 0 0 @@ -1466,7 +1478,7 @@ 0 0 0 - ../../src/signal.c + ..\..\src\signal.c signal.c 0 0 @@ -1478,7 +1490,7 @@ 0 0 0 - ../../src/thread.c + ..\..\src\thread.c thread.c 0 0 @@ -1490,7 +1502,7 @@ 0 0 0 - ../../src/timer.c + ..\..\src\timer.c timer.c 0 0 @@ -1510,7 +1522,7 @@ 0 0 0 - ../../libcpu/arm/cortex-m4/cpuport.c + ..\..\libcpu\arm\cortex-m4\cpuport.c cpuport.c 0 0 @@ -1522,7 +1534,7 @@ 0 0 0 - ../../libcpu/arm/cortex-m4/context_rvds.S + ..\..\libcpu\arm\cortex-m4\context_rvds.S context_rvds.S 0 0 @@ -1534,7 +1546,7 @@ 0 0 0 - ../../libcpu/arm/common/backtrace.c + ..\..\libcpu\arm\common\backtrace.c backtrace.c 0 0 @@ -1546,7 +1558,7 @@ 0 0 0 - ../../libcpu/arm/common/div0.c + ..\..\libcpu\arm\common\div0.c div0.c 0 0 @@ -1558,7 +1570,7 @@ 0 0 0 - ../../libcpu/arm/common/showmem.c + ..\..\libcpu\arm\common\showmem.c showmem.c 0 0 @@ -1578,7 +1590,7 @@ 0 0 0 - ../../components/drivers/misc/pin.c + ..\..\components\drivers\misc\pin.c pin.c 0 0 @@ -1590,7 +1602,7 @@ 0 0 0 - ../../components/drivers/serial/serial.c + ..\..\components\drivers\serial\serial.c serial.c 0 0 @@ -1602,7 +1614,7 @@ 0 0 0 - ../../components/drivers/src/completion.c + ..\..\components\drivers\src\completion.c completion.c 0 0 @@ -1614,7 +1626,7 @@ 0 0 0 - ../../components/drivers/src/dataqueue.c + ..\..\components\drivers\src\dataqueue.c dataqueue.c 0 0 @@ -1626,7 +1638,7 @@ 0 0 0 - ../../components/drivers/src/pipe.c + ..\..\components\drivers\src\pipe.c pipe.c 0 0 @@ -1638,7 +1650,7 @@ 0 0 0 - ../../components/drivers/src/ringbuffer.c + ..\..\components\drivers\src\ringbuffer.c ringbuffer.c 0 0 @@ -1650,7 +1662,7 @@ 0 0 0 - ../../components/drivers/src/waitqueue.c + ..\..\components\drivers\src\waitqueue.c waitqueue.c 0 0 @@ -1662,7 +1674,7 @@ 0 0 0 - ../../components/drivers/src/workqueue.c + ..\..\components\drivers\src\workqueue.c workqueue.c 0 0 @@ -1682,7 +1694,7 @@ 0 0 0 - ../../components/finsh/shell.c + ..\..\components\finsh\shell.c shell.c 0 0 @@ -1694,7 +1706,7 @@ 0 0 0 - ../../components/finsh/symbol.c + ..\..\components\finsh\symbol.c symbol.c 0 0 @@ -1706,7 +1718,7 @@ 0 0 0 - ../../components/finsh/cmd.c + ..\..\components\finsh\cmd.c cmd.c 0 0 @@ -1718,7 +1730,7 @@ 0 0 0 - ../../components/finsh/msh.c + ..\..\components\finsh\msh.c msh.c 0 0 @@ -1730,7 +1742,7 @@ 0 0 0 - ../../components/finsh/msh_cmd.c + ..\..\components\finsh\msh_cmd.c msh_cmd.c 0 0 @@ -1742,7 +1754,7 @@ 0 0 0 - ../../components/finsh/msh_file.c + ..\..\components\finsh\msh_file.c msh_file.c 0 0 diff --git a/bsp/stm32f4xx-HAL/project.uvprojx b/bsp/stm32f4xx-HAL/project.uvprojx index f7d6ea872..0b2e76acc 100644 --- a/bsp/stm32f4xx-HAL/project.uvprojx +++ b/bsp/stm32f4xx-HAL/project.uvprojx @@ -10,13 +10,13 @@ rt-thread_stm32f4xx 0x4 ARM-ADS - 5060528::V5.06 update 5 (build 528)::ARMCC + 5060750::V5.06 update 6 (build 750)::ARMCC 0 STM32F407VGTx STMicroelectronics - Keil.STM32F4xx_DFP.2.12.0 + Keil.STM32F4xx_DFP.2.13.0 http://www.keil.com/pack IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -324,6 +324,7 @@ 0 0 0 + 0 0 0 0 @@ -336,7 +337,7 @@ USE_HAL_DRIVER, STM32F407xx - drivers;applications;.;Libraries/STM32F4xx_HAL_Driver/Inc;Libraries/CMSIS/Device/ST/STM32F4xx/Include;Libraries/CMSIS/Include;../../include;../../libcpu/arm/cortex-m4;../../libcpu/arm/common;../../components/drivers/include;../../components/drivers/include;../../components/drivers/include;../../components/finsh + drivers;Libraries\CMSIS\Device\ST\STM32F4xx\Include;Libraries\CMSIS\Include;Libraries\STM32F4xx_HAL_Driver\Inc;applications;.;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh @@ -383,32 +384,37 @@ board.c 1 - drivers/board.c + drivers\board.c stm32f4xx_it.c 1 - drivers/stm32f4xx_it.c + drivers\stm32f4xx_it.c drv_gpio.c 1 - drivers/drv_gpio.c + drivers\drv_gpio.c drv_usart.c 1 - drivers/drv_usart.c + drivers\drv_usart.c - Applications + CMSIS - main.c + system_stm32f4xx.c 1 - applications/main.c + Libraries\CMSIS\Device\ST\STM32F4xx\Source\Templates\system_stm32f4xx.c + + + startup_stm32f407xx.s + 2 + Libraries\CMSIS\Device\ST\STM32F4xx\Source\Templates\arm\startup_stm32f407xx.s @@ -418,442 +424,437 @@ stm32f4xx_hal.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c stm32f4xx_hal_adc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_adc.c stm32f4xx_hal_adc_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_adc_ex.c stm32f4xx_hal_can.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_can.c stm32f4xx_hal_cec.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cec.c stm32f4xx_hal_cortex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c stm32f4xx_hal_crc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c stm32f4xx_hal_cryp.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp.c stm32f4xx_hal_cryp_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cryp_ex.c stm32f4xx_hal_dac.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dac.c stm32f4xx_hal_dac_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dac_ex.c stm32f4xx_hal_dcmi.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dcmi.c stm32f4xx_hal_dcmi_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dcmi_ex.c stm32f4xx_hal_dfsdm.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dfsdm.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dfsdm.c stm32f4xx_hal_dma.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c stm32f4xx_hal_dma2d.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma2d.c stm32f4xx_hal_dma_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c stm32f4xx_hal_dsi.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dsi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dsi.c stm32f4xx_hal_eth.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_eth.c stm32f4xx_hal_flash.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c stm32f4xx_hal_flash_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c stm32f4xx_hal_flash_ramfunc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c stm32f4xx_hal_fmpi2c.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_fmpi2c.c stm32f4xx_hal_fmpi2c_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_fmpi2c_ex.c stm32f4xx_hal_gpio.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c stm32f4xx_hal_hash.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hash.c stm32f4xx_hal_hash_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hash_ex.c stm32f4xx_hal_hcd.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_hcd.c stm32f4xx_hal_i2c.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c.c stm32f4xx_hal_i2c_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c_ex.c stm32f4xx_hal_i2s.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2s.c stm32f4xx_hal_i2s_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2s_ex.c stm32f4xx_hal_irda.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_irda.c stm32f4xx_hal_iwdg.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_iwdg.c stm32f4xx_hal_lptim.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_lptim.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_lptim.c stm32f4xx_hal_ltdc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_ltdc.c stm32f4xx_hal_ltdc_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_ltdc_ex.c stm32f4xx_hal_mmc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_mmc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_mmc.c stm32f4xx_hal_nand.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nand.c stm32f4xx_hal_nor.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_nor.c stm32f4xx_hal_pccard.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pccard.c stm32f4xx_hal_pcd.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pcd.c stm32f4xx_hal_pcd_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pcd_ex.c stm32f4xx_hal_pwr.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c stm32f4xx_hal_pwr_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c stm32f4xx_hal_qspi.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_qspi.c stm32f4xx_hal_rcc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c stm32f4xx_hal_rcc_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c stm32f4xx_hal_rng.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rng.c stm32f4xx_hal_rtc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rtc.c stm32f4xx_hal_rtc_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rtc_ex.c stm32f4xx_hal_sai.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sai.c stm32f4xx_hal_sai_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sai_ex.c stm32f4xx_hal_sd.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sd.c stm32f4xx_hal_sdram.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sdram.c stm32f4xx_hal_smartcard.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_smartcard.c stm32f4xx_hal_spdifrx.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_spdifrx.c stm32f4xx_hal_spi.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_spi.c stm32f4xx_hal_sram.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sram.c stm32f4xx_hal_tim.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim.c stm32f4xx_hal_tim_ex.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim_ex.c stm32f4xx_hal_uart.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c stm32f4xx_hal_usart.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c stm32f4xx_hal_wwdg.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c stm32f4xx_ll_adc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_adc.c stm32f4xx_ll_crc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_crc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_crc.c stm32f4xx_ll_dac.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dac.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dac.c stm32f4xx_ll_dma.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dma.c stm32f4xx_ll_dma2d.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma2d.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dma2d.c stm32f4xx_ll_exti.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_exti.c stm32f4xx_ll_fmc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_fmc.c stm32f4xx_ll_fsmc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_fsmc.c stm32f4xx_ll_gpio.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_gpio.c stm32f4xx_ll_i2c.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_i2c.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_i2c.c stm32f4xx_ll_lptim.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_lptim.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_lptim.c stm32f4xx_ll_pwr.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_pwr.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_pwr.c stm32f4xx_ll_rcc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rcc.c stm32f4xx_ll_rng.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rng.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rng.c stm32f4xx_ll_rtc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rtc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rtc.c stm32f4xx_ll_sdmmc.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_sdmmc.c stm32f4xx_ll_spi.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_spi.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_spi.c stm32f4xx_ll_tim.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_tim.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_tim.c stm32f4xx_ll_usart.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usart.c stm32f4xx_ll_usb.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usb.c stm32f4xx_ll_utils.c 1 - Libraries/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c + Libraries\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_utils.c - CMSIS + Applications - system_stm32f4xx.c + main.c 1 - Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c - - - startup_stm32f407xx.s - 2 - Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s + applications\main.c @@ -863,77 +864,77 @@ clock.c 1 - ../../src/clock.c + ..\..\src\clock.c components.c 1 - ../../src/components.c + ..\..\src\components.c device.c 1 - ../../src/device.c + ..\..\src\device.c idle.c 1 - ../../src/idle.c + ..\..\src\idle.c ipc.c 1 - ../../src/ipc.c + ..\..\src\ipc.c irq.c 1 - ../../src/irq.c + ..\..\src\irq.c kservice.c 1 - ../../src/kservice.c + ..\..\src\kservice.c mem.c 1 - ../../src/mem.c + ..\..\src\mem.c memheap.c 1 - ../../src/memheap.c + ..\..\src\memheap.c mempool.c 1 - ../../src/mempool.c + ..\..\src\mempool.c object.c 1 - ../../src/object.c + ..\..\src\object.c scheduler.c 1 - ../../src/scheduler.c + ..\..\src\scheduler.c signal.c 1 - ../../src/signal.c + ..\..\src\signal.c thread.c 1 - ../../src/thread.c + ..\..\src\thread.c timer.c 1 - ../../src/timer.c + ..\..\src\timer.c @@ -943,27 +944,27 @@ cpuport.c 1 - ../../libcpu/arm/cortex-m4/cpuport.c + ..\..\libcpu\arm\cortex-m4\cpuport.c context_rvds.S 2 - ../../libcpu/arm/cortex-m4/context_rvds.S + ..\..\libcpu\arm\cortex-m4\context_rvds.S backtrace.c 1 - ../../libcpu/arm/common/backtrace.c + ..\..\libcpu\arm\common\backtrace.c div0.c 1 - ../../libcpu/arm/common/div0.c + ..\..\libcpu\arm\common\div0.c showmem.c 1 - ../../libcpu/arm/common/showmem.c + ..\..\libcpu\arm\common\showmem.c @@ -973,42 +974,42 @@ pin.c 1 - ../../components/drivers/misc/pin.c + ..\..\components\drivers\misc\pin.c serial.c 1 - ../../components/drivers/serial/serial.c + ..\..\components\drivers\serial\serial.c completion.c 1 - ../../components/drivers/src/completion.c + ..\..\components\drivers\src\completion.c dataqueue.c 1 - ../../components/drivers/src/dataqueue.c + ..\..\components\drivers\src\dataqueue.c pipe.c 1 - ../../components/drivers/src/pipe.c + ..\..\components\drivers\src\pipe.c ringbuffer.c 1 - ../../components/drivers/src/ringbuffer.c + ..\..\components\drivers\src\ringbuffer.c waitqueue.c 1 - ../../components/drivers/src/waitqueue.c + ..\..\components\drivers\src\waitqueue.c workqueue.c 1 - ../../components/drivers/src/workqueue.c + ..\..\components\drivers\src\workqueue.c @@ -1018,32 +1019,32 @@ shell.c 1 - ../../components/finsh/shell.c + ..\..\components\finsh\shell.c symbol.c 1 - ../../components/finsh/symbol.c + ..\..\components\finsh\symbol.c cmd.c 1 - ../../components/finsh/cmd.c + ..\..\components\finsh\cmd.c msh.c 1 - ../../components/finsh/msh.c + ..\..\components\finsh\msh.c msh_cmd.c 1 - ../../components/finsh/msh_cmd.c + ..\..\components\finsh\msh_cmd.c msh_file.c 1 - ../../components/finsh/msh_file.c + ..\..\components\finsh\msh_file.c diff --git a/bsp/stm32f4xx-HAL/template.uvoptx b/bsp/stm32f4xx-HAL/template.uvoptx index 3ef0a8275..4bd525e31 100644 --- a/bsp/stm32f4xx-HAL/template.uvoptx +++ b/bsp/stm32f4xx-HAL/template.uvoptx @@ -101,7 +101,9 @@ 0 0 1 - 5 + 0 + 0 + 4 @@ -112,18 +114,23 @@ - STLink\ST-LINKIII-KEIL_SWO.dll + Segger\JL2CM3.dll 0 - ST-LINKIII-KEIL_SWO - -U0664FF545449677267026033 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P2 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_256.FLM -FS08000000 -FL040000 -FP0($$Device:STM32F401RCTx$CMSIS\Flash\STM32F4xx_256.FLM) + JL2CM3 + -U -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM) 0 UL2CM3 - UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F4xx_256 -FL040000 -FS08000000 -FP0($$Device:STM32F401RCTx$CMSIS\Flash\STM32F4xx_256.FLM) + UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F4xx_1024 -FL0100000 -FS08000000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM) + + + 0 + ST-LINKIII-KEIL_SWO + -U0664FF545449677267026033 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P2 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_256.FLM -FS08000000 -FL040000 -FP0($$Device:STM32F401RCTx$CMSIS\Flash\STM32F4xx_256.FLM) diff --git a/bsp/stm32f4xx-HAL/template.uvprojx b/bsp/stm32f4xx-HAL/template.uvprojx index 8c56845bf..89875ab04 100644 --- a/bsp/stm32f4xx-HAL/template.uvprojx +++ b/bsp/stm32f4xx-HAL/template.uvprojx @@ -14,16 +14,16 @@ 0 - STM32F401RCTx + STM32F407VGTx STMicroelectronics - Keil.STM32F4xx_DFP.2.11.0 + Keil.STM32F4xx_DFP.2.13.0 http://www.keil.com/pack - IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE + IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_256 -FS08000000 -FL040000 -FP0($$Device:STM32F401RCTx$CMSIS\Flash\STM32F4xx_256.FLM)) + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM)) 0 - $$Device:STM32F401RCTx$Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f4xx.h + $$Device:STM32F407VGTx$Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f4xx.h @@ -33,7 +33,7 @@ - $$Device:STM32F401RCTx$CMSIS\SVD\STM32F401x.svd + $$Device:STM32F407VGTx$CMSIS\SVD\STM32F40x.svd 0 0 @@ -138,7 +138,7 @@ 1 BIN\UL2CM3.DLL - "" () + @@ -184,7 +184,7 @@ 0 0 2 - 0 + 1 0 8 0 @@ -192,7 +192,7 @@ 0 0 3 - 3 + 4 0 0 0 @@ -244,12 +244,12 @@ 0 0x20000000 - 0x10000 + 0x20000 1 0x8000000 - 0x40000 + 0x100000 0 @@ -274,7 +274,7 @@ 1 0x8000000 - 0x40000 + 0x100000 1 @@ -299,12 +299,12 @@ 0 0x20000000 - 0x10000 + 0x20000 0 - 0x0 - 0x0 + 0x10000000 + 0x10000 @@ -324,6 +324,7 @@ 0 0 0 + 0 0 0 0 -- GitLab