Skip to content

Commit

Permalink
WIP: *: bump cortex-m to 0.7.0
Browse files Browse the repository at this point in the history
This almost certainly breaks the other devices.
  • Loading branch information
crawford committed Dec 21, 2020
1 parent 4347d6f commit 6dc6c85
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repository = "https://github.com/chrysn/efm32gg-hal"
# documentation = "https://docs.rs/efm32gg-hal" # only to be advertised when actually useful

[dependencies]
cortex-m = "0.6.0"
cortex-m = "0.7.0"

# version is a wild guess. dependency on unproven features should only be
# present if own unproven feature is active (but how do i do that?).
Expand All @@ -28,7 +28,7 @@ embedded-hal = { version = "0.2.0", features = ["unproven"] }
# even smoother.

efm32gg990 = { version = "0.1.2", optional = true }
efm32gg11b820 = { version = "0.7.0", optional = true }
efm32gg11b820 = { version = "0.9.0", optional = true }
efr32xg1 = { version = "0.2.0", optional = true }

[features]
Expand Down
12 changes: 6 additions & 6 deletions src/timer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ macro_rules! timerchannel {
});
}
fn get_mode(&self) -> ChannelMode {
use registers::$timerN::$ccX_ctrl::MODER;
match unsafe { &*Self::register() }.$ccX_ctrl.read().mode() {
MODER::OFF => ChannelMode::Off,
MODER::INPUTCAPTURE => ChannelMode::InputCapture,
MODER::OUTPUTCOMPARE => ChannelMode::OutputCompare,
MODER::PWM => ChannelMode::Pwm,
use registers::$timerN::$ccX_ctrl::MODE_A;
match unsafe { &*Self::register() }.$ccX_ctrl.read().mode().variant() {
MODE_A::OFF => ChannelMode::Off,
MODE_A::INPUTCAPTURE => ChannelMode::InputCapture,
MODE_A::OUTPUTCOMPARE => ChannelMode::OutputCompare,
MODE_A::PWM => ChannelMode::Pwm,
}
}

Expand Down

0 comments on commit 6dc6c85

Please sign in to comment.