Skip to content

stm32wb: ADC -> ADC1 and add ADC_COMMON #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2021

Conversation

karlp
Copy link
Contributor

@karlp karlp commented Sep 8, 2021

As is commonly done, use "ADC1" even when there's only one ADC. This
makes it not only more self consistent, (interrupt names were for ADC1)
but also more consistent with sibling targets like STM32L4.

Also, like the L4, the WB svd is missing the ADC_Common registers. Add
them back in, but note that there's less bits in the common registers.

Signed-off-by: Karl Palsson karlp@etactica.com

@github-actions
Copy link

github-actions bot commented Sep 8, 2021

Memory map comparison

@karlp karlp force-pushed the stm32wb-adc-common branch from e834817 to 8668d01 Compare September 8, 2021 14:28
@github-actions
Copy link

github-actions bot commented Sep 8, 2021

Memory map comparison

@karlp
Copy link
Contributor Author

karlp commented Sep 8, 2021

Hrm, that memory map comparison is neat, looks like CCR was already there, btu underneath ADC1 itself. I'll try and remove them out.

As is commonly done, use "ADC1" even when there's only one ADC.  This
makes it not only more self consistent, (interrupt names were for ADC1)
but also more consistent with sibling targets like STM32L4.

Also, like the L4, the WB svd is missing the ADC_Common registers.  Add
them back in, but note that there's less bits in the common registers.
Note that CCR _is_ defined, but as part of the core block, so we have to
delete it from there as well.

Signed-off-by: Karl Palsson <karlp@etactica.com>
@karlp karlp force-pushed the stm32wb-adc-common branch from 8668d01 to befbfb5 Compare September 8, 2021 15:23
@github-actions
Copy link

github-actions bot commented Sep 8, 2021

Memory map comparison

@karlp
Copy link
Contributor Author

karlp commented Sep 8, 2021

Ok, that's good now. I could easily be conviced to drop the renames of the CH17SEL/CH18SEL, but those names match the ref man, and the L4 implelmentation

Copy link
Member

@adamgreig adamgreig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thank you!

bors merge

@bors bors bot merged commit 7a1d92e into stm32-rs:master Sep 8, 2021
@karlp karlp deleted the stm32wb-adc-common branch September 9, 2021 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants