aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2025-07-17 12:02:14 +0000
committerGitHub <[email protected]>2025-07-17 12:02:14 +0000
commita18e79eddbda2d58a05af51d1f06f16059a58578 (patch)
treee159b5d8773f246a6bf878dea5d51375c19fb1c3
parent0290c8565e9e3443d52edb5c250a53a50f6fc2a8 (diff)
parent17fbfc6ffc21349c2032b6e55200fbc4897606d0 (diff)
Merge pull request #4412 from Wassasin/fix/stm32g4-adc-missing
Removed reference to ADC3 for STM32G4x1 if the peripheral does not exist
-rwxr-xr-xci.sh1
-rw-r--r--embassy-stm32/src/adc/g4.rs2
2 files changed, 3 insertions, 0 deletions
diff --git a/ci.sh b/ci.sh
index 05720e4f2..842215a6b 100755
--- a/ci.sh
+++ b/ci.sh
@@ -161,6 +161,7 @@ cargo batch \
161 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32l552ze,dual-bank,defmt,exti,time-driver-any,low-power,time \ 161 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv8m.main-none-eabihf --features stm32l552ze,dual-bank,defmt,exti,time-driver-any,low-power,time \
162 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features stm32wl54jc-cm0p,defmt,exti,time-driver-any,time \ 162 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features stm32wl54jc-cm0p,defmt,exti,time-driver-any,time \
163 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32wle5jb,defmt,exti,time-driver-any,time \ 163 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32wle5jb,defmt,exti,time-driver-any,time \
164 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32g431kb,defmt,exti,time-driver-any,time \
164 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32g474pe,dual-bank,defmt,exti,time-driver-any,time \ 165 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32g474pe,dual-bank,defmt,exti,time-driver-any,time \
165 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features stm32f107vc,defmt,exti,time-driver-any,time \ 166 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features stm32f107vc,defmt,exti,time-driver-any,time \
166 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features stm32f103re,defmt,exti,time-driver-any,time \ 167 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features stm32f103re,defmt,exti,time-driver-any,time \
diff --git a/embassy-stm32/src/adc/g4.rs b/embassy-stm32/src/adc/g4.rs
index cb3e342d8..43498966f 100644
--- a/embassy-stm32/src/adc/g4.rs
+++ b/embassy-stm32/src/adc/g4.rs
@@ -545,10 +545,12 @@ mod g4 {
545 const CHANNEL: u8 = 17; 545 const CHANNEL: u8 = 17;
546 } 546 }
547 547
548 #[cfg(peri_adc3_common)]
548 impl VrefChannel for crate::peripherals::ADC3 { 549 impl VrefChannel for crate::peripherals::ADC3 {
549 const CHANNEL: u8 = 18; 550 const CHANNEL: u8 = 18;
550 } 551 }
551 552
553 #[cfg(peri_adc3_common)]
552 impl VBatChannel for crate::peripherals::ADC3 { 554 impl VBatChannel for crate::peripherals::ADC3 {
553 const CHANNEL: u8 = 17; 555 const CHANNEL: u8 = 17;
554 } 556 }