Skip to content

Commit adcf341

Browse files
committed
Bump stm32f3 to 0.14.0
1 parent 91b47e1 commit adcf341

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
3131
- Enable `rt`, `usb`, `can`, `rtc` and `ld` feature by default.
3232
To disable that behavior, set `default-features = false`. ([#283])
3333
- The MSRV was bumped to 1.52 ([#283])
34+
- Update `stm32f3` pac to v0.14.0 ([#282])
3435

3536
## [v0.8.1] - 2021-10-27
3637

@@ -501,6 +502,7 @@ let clocks = rcc
501502

502503
[#291]: https://github.com/stm32-rs/stm32f3xx-hal/pull/291
503504
[#283]: https://github.com/stm32-rs/stm32f3xx-hal/pull/283
505+
[#282]: https://github.com/stm32-rs/stm32f3xx-hal/pull/282
504506
[#278]: https://github.com/stm32-rs/stm32f3xx-hal/pull/278
505507
[#277]: https://github.com/stm32-rs/stm32f3xx-hal/pull/277
506508
[#273]: https://github.com/stm32-rs/stm32f3xx-hal/pull/273

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ embedded-time = "0.12.0"
4444
nb = "1.0.0"
4545
paste = "1.0.5"
4646
rtcc = { version = "0.2.1", optional = true }
47-
stm32f3 = { version = "0.13.2", default-features = false }
47+
stm32f3 = { version = "0.14.0", default-features = false }
4848
bxcan = { version = ">=0.4, <0.6", optional = true }
4949
stm32-usbd = { version = "0.6.0", optional = true }
5050
void = { version = "1.0.2", default-features = false }

src/pwm.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,8 +1355,8 @@ pwm_timer_with_break!(
13551355
);
13561356

13571357
// Channels
1358-
pwm_pin_for_pwm_n_channel!(TIM15, Tim15Ch1, u16, cc1e, cc1ne, ccr1, ccr1);
1359-
pwm_pin_for_pwm_channel!(TIM15, Tim15Ch2, u16, cc2e, ccr2, ccr2);
1358+
pwm_pin_for_pwm_n_channel!(TIM15, Tim15Ch1, u16, cc1e, cc1ne, ccr1, ccr);
1359+
pwm_pin_for_pwm_channel!(TIM15, Tim15Ch2, u16, cc2e, ccr2, ccr);
13601360

13611361
// Pins
13621362
pwm_channel1_pin!(TIM15, Tim15Ch1, output_to_pa2, gpioa::PA2<AF9>);
@@ -1413,7 +1413,7 @@ pwm_timer_with_break!(
14131413
);
14141414

14151415
// Channels
1416-
pwm_pin_for_pwm_n_channel!(TIM16, Tim16Ch1, u16, cc1e, cc1ne, ccr1, ccr1);
1416+
pwm_pin_for_pwm_n_channel!(TIM16, Tim16Ch1, u16, cc1e, cc1ne, ccr1, ccr);
14171417

14181418
// Pins
14191419
pwm_channel1_pin!(TIM16, Tim16Ch1, output_to_pa9, gpioa::PA6<AF1>);
@@ -1453,7 +1453,7 @@ pwm_timer_with_break!(
14531453
);
14541454

14551455
// Channels
1456-
pwm_pin_for_pwm_n_channel!(TIM17, Tim17Ch1, u16, cc1e, cc1ne, ccr1, ccr1);
1456+
pwm_pin_for_pwm_n_channel!(TIM17, Tim17Ch1, u16, cc1e, cc1ne, ccr1, ccr);
14571457

14581458
// Pins
14591459
pwm_channel1_pin!(TIM17, Tim17Ch1, output_to_pa7, gpioa::PA7<AF1>);

src/timer/interrupts.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ pub struct InterruptTypes {
1919
// TODO: Check if pub is needed.
2020
pub(crate) const TIM2: Interrupt = Interrupt::TIM2;
2121
cfg_if::cfg_if! {
22-
if #[cfg(feature = "svd-f301")] {
23-
#[allow(unused)]
24-
pub(crate) const TIM3: Interrupt = Interrupt::TIM3_IRQ;
25-
#[allow(unused)]
26-
pub(crate) const TIM4: Interrupt = Interrupt::TIM4_IRQ;
27-
} else if #[cfg(any(feature = "svd-f303", feature = "svd-f302", feature = "svd-f373"))] {
22+
if #[cfg(any(feature = "svd-f303", feature = "svd-f302", feature = "svd-f373"))] {
2823
pub(crate) const TIM3: Interrupt = Interrupt::TIM3;
2924
pub(crate) const TIM4: Interrupt = Interrupt::TIM4;
3025
} else if #[cfg(any(feature = "svd-f3x4"))] {

0 commit comments

Comments
 (0)