Skip to content

Commit 611cbd9

Browse files
committed
bump dependencies
1 parent eee668e commit 611cbd9

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ rustc-args = ["--cfg", "docsrs"]
3535

3636
[dependencies]
3737
cfg-if = "1.0.0"
38-
cortex-m = "0.7.2"
38+
cortex-m = "0.7.4"
3939
cortex-m-rt = "0.7"
4040
defmt = { version = ">=0.2.3, <0.4.0", optional = true }
4141
embedded-dma = "0.1.2"
@@ -55,18 +55,17 @@ enumset = { version = "1.0.6", optional = true}
5555
bare-metal = "0.2.5"
5656

5757
[dev-dependencies]
58-
cortex-m = "0.7.2"
5958
cortex-m-semihosting = "0.3.7"
6059
defmt-rtt = "0.3.0"
6160
defmt-test = "0.3.0"
6261
panic-probe = "0.3.0"
6362
panic-semihosting = "0.5.6"
6463
usbd-serial = "0.1.1"
6564
usb-device = "0.2.8"
66-
cortex-m-rtic = "=0.6.0-rc.4, <0.6.0-rc.5"
67-
systick-monotonic = "0.1.0-rc.2"
65+
cortex-m-rtic = "1.0"
66+
systick-monotonic = "1.0"
6867
panic-rtt-target = { version = "0.1", features = ["cortex-m"] }
69-
rtt-target = { version = "0.3.0", features = ["cortex-m"] }
68+
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
7069

7170
[build-dependencies]
7271
slice-group-by = "0.2.6"

src/timer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl MonoTimer {
6161
/// Returns an `Instant` corresponding to "now"
6262
pub fn now(&self) -> Instant {
6363
Instant {
64-
now: DWT::get_cycle_count(),
64+
now: DWT::cycle_count(),
6565
}
6666
}
6767
}
@@ -76,7 +76,7 @@ pub struct Instant {
7676
impl Instant {
7777
/// Ticks elapsed since the `Instant` was created
7878
pub fn elapsed(self) -> u32 {
79-
DWT::get_cycle_count().wrapping_sub(self.now)
79+
DWT::cycle_count().wrapping_sub(self.now)
8080
}
8181
}
8282

0 commit comments

Comments
 (0)