Merge pull request #2749 from whj4674672/master

[bsp][stm32h743-atk-apollo]add rtc

Author: BernardXiong

bsp/stm32/libraries/HAL_Drivers/drv_rtc.c

@@ -84,7 +84,9 @@ static rt_err_t set_rtc_time_stamp(time_t time_stamp)
 
 static void rt_rtc_init(void)
 {
+#ifndef SOC_SERIES_STM32H7
     __HAL_RCC_PWR_CLK_ENABLE();
+#endif
 
     RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 #ifdef BSP_RTC_USING_LSI
@@ -137,7 +139,7 @@ static rt_err_t rt_rtc_config(struct rt_device *dev)
         RTC_Handler.Init.OutPut = RTC_OUTPUT_DISABLE;
         RTC_Handler.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
         RTC_Handler.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
-#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32L4)
+#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32H7)
 
         /* set the frequency division */
 #ifdef BSP_RTC_USING_LSI

bsp/stm32/stm32h743-atk-apollo/README.md

@@ -54,7 +54,7 @@
 | SPI               |   暂不支持   |                                       |
 | I2C               |   暂不支持   |                                       |
 | SDIO              |   暂不支持   |                                       |
-| RTC               |   暂不支持   |                                       |
+| RTC               |     支持     |                                       |
 | PWM               |   暂不支持   |                                       |
 | USB Device        |   暂不支持   |                                       |
 | USB Host          |   暂不支持   |                                       |

bsp/stm32/stm32h743-atk-apollo/board/CubeMX_Config/.mxproject

@@ -1,4 +1,7 @@
 #MicroXplorer Configuration settings - do not modify
+CORTEX_M7.CPU_DCache=Enabled
+CORTEX_M7.CPU_ICache=Enabled
+CORTEX_M7.IPParameters=CPU_ICache,CPU_DCache
 DMA2D.ColorMode=DMA2D_OUTPUT_RGB565
 DMA2D.IPParameters=Mode,ColorMode
 DMA2D.Mode=DMA2D_R2M
@@ -19,87 +22,95 @@ File.Version=6
 KeepUserPlacement=false
 Mcu.Family=STM32H7
 Mcu.IP0=CORTEX_M7
-Mcu.IP1=DMA2D
-Mcu.IP2=FMC
-Mcu.IP3=LTDC
-Mcu.IP4=NVIC
-Mcu.IP5=RCC
-Mcu.IP6=SYS
-Mcu.IP7=USART1
-Mcu.IPNb=8
+Mcu.IP1=DEBUG
+Mcu.IP2=DMA2D
+Mcu.IP3=FMC
+Mcu.IP4=LTDC
+Mcu.IP5=NVIC
+Mcu.IP6=RCC
+Mcu.IP7=RTC
+Mcu.IP8=SYS
+Mcu.IP9=USART1
+Mcu.IPNb=10
 Mcu.Name=STM32H743IITx
 Mcu.Package=LQFP176
-Mcu.Pin0=PI9
-Mcu.Pin1=PI10
-Mcu.Pin10=PH1-OSC_OUT (PH1)
-Mcu.Pin11=PC0
-Mcu.Pin12=PC2_C
-Mcu.Pin13=PC3_C
-Mcu.Pin14=PF11
-Mcu.Pin15=PF12
-Mcu.Pin16=PF13
-Mcu.Pin17=PF14
-Mcu.Pin18=PF15
-Mcu.Pin19=PG0
-Mcu.Pin2=PF0
-Mcu.Pin20=PG1
-Mcu.Pin21=PE7
-Mcu.Pin22=PE8
-Mcu.Pin23=PE9
-Mcu.Pin24=PE10
-Mcu.Pin25=PE11
-Mcu.Pin26=PE12
-Mcu.Pin27=PE13
-Mcu.Pin28=PE14
-Mcu.Pin29=PE15
-Mcu.Pin3=PF1
-Mcu.Pin30=PH9
-Mcu.Pin31=PH10
-Mcu.Pin32=PH11
-Mcu.Pin33=PH12
-Mcu.Pin34=PD8
-Mcu.Pin35=PD9
-Mcu.Pin36=PD10
-Mcu.Pin37=PD14
-Mcu.Pin38=PD15
-Mcu.Pin39=PG2
-Mcu.Pin4=PF2
-Mcu.Pin40=PG4
-Mcu.Pin41=PG5
-Mcu.Pin42=PG6
-Mcu.Pin43=PG7
-Mcu.Pin44=PG8
-Mcu.Pin45=PA9
-Mcu.Pin46=PA10
-Mcu.Pin47=PH13
-Mcu.Pin48=PH14
-Mcu.Pin49=PH15
-Mcu.Pin5=PF3
-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=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=65
+Mcu.Pin0=PC13
+Mcu.Pin1=PC14-OSC32_IN (OSC32_IN)
+Mcu.Pin10=PF5
+Mcu.Pin11=PF10
+Mcu.Pin12=PH0-OSC_IN (PH0)
+Mcu.Pin13=PH1-OSC_OUT (PH1)
+Mcu.Pin14=PC0
+Mcu.Pin15=PC2_C
+Mcu.Pin16=PC3_C
+Mcu.Pin17=PF11
+Mcu.Pin18=PF12
+Mcu.Pin19=PF13
+Mcu.Pin2=PC15-OSC32_OUT (OSC32_OUT)
+Mcu.Pin20=PF14
+Mcu.Pin21=PF15
+Mcu.Pin22=PG0
+Mcu.Pin23=PG1
+Mcu.Pin24=PE7
+Mcu.Pin25=PE8
+Mcu.Pin26=PE9
+Mcu.Pin27=PE10
+Mcu.Pin28=PE11
+Mcu.Pin29=PE12
+Mcu.Pin3=PI9
+Mcu.Pin30=PE13
+Mcu.Pin31=PE14
+Mcu.Pin32=PE15
+Mcu.Pin33=PH9
+Mcu.Pin34=PH10
+Mcu.Pin35=PH11
+Mcu.Pin36=PH12
+Mcu.Pin37=PD8
+Mcu.Pin38=PD9
+Mcu.Pin39=PD10
+Mcu.Pin4=PI10
+Mcu.Pin40=PD14
+Mcu.Pin41=PD15
+Mcu.Pin42=PG2
+Mcu.Pin43=PG4
+Mcu.Pin44=PG5
+Mcu.Pin45=PG6
+Mcu.Pin46=PG7
+Mcu.Pin47=PG8
+Mcu.Pin48=PA9
+Mcu.Pin49=PA10
+Mcu.Pin5=PF0
+Mcu.Pin50=PA13 (JTMS/SWDIO)
+Mcu.Pin51=PH13
+Mcu.Pin52=PH14
+Mcu.Pin53=PH15
+Mcu.Pin54=PI0
+Mcu.Pin55=PI1
+Mcu.Pin56=PI2
+Mcu.Pin57=PA14 (JTCK/SWCLK)
+Mcu.Pin58=PD0
+Mcu.Pin59=PD1
+Mcu.Pin6=PF1
+Mcu.Pin60=PG11
+Mcu.Pin61=PG15
+Mcu.Pin62=PE0
+Mcu.Pin63=PE1
+Mcu.Pin64=PI4
+Mcu.Pin65=PI5
+Mcu.Pin66=PI6
+Mcu.Pin67=PI7
+Mcu.Pin68=VP_DMA2D_VS_DMA2D
+Mcu.Pin69=VP_RTC_VS_RTC_Activate
+Mcu.Pin7=PF2
+Mcu.Pin70=VP_SYS_VS_Systick
+Mcu.Pin8=PF3
+Mcu.Pin9=PF4
+Mcu.PinsNb=71
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32H743IITx
-MxCube.Version=5.2.0
-MxDb.Version=DB.5.0.20
+MxCube.Version=5.2.1
+MxDb.Version=DB.5.0.21
 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
@@ -114,10 +125,20 @@ 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=DEBUG_JTMS-SWDIO
+PA14\ (JTCK/SWCLK).Mode=Serial_Wire
+PA14\ (JTCK/SWCLK).Signal=DEBUG_JTCK-SWCLK
 PA9.Locked=true
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
 PC0.Signal=FMC_SDNWE
+PC13.Mode=Calibration_1Hz
+PC13.Signal=RTC_OUT_CALIB
+PC14-OSC32_IN\ (OSC32_IN).Mode=LSE-External-Oscillator
+PC14-OSC32_IN\ (OSC32_IN).Signal=RCC_OSC32_IN
+PC15-OSC32_OUT\ (OSC32_OUT).Mode=LSE-External-Oscillator
+PC15-OSC32_OUT\ (OSC32_OUT).Signal=RCC_OSC32_OUT
 PC2_C.Mode=SdramChipSelect1_1
 PC2_C.Signal=FMC_SDNE0
 PC3_C.Mode=SdramChipSelect1_1
@@ -232,7 +253,7 @@ ProjectManager.CompilerOptimize=6
 ProjectManager.ComputerToolchain=false
 ProjectManager.CoupleFile=false
 ProjectManager.CustomerFirmwarePackage=
-ProjectManager.DefaultFWLocation=true
+ProjectManager.DefaultFWLocation=false
 ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32H743IITx
 ProjectManager.FirmwarePackage=STM32Cube FW_H7 V1.4.0
@@ -252,7 +273,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=MDK-ARM V5
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_FMC_Init-FMC-false-HAL-true,6-MX_DMA2D_Init-DMA2D-false-HAL-true,7-MX_LTDC_Init-LTDC-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_FMC_Init-FMC-false-HAL-true,6-MX_DMA2D_Init-DMA2D-false-HAL-true,7-MX_LTDC_Init-LTDC-false-HAL-true,8-MX_RTC_Init-RTC-false-HAL-true
 RCC.ADCFreq_Value=50390625
 RCC.AHB12Freq_Value=200000000
 RCC.AHB4Freq_Value=200000000
@@ -298,7 +319,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,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.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,RTCClockSelection,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
@@ -310,7 +331,8 @@ 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
+RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
+RCC.RTCFreq_Value=32768
 RCC.SAI1Freq_Value=400000000
 RCC.SAI23Freq_Value=400000000
 RCC.SAI4AFreq_Value=400000000
@@ -325,7 +347,7 @@ RCC.SYSCLKFreq_VALUE=400000000
 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
 RCC.Tim1OutputFreq_Value=200000000
 RCC.Tim2OutputFreq_Value=200000000
-RCC.TraceFreq_Value=64000000
+RCC.TraceFreq_Value=400000000
 RCC.USART16Freq_Value=100000000
 RCC.USART234578Freq_Value=100000000
 RCC.USBFreq_Value=400000000
@@ -413,6 +435,8 @@ USART1.IPParameters=VirtualMode-Asynchronous
 USART1.VirtualMode-Asynchronous=VM_ASYNC
 VP_DMA2D_VS_DMA2D.Mode=DMA2D_Activate
 VP_DMA2D_VS_DMA2D.Signal=DMA2D_VS_DMA2D
+VP_RTC_VS_RTC_Activate.Mode=RTC_Enabled
+VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom