Skip to content

H7B3: Split DAC1/2 REC, remove LPTIM45 #499

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 2 commits into from
Feb 15, 2021
Merged

Conversation

mattico
Copy link
Contributor

@mattico mattico commented Feb 13, 2021

No description provided.

@github-actions
Copy link

Memory map comparison

@mattico
Copy link
Contributor Author

mattico commented Feb 13, 2021

Hmm, removing lptims didn't work.

@github-actions
Copy link

Memory map comparison

@adamgreig
Copy link
Member

Hmm, removing lptims didn't work.

This is an annoying problem due to using YAML, but basically you have duplicated the RCC key, and only the second instance survives (the merging we do for included files can't work inside a single file). You also can't just combine the two RCC elements as the APB4* registers would then also be defined twice and only the second would survive; you need to move the _delete blocks inside the existing APB4* register blocks instead.

@github-actions
Copy link

Memory map comparison

@github-actions
Copy link

Memory map comparison

@github-actions
Copy link

Memory map comparison

@github-actions
Copy link

Memory map comparison

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.

Thanks! Looks good now. From a quick check it seems the EXTI TODO is just some enumerated values, which is a bit fiddly to remove and I don't think is a major concern for right now, so I'm going to get this merged and the release done.

I noticed the resetValues weren't taking effect because they have to be specified in a higher-level _modify block (not alongside fields), and also they are case sensitive (must be resetValue) and also it turns out they need to be specified with the names prior to renaming those registers because of how the merges work. We could probably do with better error/warning diagnostics around this sort of thing...

bors merge

@bors bors bot merged commit 6f53578 into stm32-rs:master Feb 15, 2021
@mattico mattico deleted the stm32h7-dac branch February 15, 2021 04:46
@mattico
Copy link
Contributor Author

mattico commented Feb 15, 2021

Thanks for helping to get this in before the release!

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