Fix adc initialization

Author: NU-LL

bsp/stm32/stm32l476-st-nucleo/README.md

@@ -44,7 +44,7 @@
 | IIC               |     支持     | 软件模拟 |
 | RTC               |     支持     | 支持外部晶振和内部低速时钟 |
 | SPI               |     支持     | SPI1/2/3 |
-| ADC               |     支持     |          |
+| ADC               |     支持     | ADC1_IN1/ADC2_IN2/ADC3_IN3 |
 | TIME              |     支持     | TIME15/16/17 |
 | **扩展模块**      | **支持情况** | **备注** |
 

bsp/stm32/stm32l476-st-nucleo/board/CubeMX_Config/.mxproject

@@ -15,14 +15,17 @@ Mcu.UserName=STM32L476RGTx
 SPI1.VirtualType=VM_MASTER
 SPI2.VirtualType=VM_MASTER
 PB10.Mode=Full_Duplex_Master
+ADC2.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_2
+SH.ADCx_IN2.0=ADC2_IN2,IN2-Single-Ended
 PC10.Signal=SPI3_SCK
 PC12.Signal=SPI3_MOSI
 RCC.PLLSAI1RoutputFreq_Value=64000000
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART2_UART_Init-USART2-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true,5-MX_SPI1_Init-SPI1-false-HAL-true,6-MX_SPI2_Init-SPI2-false-HAL-true,7-MX_SPI3_Init-SPI3-false-HAL-true,8-MX_TIM15_Init-TIM15-false-HAL-true,9-MX_TIM16_Init-TIM16-false-HAL-true,10-MX_TIM17_Init-TIM17-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART2_UART_Init-USART2-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true,5-MX_SPI1_Init-SPI1-false-HAL-true,6-MX_SPI2_Init-SPI2-false-HAL-true,7-MX_SPI3_Init-SPI3-false-HAL-true,8-MX_TIM15_Init-TIM15-false-HAL-true,9-MX_TIM16_Init-TIM16-false-HAL-true,10-MX_TIM17_Init-TIM17-false-HAL-true,11-MX_ADC1_Init-ADC1-false-HAL-true,12-MX_ADC2_Init-ADC2-false-HAL-true,13-MX_ADC3_Init-ADC3-false-HAL-true
 VP_RTC_VS_RTC_Activate.Mode=RTC_Enabled
 RCC.RTCFreq_Value=32768
 RCC.USART2Freq_Value=80000000
 PC15-OSC32_OUT\ (PC15).Mode=LSE-External-Oscillator
+ADC3.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_3
 PinOutPanel.RotationAngle=0
 RCC.MCO1PinFreq_Value=80000000
 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
@@ -31,56 +34,66 @@ PC14-OSC32_IN\ (PC14).Mode=LSE-External-Oscillator
 PA14\ (JTCK-SWCLK).Signal=SYS_JTCK-SWCLK
 RCC.I2C3Freq_Value=80000000
 RCC.LPTIM1Freq_Value=80000000
-Mcu.IP4=SPI2
+Mcu.IP4=RCC
 RCC.FCLKCortexFreq_Value=80000000
-Mcu.IP5=SPI3
+Mcu.IP5=RTC
+Mcu.IP2=ADC3
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-Mcu.IP2=RTC
-Mcu.IP3=SPI1
-Mcu.IP0=NVIC
-Mcu.IP1=RCC
+Mcu.IP3=NVIC
+Mcu.IP0=ADC1
+Mcu.IP1=ADC2
 Mcu.UserConstants=
 RCC.VCOSAI1OutputFreq_Value=128000000
 RCC.SDMMCFreq_Value=64000000
 Mcu.ThirdPartyNb=0
 SPI1.Direction=SPI_DIRECTION_2LINES
 RCC.HCLKFreq_Value=80000000
-Mcu.IPNb=11
+SH.ADCx_IN3.0=ADC3_IN3,IN3-Single-Ended
+Mcu.IPNb=14
 ProjectManager.PreviousToolchain=
 RCC.APB2TimFreq_Value=80000000
 SPI1.CalculateBaudRate=40.0 MBits/s
+SH.ADCx_IN3.ConfNb=1
 PC3.Signal=SPI2_MOSI
-Mcu.Pin6=PA5
+Mcu.Pin6=PA2
 RCC.SAI2Freq_Value=18285714.285714287
-Mcu.Pin7=PA6
-Mcu.Pin8=PA7
-Mcu.Pin9=PB10
+Mcu.Pin7=PA3
+Mcu.Pin8=PA5
+Mcu.Pin9=PA6
 RCC.AHBFreq_Value=80000000
 Mcu.Pin0=PC14-OSC32_IN (PC14)
 Mcu.Pin1=PC15-OSC32_OUT (PC15)
