Skip to content

Commit 22848b6

Browse files
bors[bot]mattico
andauthored
Merge #307
307: DWT::cycle_count requires cortex-m 0.7.4 r=richardeoin a=mattico Co-authored-by: Matt Ickstadt <mattico8@gmail.com>
2 parents 4ebb5c1 + 60f88d1 commit 22848b6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ targets = ["thumbv7em-none-eabihf"]
2727
[dependencies]
2828
embedded-hal = "0.2.6"
2929
embedded-dma = "0.1.2"
30-
cortex-m = "^0.7.1"
30+
cortex-m = "^0.7.4"
3131
defmt = { version = ">=0.2.0,<0.4", optional = true }
3232
stm32h7 = { version = "^0.14.0", default-features = false }
3333
void = { version = "1.0.2", default-features = false }

src/time.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl From<NanoSeconds> for Duration {
266266
// /// Returns an `Instant` corresponding to "now"
267267
// pub fn now(&self) -> Instant {
268268
// Instant {
269-
// now: DWT::get_cycle_count(),
269+
// now: DWT::cycle_count(),
270270
// }
271271
// }
272272
// }

0 commit comments

Comments
 (0)