[stm32][stm32h7]修复H7 spi依赖文件路径错误的BUG

2 files changed, 29 insertions, 34 deletions

diff --git a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript
index 6fffec9894..6ae0aaca4d 100644
--- a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript
@@ -40,8 +40,8 @@ if GetDepend(['RT_USING_I2C']):
     src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_i2c_ex.c']
 
 if GetDepend(['RT_USING_SPI']):
-    src += ['STM32F7xx_HAL_Driver/Src/stm32h7xx_hal_spi.c']
-    src += ['STM32F7xx_HAL_Driver/Src/stm32h7xx_hal_qspi.c']
+    src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_spi.c']
+    src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_qspi.c']
 
 if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']):
     src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pccard.c']
diff --git a/bsp/stm32/stm32h743-atk-apollo/board/CubeMX_Config/CubeMX_Config.ioc b/bsp/stm32/stm32h743-atk-apollo/board/CubeMX_Config/CubeMX_Config.ioc
index 9c48fdb7bb..826c3dd665 100644
--- a/bsp/stm32/stm32h743-atk-apollo/board/CubeMX_Config/CubeMX_Config.ioc
+++ b/bsp/stm32/stm32h743-atk-apollo/board/CubeMX_Config/CubeMX_Config.ioc
@@ -71,37 +71,35 @@ Mcu.Pin43=PG7
 Mcu.Pin44=PG8
 Mcu.Pin45=PA9
 Mcu.Pin46=PA10
-Mcu.Pin47=PA13 (JTMS/SWDIO)
-Mcu.Pin48=PH13
-Mcu.Pin49=PH14
+Mcu.Pin47=PH13
+Mcu.Pin48=PH14
+Mcu.Pin49=PH15
 Mcu.Pin5=PF3
-Mcu.Pin50=PH15
-Mcu.Pin51=PI0
-Mcu.Pin52=PI1
-Mcu.Pin53=PI2
-Mcu.Pin54=PA14 (JTCK/SWCLK)
-Mcu.Pin55=PD0
-Mcu.Pin56=PD1
-Mcu.Pin57=PG11
-Mcu.Pin58=PG15
-Mcu.Pin59=PE0
+Mcu.Pin50=PI0
+Mcu.Pin51=PI1
+Mcu.Pin52=PI2
+Mcu.Pin53=PD0
+Mcu.Pin54=PD1
+Mcu.Pin55=PG11
+Mcu.Pin56=PG15
+Mcu.Pin57=PE0
+Mcu.Pin58=PE1
+Mcu.Pin59=PI4
 Mcu.Pin6=PF4
-Mcu.Pin60=PE1
-Mcu.Pin61=PI4
-Mcu.Pin62=PI5
-Mcu.Pin63=PI6
-Mcu.Pin64=PI7
-Mcu.Pin65=VP_DMA2D_VS_DMA2D
-Mcu.Pin66=VP_SYS_VS_Systick
+Mcu.Pin60=PI5
+Mcu.Pin61=PI6
+Mcu.Pin62=PI7
+Mcu.Pin63=VP_DMA2D_VS_DMA2D
+Mcu.Pin64=VP_SYS_VS_Systick
 Mcu.Pin7=PF5
 Mcu.Pin8=PF10
 Mcu.Pin9=PH0-OSC_IN (PH0)
-Mcu.PinsNb=67
+Mcu.PinsNb=65
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32H743IITx
-MxCube.Version=5.0.1
-MxDb.Version=DB.5.0.1
+MxCube.Version=5.2.0
+MxDb.Version=DB.5.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -116,10 +114,6 @@ NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 PA10.Locked=true
 PA10.Mode=Asynchronous
 PA10.Signal=USART1_RX
-PA13\ (JTMS/SWDIO).Mode=Serial_Wire
-PA13\ (JTMS/SWDIO).Signal=SYS_JTMS-SWDIO
-PA14\ (JTCK/SWCLK).Mode=Serial_Wire
-PA14\ (JTCK/SWCLK).Signal=SYS_JTCK-SWCLK
 PA9.Locked=true
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
@@ -128,7 +122,7 @@ PC2_C.Mode=SdramChipSelect1_1
 PC2_C.Signal=FMC_SDNE0
 PC3_C.Mode=SdramChipSelect1_1
 PC3_C.Signal=FMC_SDCKE0
-PCC.Checker=false
+PCC.Checker=true
 PCC.Line=STM32H743/753
 PCC.MCU=STM32H743IITx
 PCC.PartNumber=STM32H743IITx
@@ -232,7 +226,7 @@ PI7.Signal=LTDC_B7
 PI9.Mode=RGB565
 PI9.Signal=LTDC_VSYNC
 PinOutPanel.RotationAngle=0