-Mcu.Pin2=PC2
-Mcu.Pin3=PC3
+Mcu.Pin2=PC0
+Mcu.Pin3=PC1
 RCC.USART3Freq_Value=80000000
-Mcu.Pin4=PA2
-Mcu.Pin5=PA3
+Mcu.Pin4=PC2
+Mcu.Pin5=PC3
+ADC1.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_1
 ProjectManager.ProjectBuild=false
 RCC.HSE_VALUE=8000000
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-Mcu.IP10=USART2
+Mcu.IP10=TIM15
 USART2.VirtualMode-Asynchronous=VM_ASYNC
-RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
+Mcu.IP12=TIM17
+Mcu.IP11=TIM16
 ProjectManager.FirmwarePackage=STM32Cube FW_L4 V1.15.1
 MxDb.Version=DB.5.0.60
+Mcu.IP13=USART2
 ProjectManager.BackupPrevious=false
 RCC.VCOInputFreq_Value=16000000
+SH.ADCx_IN1.ConfNb=1
+PB14.Mode=Full_Duplex_Master
 File.Version=6
 SPI2.CalculateBaudRate=40.0 MBits/s
+ADC3.IPParameters=Rank-0\#ChannelRegularConversion,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,OffsetNumber-0\#ChannelRegularConversion,NbrOfConversionFlag
 RCC.PLLRCLKFreq_Value=80000000
 NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 VP_TIM15_VS_ClockSourceINT.Signal=TIM15_VS_ClockSourceINT
 ProjectManager.HalAssertFull=false
+ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_2CYCLES_5
 ProjectManager.ProjectName=CubeMX_Config
 Mcu.Package=LQFP64
 PA6.Signal=SPI1_MISO
@@ -89,15 +102,20 @@ SPI3.Mode=SPI_MODE_MASTER
 ProjectManager.ToolChainLocation=
 RCC.LSI_VALUE=32000
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+ADC3.Rank-0\#ChannelRegularConversion=1
 RCC.LSCOPinFreq_Value=32000
+ADC2.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_2CYCLES_5
 RCC.DFSDMFreq_Value=80000000
 PC11.Mode=Full_Duplex_Master
+ADC3.OffsetNumber-0\#ChannelRegularConversion=ADC_OFFSET_NONE
+SH.ADCx_IN1.0=ADC1_IN1,IN1-Single-Ended
 RCC.PLLPoutputFreq_Value=22857142.85714286
 RCC.APB1TimFreq_Value=80000000
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 RCC.LPUART1Freq_Value=80000000
 SPI3.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
 SPI2.Direction=SPI_DIRECTION_2LINES
+ADC2.Rank-0\#ChannelRegularConversion=1
 PA13\ (JTMS-SWDIO).Signal=SYS_JTMS-SWDIO
 ProjectManager.CustomerFirmwarePackage=
 PA3.Signal=USART2_RX
@@ -108,30 +126,37 @@ RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSI
 PA14\ (JTCK-SWCLK).Mode=Serial_Wire
 RCC.PLLQoutputFreq_Value=80000000
 ProjectManager.ProjectFileName=CubeMX_Config.ioc
+ADC1.Rank-0\#ChannelRegularConversion=1
 PA7.Mode=Full_Duplex_Master
-Mcu.PinsNb=20
+Mcu.PinsNb=23
 ProjectManager.NoMain=false
 SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
+ADC1.IPParameters=Rank-0\#ChannelRegularConversion,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,OffsetNumber-0\#ChannelRegularConversion,NbrOfConversionFlag,master
+ADC1.OffsetNumber-0\#ChannelRegularConversion=ADC_OFFSET_NONE
 PC11.Signal=SPI3_MISO
 RCC.SWPMI1Freq_Value=80000000
-PC2.Signal=SPI2_MISO
+PC2.Signal=ADCx_IN3
 PC10.Mode=Full_Duplex_Master
 ProjectManager.DefaultFWLocation=true
-PC2.Mode=Full_Duplex_Master
 PC15-OSC32_OUT\ (PC15).Signal=RCC_OSC32_OUT
 VP_TIM16_VS_ClockSourceINT.Mode=Enable_Timer
 ProjectManager.DeletePrevious=true
+PC0.Signal=ADCx_IN1
 RCC.VCOSAI2OutputFreq_Value=128000000
 VP_TIM17_VS_ClockSourceINT.Signal=TIM17_VS_ClockSourceINT
 RCC.FamilyName=M
 PA3.Mode=Asynchronous
+ADC3.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_2CYCLES_5
 ProjectManager.TargetToolchain=MDK-ARM V5
