aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThales <[email protected]>2021-07-03 02:20:17 -0300
committerGitHub <[email protected]>2021-07-03 02:20:17 -0300
commit8615ffb523edbfa10b9bc13c24668da760cf06c5 (patch)
tree76b7f536f8f56d68be5dbef4d94a794be4b2b3d4
parent489ef56deaf23c67ae41aeea099595582497db73 (diff)
parentc2f595b26a0f77a0088a8007396a37db5775eabf (diff)
Merge pull request #272 from thalesfragoso/f0-apb2
F0: Fix missing apb2 clock
-rw-r--r--embassy-stm32/src/rcc/f0/mod.rs3
-rw-r--r--embassy-stm32/src/rcc/mod.rs2
m---------stm32-data0
3 files changed, 2 insertions, 3 deletions
diff --git a/embassy-stm32/src/rcc/f0/mod.rs b/embassy-stm32/src/rcc/f0/mod.rs
index 8ddacb8ef..870fe42cf 100644
--- a/embassy-stm32/src/rcc/f0/mod.rs
+++ b/embassy-stm32/src/rcc/f0/mod.rs
@@ -205,8 +205,9 @@ impl<'d> Rcc<'d> {
205 Clocks { 205 Clocks {
206 sys: Hertz(real_sysclk), 206 sys: Hertz(real_sysclk),
207 apb1: Hertz(pclk), 207 apb1: Hertz(pclk),
208 apb2: Hertz(pclk),
208 apb1_tim: Hertz(pclk * timer_mul), 209 apb1_tim: Hertz(pclk * timer_mul),
209 apb2_tim: Hertz(0), 210 apb2_tim: Hertz(pclk * timer_mul),
210 ahb: Hertz(hclk), 211 ahb: Hertz(hclk),
211 } 212 }
212 } 213 }
diff --git a/embassy-stm32/src/rcc/mod.rs b/embassy-stm32/src/rcc/mod.rs
index 91e8b5bef..c7d1ae615 100644
--- a/embassy-stm32/src/rcc/mod.rs
+++ b/embassy-stm32/src/rcc/mod.rs
@@ -9,8 +9,6 @@ mod types;
9pub struct Clocks { 9pub struct Clocks {
10 pub sys: Hertz, 10 pub sys: Hertz,
11 pub apb1: Hertz, 11 pub apb1: Hertz,
12
13 #[cfg(not(any(rcc_f0, rcc_f0x0)))]
14 pub apb2: Hertz, 12 pub apb2: Hertz,
15 13
16 pub apb1_tim: Hertz, 14 pub apb1_tim: Hertz,
diff --git a/stm32-data b/stm32-data
Subproject d7caa63b0091f38af6657ec86b868bfa2e8a7b5 Subproject 409ed5502c254e462f3e31b0ea5ddee95f818a7