Fix stm32f103 ADC #4702
Merged
Fix stm32f103 ADC #4702
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
deadprogram
reviewed
Jan 15, 2025
| @@ -221,14 +221,19 @@ func (p Pin) enableClock() { | |||
|
|
|||
| // Enable peripheral clock. Expand to include all the desired peripherals | |||
| func enableAltFuncClock(bus unsafe.Pointer) { | |||
| if bus == unsafe.Pointer(stm32.USART1) { | |||
| switch bus { | |||
grudzinski
commented
Jan 15, 2025
| stm32.FLASH.ACR.SetBits(stm32.FLASH_ACR_LATENCY_WS2) // Two wait states, per datasheet | ||
| stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_PPRE1_Div2 << stm32.RCC_CFGR_PPRE1_Pos) // prescale PCLK1 = HCLK/2 | ||
| stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_PPRE2_Div1 << stm32.RCC_CFGR_PPRE2_Pos) // prescale PCLK2 = HCLK/1 | ||
| stm32.RCC.CFGR.SetBits(stm32.RCC_CFGR_ADCPRE_Div6 << stm32.RCC_CFGR_ADCPRE_Pos) // prescale ADCCLK = PCLK2/6 |
There was a problem hiding this comment.
Max ADC clock is 14Mhz, set it to 12MHz
| stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_SPI1EN) | ||
| case unsafe.Pointer(stm32.ADC1): | ||
| stm32.RCC.APB2ENR.SetBits(stm32.RCC_APB2ENR_ADC1EN) |
| @@ -23,6 +23,9 @@ func InitADC() { | |||
| // Enable ADC clock | |||
| enableAltFuncClock(unsafe.Pointer(stm32.ADC1)) | |||
|
|
|||
| // enable | |||
| stm32.ADC1.CR2.SetBits(stm32.ADC_CR2_ADON) | |||
There was a problem hiding this comment.
First switch ON the ADC, only now we can touch the ADC registers
grudzinski
commented
Jan 15, 2025
| @@ -61,7 +52,7 @@ func (a ADC) Get() uint16 { | |||
| stm32.ADC1.SQR3.SetBits(ch) | |||
|
|
|||
| // start conversion | |||
| stm32.ADC1.CR2.SetBits(stm32.ADC_CR2_SWSTART) | |||
There was a problem hiding this comment.
It work only if EXTTRIG is enabled and SWSTART is selected in EXTSEL.
| @@ -70,12 +61,6 @@ func (a ADC) Get() uint16 { | |||
| // read result as 16 bit value | |||
| result := uint16(stm32.ADC1.DR.Get()) << 4 | |||
|
|
|||
| // clear flag | |||
| stm32.ADC1.SR.ClearBits(stm32.ADC_SR_EOC) | |||
There was a problem hiding this comment.
EOC is cleared by reading the ADC_DR.
| @@ -23,15 +23,6 @@ func InitADC() { | |||
| // Enable ADC clock | |||
| enableAltFuncClock(unsafe.Pointer(stm32.ADC1)) | |||
|
|
|||
| // set scan mode | |||
There was a problem hiding this comment.
After the chip reset the ADC is already configured for "Single conversion mode". Scan mode is relevant when DMA is used.
| stm32.ADC1.SR.ClearBits(stm32.ADC_SR_EOC) | ||
|
|
||
| // clear rank | ||
| stm32.ADC1.SQR3.ClearBits(ch) |
There was a problem hiding this comment.
Redundant. It sets it to 0, means 0 channel.
|
Thank you for the fixes @grudzinski now squash/merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the issue ADC is in not working on bluepill #4691