-ProjectManager.AskForMigrate=false
+ProjectManager.AskForMigrate=true
 ProjectManager.BackupPrevious=false
 ProjectManager.CompilerOptimize=6
 ProjectManager.ComputerToolchain=false
@@ -241,7 +235,7 @@ ProjectManager.CustomerFirmwarePackage=
 ProjectManager.DefaultFWLocation=true
 ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32H743IITx
-ProjectManager.FirmwarePackage=STM32Cube FW_H7 V1.3.2
+ProjectManager.FirmwarePackage=STM32Cube FW_H7 V1.4.0
 ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
@@ -304,7 +298,7 @@ RCC.HRTIMFreq_Value=200000000
 RCC.HSE_VALUE=25000000
 RCC.I2C123Freq_Value=100000000
 RCC.I2C4Freq_Value=100000000
-RCC.IPParameters=ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CECFreq_Value,CKPERFreq_Value,CPU2Freq_Value,CPU2SystikFreq_Value,CortexFreq_Value,CpuClockFreq_Value,D1CPREFreq_Value,D1PPRE,D2PPRE1,D2PPRE2,D3PPRE,DFSDMACLkFreq_Value,DFSDMFreq_Value,DIVM1,DIVM3,DIVN1,DIVN3,DIVP1Freq_Value,DIVP2Freq_Value,DIVP3Freq_Value,DIVQ1Freq_Value,DIVQ2Freq_Value,DIVQ3Freq_Value,DIVR1Freq_Value,DIVR2Freq_Value,DIVR3,DIVR3Freq_Value,FDCANFreq_Value,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,HPRE,HRTIMFreq_Value,HSE_VALUE,I2C123Freq_Value,I2C4Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM345Freq_Value,LPUART1Freq_Value,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLLSourceVirtual,QSPIFreq_Value,RNGFreq_Value,RTCFreq_Value,SAI1Freq_Value,SAI23Freq_Value,SAI4AFreq_Value,SAI4BFreq_Value,SDMMCFreq_Value,SPDIFRXFreq_Value,SPI123Freq_Value,SPI45Freq_Value,SPI6Freq_Value,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16Freq_Value,USART234578Freq_Value,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value
+RCC.IPParameters=ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CECFreq_Value,CKPERFreq_Value,CPU2Freq_Value,CPU2SystikFreq_Value,CortexFreq_Value,CpuClockFreq_Value,D1CPREFreq_Value,D1PPRE,D2PPRE1,D2PPRE2,D3PPRE,DFSDMACLkFreq_Value,DFSDMFreq_Value,DIVM1,DIVM3,DIVN1,DIVN3,DIVP1Freq_Value,DIVP2Freq_Value,DIVP3Freq_Value,DIVQ1Freq_Value,DIVQ2Freq_Value,DIVQ3Freq_Value,DIVR1Freq_Value,DIVR2Freq_Value,DIVR3,DIVR3Freq_Value,FDCANFreq_Value,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,HPRE,HRTIMFreq_Value,HSE_VALUE,I2C123Freq_Value,I2C4Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM345Freq_Value,LPUART1Freq_Value,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLLSourceVirtual,PWR_Regulator_Voltage_Scale,QSPIFreq_Value,RNGFreq_Value,RTCFreq_Value,SAI1Freq_Value,SAI23Freq_Value,SAI4AFreq_Value,SAI4BFreq_Value,SDMMCFreq_Value,SPDIFRXFreq_Value,SPI123Freq_Value,SPI45Freq_Value,SPI6Freq_Value,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16Freq_Value,USART234578Freq_Value,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value
 RCC.LPTIM1Freq_Value=100000000
 RCC.LPTIM2Freq_Value=100000000
 RCC.LPTIM345Freq_Value=100000000
@@ -313,6 +307,7 @@ RCC.LTDCFreq_Value=9090909.090909092
 RCC.MCO1PinFreq_Value=64000000
 RCC.MCO2PinFreq_Value=400000000
 RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE
+RCC.PWR_Regulator_Voltage_Scale=PWR_REGULATOR_VOLTAGE_SCALE1
 RCC.QSPIFreq_Value=200000000
 RCC.RNGFreq_Value=48000000
 RCC.RTCFreq_Value=32000
@@ -330,7 +325,7 @@ RCC.SYSCLKFreq_VALUE=400000000
 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
 RCC.Tim1OutputFreq_Value=200000000
 RCC.Tim2OutputFreq_Value=200000000
-RCC.TraceFreq_Value=400000000
+RCC.TraceFreq_Value=64000000
 RCC.USART16Freq_Value=100000000
 RCC.USART234578Freq_Value=100000000
 RCC.USBFreq_Value=400000000