aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-02-23 02:43:23 +0000
committerGitHub <[email protected]>2022-02-23 02:43:23 +0000
commitd70a64468125dab0790ecc0821eb9f649401da41 (patch)
tree813d0f2423408f9f4af5dfa2e75a9c32dd4bbbd5
parent697be8bbdcc7db79ebfdf26325ae86672cb6914f (diff)
parent2abb04d4d1c13a0d6c7b14f40a5b81525905dd4b (diff)
Merge #633
633: stm32/rcc: fix f3 build failure. r=Dirbaio a=Dirbaio Co-authored-by: Dario Nieuwenhuis <[email protected]>
-rwxr-xr-xci.sh1
-rw-r--r--embassy-stm32/src/rcc/f3.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/ci.sh b/ci.sh
index 8cfba8f5b..3d5dec04c 100755
--- a/ci.sh
+++ b/ci.sh
@@ -49,6 +49,7 @@ cargo batch \
49 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \ 49 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \
50 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \ 50 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \
51 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32l151cb-a,defmt,exti,time-driver-any,unstable-traits \ 51 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32l151cb-a,defmt,exti,time-driver-any,unstable-traits \
52 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7m-none-eabi --features nightly,stm32f398ve,defmt,exti,time-driver-any,unstable-traits \
52 --- build --release --manifest-path docs/modules/ROOT/examples/basic/Cargo.toml --target thumbv7em-none-eabi \ 53 --- build --release --manifest-path docs/modules/ROOT/examples/basic/Cargo.toml --target thumbv7em-none-eabi \
53 --- build --release --manifest-path examples/std/Cargo.toml --target x86_64-unknown-linux-gnu --out-dir out/examples/std \ 54 --- build --release --manifest-path examples/std/Cargo.toml --target x86_64-unknown-linux-gnu --out-dir out/examples/std \
54 --- build --release --manifest-path examples/nrf/Cargo.toml --target thumbv7em-none-eabi --out-dir out/examples/nrf \ 55 --- build --release --manifest-path examples/nrf/Cargo.toml --target thumbv7em-none-eabi --out-dir out/examples/nrf \
diff --git a/embassy-stm32/src/rcc/f3.rs b/embassy-stm32/src/rcc/f3.rs
index 820915312..ababc4f90 100644
--- a/embassy-stm32/src/rcc/f3.rs
+++ b/embassy-stm32/src/rcc/f3.rs
@@ -218,7 +218,7 @@ fn calc_pll(config: &Config, Hertz(sysclk): Hertz) -> (Hertz, PllConfig) {
218 ))] { 218 ))] {
219 let (multiplier, divisor) = get_mul_div(sysclk, HSI); 219 let (multiplier, divisor) = get_mul_div(sysclk, HSI);
220 ( 220 (
221 Hertz((hse / divisor) * multiplier), 221 Hertz((HSI / divisor) * multiplier),
222 Pllsrc::HSI_DIV_PREDIV, 222 Pllsrc::HSI_DIV_PREDIV,
223 into_pll_mul(multiplier), 223 into_pll_mul(multiplier),
224 Some(into_pre_div(divisor)), 224 Some(into_pre_div(divisor)),