Skip to content

Commit 2feafc6

Browse files
committed
Upgrade all packages to latest stable releases.
1 parent 5c2b968 commit 2feafc6

File tree

6 files changed

+19
-21
lines changed

6 files changed

+19
-21
lines changed

cross/get_fw_version/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ doctest = false
1717
test = false
1818

1919
[dependencies]
20-
defmt = "0.3.0"
21-
defmt-rtt = "0.3.0"
20+
defmt = "0.3"
21+
defmt-rtt = "0.3"
2222
cortex-m = "0.7"
2323
cortex-m-rt = "0.7"
2424
embedded-hal = { version = "0.2", features=["unproven"] }
25-
embedded-time = "0.12"
2625
esp32-wroom-rp = { path = "../../esp32-wroom-rp" }
2726
panic-probe = { version = "0.3.0", features = ["print-rtt"] }
2827

29-
rp2040-hal = { version = "0.5", features=["rt", "eh1_0_alpha"] }
28+
rp2040-hal = { version = "0.6", features=["rt", "eh1_0_alpha"] }
3029
rp2040-boot2 = { version = "0.2" }
30+
fugit = "0.3"
3131

3232
[features]
3333
default = ['defmt-default']

cross/get_fw_version/src/main.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ use panic_probe as _;
2222
use rp2040_hal as hal;
2323

2424
use embedded_hal::spi::MODE_0;
25-
use embedded_time::fixed_point::FixedPoint;
26-
use embedded_time::rate::Extensions;
25+
use fugit::RateExtU32;
2726
use hal::clocks::Clock;
2827
use hal::pac;
2928

@@ -63,7 +62,7 @@ fn main() -> ! {
6362
.ok()
6463
.unwrap();
6564

66-
let mut delay = cortex_m::delay::Delay::new(core.SYST, clocks.system_clock.freq().integer());
65+
let mut delay = cortex_m::delay::Delay::new(core.SYST, clocks.system_clock.freq().to_Hz());
6766

6867
// The single-cycle I/O block controls our GPIO pins
6968
let sio = hal::Sio::new(pac.SIO);
@@ -89,7 +88,7 @@ fn main() -> ! {
8988
let mut spi = spi.init(
9089
&mut pac.RESETS,
9190
clocks.peripheral_clock.freq(),
92-
8_000_000u32.Hz(),
91+
8.MHz(),
9392
&MODE_0,
9493
);
9594

cross/join/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ doctest = false
1717
test = false
1818

1919
[dependencies]
20-
defmt = "0.3.0"
21-
defmt-rtt = "0.3.0"
20+
defmt = "0.3"
21+
defmt-rtt = "0.3"
2222
cortex-m = "0.7"
2323
cortex-m-rt = "0.7"
2424
embedded-hal = { version = "0.2", features=["unproven"] }
25-
embedded-time = "0.12"
2625
esp32-wroom-rp = { path = "../../esp32-wroom-rp" }
2726
panic-probe = { version = "0.3.0", features = ["print-rtt"] }
2827

29-
rp2040-hal = { version = "0.5", features=["rt", "eh1_0_alpha"] }
28+
rp2040-hal = { version = "0.6", features=["rt", "eh1_0_alpha"] }
3029
rp2040-boot2 = { version = "0.2" }
30+
fugit = "0.3"
3131

3232
[features]
3333
default = ['defmt-default']

cross/join/src/main.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ use panic_probe as _;
2525
use rp2040_hal as hal;
2626

2727
use embedded_hal::spi::MODE_0;
28-
use embedded_time::fixed_point::FixedPoint;
29-
use embedded_time::rate::Extensions;
28+
use fugit::RateExtU32;
3029
use hal::clocks::Clock;
3130
use hal::pac;
3231

@@ -66,7 +65,7 @@ fn main() -> ! {
6665
.ok()
6766
.unwrap();
6867

69-
let mut delay = cortex_m::delay::Delay::new(core.SYST, clocks.system_clock.freq().integer());
68+
let mut delay = cortex_m::delay::Delay::new(core.SYST, clocks.system_clock.freq().to_Hz());
7069

7170
// The single-cycle I/O block controls our GPIO pins
7271
let sio = hal::Sio::new(pac.SIO);
@@ -92,7 +91,7 @@ fn main() -> ! {
9291
let mut spi = spi.init(
9392
&mut pac.RESETS,
9493
clocks.peripheral_clock.freq(),
95-
8_000_000u32.Hz(),
94+
8.MHz(),
9695
&MODE_0,
9796
);
9897

esp32-wroom-rp/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
authors = [
33
"Jim Hodapp",
44
"Caleb Bourg",
5-
"Glyn Matthews"
5+
"Glyn Matthews",
6+
"Dilyn Corner"
67
]
78
edition = "2021"
89
readme = "README.md"
910
name = "esp32-wroom-rp"
10-
version = "0.1.0"
11+
version = "0.3.0"
1112
description = "Rust-based Espressif ESP32-WROOM WiFi driver crate for RP2040 series microcontroller boards."
1213

1314
[lib]
@@ -21,7 +22,6 @@ cortex-m = "0.7"
2122
cortex-m-rt = "0.7"
2223
cortex-m-semihosting = "0.5"
2324
embedded-hal = { version = "0.2", features=["unproven"] }
24-
embedded-time = "0.12"
2525

2626
defmt = "0.3"
2727
defmt-rtt = "0.3"

esp32-wroom-rp/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//!
1313
//! ```toml
1414
//! [dependencies]
15-
//! esp32_wroom_rp = 0.1
15+
//! esp32_wroom_rp = 0.3
1616
//! ```
1717
//!
1818
//! Next:
@@ -60,7 +60,7 @@
6060
//! let spi = spi.init(
6161
//! &mut pac.RESETS,
6262
//! clocks.peripheral_clock.freq(),
63-
//! 8_000_000u32.Hz(),
63+
//! 8.MHz(),
6464
//! &MODE_0,
6565
//! );
6666
//!

0 commit comments

Comments
 (0)