+ADC2.IPParameters=Rank-0\#ChannelRegularConversion,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,OffsetNumber-0\#ChannelRegularConversion,NbrOfConversionFlag
 SPI2.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
 RCC.USBFreq_Value=64000000
 RCC.PLLSAI1PoutputFreq_Value=18285714.285714287
 PB10.Signal=SPI2_SCK
+PB14.Signal=SPI2_MISO
 RCC.PLLSAI2RoutputFreq_Value=64000000
 PA5.Signal=SPI1_SCK
+ADC2.OffsetNumber-0\#ChannelRegularConversion=ADC_OFFSET_NONE
 PC12.Mode=Full_Duplex_Master
 board=custom
 RCC.VCOOutputFreq_Value=160000000
@@ -144,6 +169,7 @@ RCC.I2C1Freq_Value=80000000
 SPI1.Mode=SPI_MODE_MASTER
 RCC.LCDFreq_Value=32768
 RCC.RNGFreq_Value=64000000
+SH.ADCx_IN2.ConfNb=1
 RCC.PLLSAI1QoutputFreq_Value=64000000
 RCC.ADCFreq_Value=64000000
 VP_SYS_VS_Systick.Mode=SysTick
@@ -157,13 +183,18 @@ Mcu.Name=STM32L476R(C-E-G)Tx
 RCC.LPTIM2Freq_Value=80000000
 PA2.Signal=USART2_TX
 ProjectManager.UnderRoot=false
-Mcu.IP8=TIM16
-Mcu.IP9=TIM17
-Mcu.IP6=SYS
-Mcu.IP7=TIM15
+Mcu.IP8=SPI3
+Mcu.IP9=SYS
+Mcu.IP6=SPI1
+Mcu.IP7=SPI2
 ProjectManager.CoupleFile=false
 PA13\ (JTMS-SWDIO).Mode=Serial_Wire
 RCC.SYSCLKFreq_VALUE=80000000
+Mcu.Pin22=VP_TIM17_VS_ClockSourceINT
+Mcu.Pin20=VP_TIM15_VS_ClockSourceINT
+ADC1.master=1
+Mcu.Pin21=VP_TIM16_VS_ClockSourceINT
+ADC2.NbrOfConversionFlag=1
 RCC.PLLSAI2PoutputFreq_Value=18285714.285714287
 NVIC.ForceEnableDMAVector=true
 KeepUserPlacement=false
@@ -172,25 +203,28 @@ NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 ProjectManager.CompilerOptimize=6
 VP_TIM15_VS_ClockSourceINT.Mode=Internal
 ProjectManager.HeapSize=0x200
-Mcu.Pin15=VP_RTC_VS_RTC_Activate
+Mcu.Pin15=PC10
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-Mcu.Pin16=VP_SYS_VS_Systick
-Mcu.Pin13=PC11
-Mcu.Pin14=PC12
-Mcu.Pin19=VP_TIM17_VS_ClockSourceINT
+Mcu.Pin16=PC11
+Mcu.Pin13=PA13 (JTMS-SWDIO)
+Mcu.Pin14=PA14 (JTCK-SWCLK)
+Mcu.Pin19=VP_SYS_VS_Systick
 ProjectManager.ComputerToolchain=false
-Mcu.Pin17=VP_TIM15_VS_ClockSourceINT
+Mcu.Pin17=PC12
 RCC.HSI_VALUE=16000000
-Mcu.Pin18=VP_TIM16_VS_ClockSourceINT
+Mcu.Pin18=VP_RTC_VS_RTC_Activate
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
-Mcu.Pin11=PA14 (JTCK-SWCLK)
-Mcu.Pin12=PC10
+ADC1.NbrOfConversionFlag=1
+Mcu.Pin11=PB10
+Mcu.Pin12=PB14
 RCC.PLLN=10
-Mcu.Pin10=PA13 (JTMS-SWDIO)
+Mcu.Pin10=PA7
 PA2.Mode=Asynchronous
 RCC.PWRFreq_Value=80000000
 RCC.I2C2Freq_Value=80000000
 RCC.APB1Freq_Value=80000000
+ADC3.NbrOfConversionFlag=1
 ProjectManager.DeviceId=STM32L476RGTx
+PC1.Signal=ADCx_IN2
 ProjectManager.LibraryCopy=2
 PA7.Signal=SPI1_MOSI

bsp/stm32/stm32l476-st-nucleo/board/CubeMX_Config/CubeMX_Config.ioc

@@ -49,7 +49,7 @@
   */
 
 #define HAL_MODULE_ENABLED  
-/*#define HAL_ADC_MODULE_ENABLED   */
+#define HAL_ADC_MODULE_ENABLED
 /*#define HAL_CRYP_MODULE_ENABLED   */
 /*#define HAL_CAN_MODULE_ENABLED   */
 /*#define HAL_COMP_MODULE_ENABLED   */