Skip to content

Rework regular conversion to allow use with external trigger and avoid reconfiguration for each sample #4786

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 61 commits into
base: main
Choose a base branch
from
Open

Rework regular conversion to allow use with external trigger and avoid reconfiguration for each sample #4786

wants to merge 61 commits into from

Conversation

@Jacke-debug
Copy link
Contributor

This PR is based on the changes in #4243 which introduces configuration of injected ADC measurements. This PR expands the ADC module for STM32 g4 processors to support both injected and regular ADC conversions.

  • Add methods for configuring ADC Regular conversions with external trigger
  • Add example to showcase how both regular and injected ADC conversions can be used simultaneously
  • Left the old ADC read() method as it was for backwards compatibility

Jacke-debug and others added 30 commits April 28, 2025 20:11
@Jacke-debug
Add method to enable interrupts in complementary pwm
484410c
@Jacke-debug
Add complementary pwm method to clear interrupt flag
787fed4
@Jacke-debug
Add complementary pwm method to clear interrupt flag
8b5ae35
@Jacke-debug
Merge branch 'main' of https://github.com/Jacke-debug/embassy
63ae8b9
@Jacke-debug
Make rx_dma mutable in g4s adc read method
d1ac54a
@Jacke-debug
Revert "Make rx_dma mutable in g4s adc read method"
4d67f38 
This reverts commit d1ac54a.
@Jacke-debug
Add support for dual adc and injected sampling based on interrupts
1bff856
@Jacke-debug
Fix datatype u8 to usize
176fa86
@Jacke-debug
Fix formatting
edbe1d2
@Jacke-debug
Add function to enable atuoreload_preload
415b058
@Jacke-debug
Add method for setting preload enable for the compare channels
084a839
@Jacke-debug
Add code so setting autoreload also triggers update event
f68ec82
@Jacke-debug
Fix index in preload_enable
0c8934d
@Jacke-debug
Add method for setting repetition counter
18ae044
@Jacke-debug
Remove duplicated code
757d783
@Jacke-debug
Merge branch 'main' of https://github.com/Jacke-debug/embassy
1088056
@Jacke-debug
Update get_max_duty to handle center aligned PWM mode correctly
e30e344
@Jacke-debug
Merge branch 'timer_auto_reload'
2388860
@Jacke-debug
Add complementary pwm method for setting moe bit
13dc86e
@clubby789
stm32/adc/v3: Add method to sample ADC without reconfiguring every time
66ea955
@Jacke-debug
Merge branch 'main' into add_support_for_dual_mode_injected_sampling
1e4ba80
@Jacke-debug
Re-add accidentally removed constant
a8098f1
@Jacke-debug
Merge branch 'main' into add_support_for_dual_mode_injected_sampling
5a0a6f5
@Jacke-debug
Add methods for setting ossi, ossr, osi and oisn along with software …
109cc01 
…trigger for break input
@Jacke-debug
Add get methods for meo, ossi and ossr
18d6071
@Jacke-debug
Change method arugments to be non-mutable
26822b1
@Jacke-debug
Add enum for IdlePolarity to make interface clearer for set_output_id…
b627ab6 
…le_state method
@Jacke-debug
Adjust which methods should have mut reference to self. Change set_ou…
6b05e6c 
…tput_idle_state to accept channel iterator as input
@Jacke-debug
Merge remote-tracking branch 'origin/main' into add_support_for_dual_…
4cef0e4 
…mode_injected_sampling
@Jacke-debug
Merge branch 'main' into add_support_for_dual_mode_injected_sampling
2d51551
lulf and others added 17 commits September 17, 2025 11:31
@lulf
Merge branch 'main' into add_support_for_dual_mode_injected_sampling
0947061
@Jacke-debug
Remove incorrect config for regular channels in injected channel setup
387ea98
@Jacke-debug
Merge branch 'add_support_for_dual_mode_injected_sampling' of https:/…
060bb35 
…/github.com/WattStep/embassy into add_support_for_dual_mode_injected_sampling
@Jacke-debug
Remove incorrect config of registers connected to regular conversions
0df6354
@Jacke-debug
Merge branch 'main' into add_support_for_dual_mode_injected_sampling
024b922
@Jacke-debug
Merge branch 'main' into regular_and_injected_adc
88f1002
@Jacke-debug
Merge branch 'add_support_for_dual_mode_injected_sampling' into regul…
dce2dd5 
…ar_and_injected_adc
@Jacke-debug
Break up regular ADC reading method for g4 in two parts to avoid reco…
de442a1 
…nfiguring of DMA and adc channels for each read
@Jacke-debug
break apart methods
9ebd5cb
@Jacke-debug
Add missing import
0327708
@Jacke-debug
Jadstp uses adstp enum
4eb4560
@Jacke-debug
Check length condition outside of setup
e9009aa
@Jacke-debug
Regular and inejcted conversions now work based on timer trigger usin…
b9571bf 
…g RingBuffer for regular conversions.
@Jacke-debug
Cleanup code and add doc comments.
05ed966
@Jacke-debug
Restore cargo config settings in example code.
935bfdf
@Jacke-debug
Restore adc v3
e32508c
@Jacke-debug
cargo fmt
7a7fe46
@Jacke-debug Jacke-debug mentioned this pull request Oct 25, 2025
Open
@Jacke-debug Jacke-debug mentioned this pull request Oct 27, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Jacke-debug @clubby789 @lulf