Skip to content

fix: stm32l47*/stm32l48* adc analog pin setup #4967

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

Merged
merged 2 commits into from
Dec 1, 2025
+12 −7
Merged

fix: stm32l47*/stm32l48* adc analog pin setup #4967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6d6538
fix: stm32l47*/stm32l48* adc analog pin setup
hjeldin Nov 30, 2025
20a0f1b
chore: update changelog
hjeldin Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions embassy-stm32/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- feat: stm32/lcd: added implementation
- change: add error messages to can timing calculations ([#4961](https://github.com/embassy-rs/embassy/pull/4961))
- fix: stm32/i2c v2: add stop flag on stop received
- fix: stm32l47*/stm32l48* adc analog pin setup

## 0.4.0 - 2025-08-26

Expand Down
12 changes: 6 additions & 6 deletions embassy-stm32/src/adc/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ trait SealedInstance {
}

pub(crate) trait SealedAdcChannel<T> {
#[cfg(any(adc_v1, adc_c0, adc_l0, adc_v2, adc_g4, adc_v4, adc_u5, adc_wba))]
#[cfg(any(adc_v1, adc_c0, adc_l0, adc_v2, adc_g4, adc_v3, adc_v4, adc_u5, adc_wba))]
fn setup(&mut self) {}

#[allow(unused)]
Expand Down Expand Up @@ -185,11 +185,11 @@ pub enum RegularConversionMode {

impl<'d, T: AnyInstance> Adc<'d, T> {
#[cfg(any(
adc_v2, adc_g4, adc_v3, adc_g0, adc_h5, adc_h7rs, adc_u0, adc_u5, adc_v4, adc_wba, adc_c0
adc_v2, adc_g4, adc_v3, adc_g0, adc_h5, adc_h7rs, adc_u0, adc_u5, adc_v3, adc_v4, adc_wba, adc_c0
))]
/// Read an ADC pin.
pub fn blocking_read(&mut self, channel: &mut impl AdcChannel<T>, sample_time: T::SampleTime) -> u16 {
#[cfg(any(adc_v1, adc_c0, adc_l0, adc_v2, adc_g4, adc_v4, adc_u5, adc_wba))]
#[cfg(any(adc_v1, adc_c0, adc_l0, adc_v2, adc_g4, adc_v3, adc_v4, adc_u5, adc_wba))]
channel.setup();

// Ensure no conversions are ongoing
Expand Down Expand Up @@ -418,7 +418,7 @@ pub trait Instance: SealedInstance + crate::PeripheralType + crate::rcc::RccPeri
pub trait AdcChannel<T>: SealedAdcChannel<T> + Sized {
#[allow(unused_mut)]
fn degrade_adc(mut self) -> AnyAdcChannel<T> {
#[cfg(any(adc_v1, adc_l0, adc_v2, adc_g4, adc_v4, adc_u5, adc_wba))]
#[cfg(any(adc_v1, adc_l0, adc_v2, adc_g4, adc_v3, adc_v4, adc_u5, adc_wba))]
self.setup();

AnyAdcChannel {
Expand Down Expand Up @@ -554,7 +554,7 @@ macro_rules! impl_adc_pin {
($inst:ident, $pin:ident, $ch:expr) => {
impl crate::adc::AdcChannel<peripherals::$inst> for crate::Peri<'_, crate::peripherals::$pin> {}
impl crate::adc::SealedAdcChannel<peripherals::$inst> for crate::Peri<'_, crate::peripherals::$pin> {
#[cfg(any(adc_v1, adc_c0, adc_l0, adc_v2, adc_g4, adc_v4, adc_u5, adc_wba))]
#[cfg(any(adc_v1, adc_c0, adc_l0, adc_v2, adc_g4, adc_v3, adc_v4, adc_u5, adc_wba))]
fn setup(&mut self) {
<crate::peripherals::$pin as crate::gpio::SealedPin>::set_as_analog(self);
}
Expand Down Expand Up @@ -582,7 +582,7 @@ macro_rules! impl_adc_pair {
crate::Peri<'_, crate::peripherals::$npin>,
)
{
#[cfg(any(adc_v1, adc_c0, adc_l0, adc_v2, adc_g4, adc_v4, adc_u5, adc_wba))]
#[cfg(any(adc_v1, adc_c0, adc_l0, adc_v2, adc_g4, adc_v3, adc_v4, adc_u5, adc_wba))]
fn setup(&mut self) {
<crate::peripherals::$pin as crate::gpio::SealedPin>::set_as_analog(&mut self.0);
<crate::peripherals::$npin as crate::gpio::SealedPin>::set_as_analog(&mut self.1);
Expand Down
6 changes: 5 additions & 1 deletion embassy-stm32/src/gpio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,11 @@ fn set_as_analog(pin_port: PinNumber) {
});

#[cfg(gpio_v2)]
r.moder().modify(|w| w.set_moder(n, vals::Moder::ANALOG));
{
#[cfg(any(stm32l47x, stm32l48x))]
r.ascr().modify(|w| w.set_asc(n, true));
r.moder().modify(|w| w.set_moder(n, vals::Moder::ANALOG));
}
}

#[inline(never)]
Expand Down