File tree Expand file tree Collapse file tree 6 files changed +19
-21
lines changed Expand file tree Collapse file tree 6 files changed +19
-21
lines changed Original file line number Diff line number Diff line change @@ -17,17 +17,17 @@ doctest = false
1717test = false
1818
1919[dependencies ]
20- defmt = " 0.3.0 "
21- defmt-rtt = " 0.3.0 "
20+ defmt = " 0.3"
21+ defmt-rtt = " 0.3"
2222cortex-m = " 0.7"
2323cortex-m-rt = " 0.7"
2424embedded-hal = { version = " 0.2" , features =[" unproven" ] }
25- embedded-time = " 0.12"
2625esp32-wroom-rp = { path = " ../../esp32-wroom-rp" }
2726panic-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" ] }
3029rp2040-boot2 = { version = " 0.2" }
30+ fugit = " 0.3"
3131
3232[features ]
3333default = [' defmt-default' ]
Original file line number Diff line number Diff line change @@ -22,8 +22,7 @@ use panic_probe as _;
2222use rp2040_hal as hal;
2323
2424use embedded_hal:: spi:: MODE_0 ;
25- use embedded_time:: fixed_point:: FixedPoint ;
26- use embedded_time:: rate:: Extensions ;
25+ use fugit:: RateExtU32 ;
2726use hal:: clocks:: Clock ;
2827use 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
Original file line number Diff line number Diff line change @@ -17,17 +17,17 @@ doctest = false
1717test = false
1818
1919[dependencies ]
20- defmt = " 0.3.0 "
21- defmt-rtt = " 0.3.0 "
20+ defmt = " 0.3"
21+ defmt-rtt = " 0.3"
2222cortex-m = " 0.7"
2323cortex-m-rt = " 0.7"
2424embedded-hal = { version = " 0.2" , features =[" unproven" ] }
25- embedded-time = " 0.12"
2625esp32-wroom-rp = { path = " ../../esp32-wroom-rp" }
2726panic-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" ] }
3029rp2040-boot2 = { version = " 0.2" }
30+ fugit = " 0.3"
3131
3232[features ]
3333default = [' defmt-default' ]
Original file line number Diff line number Diff line change @@ -25,8 +25,7 @@ use panic_probe as _;
2525use rp2040_hal as hal;
2626
2727use embedded_hal:: spi:: MODE_0 ;
28- use embedded_time:: fixed_point:: FixedPoint ;
29- use embedded_time:: rate:: Extensions ;
28+ use fugit:: RateExtU32 ;
3029use hal:: clocks:: Clock ;
3130use 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
Original file line number Diff line number Diff line change 22authors = [
33 " Jim Hodapp" ,
44 " Caleb Bourg" ,
5- " Glyn Matthews"
5+ " Glyn Matthews" ,
6+ " Dilyn Corner"
67]
78edition = " 2021"
89readme = " README.md"
910name = " esp32-wroom-rp"
10- version = " 0.1 .0"
11+ version = " 0.3 .0"
1112description = " Rust-based Espressif ESP32-WROOM WiFi driver crate for RP2040 series microcontroller boards."
1213
1314[lib ]
@@ -21,7 +22,6 @@ cortex-m = "0.7"
2122cortex-m-rt = " 0.7"
2223cortex-m-semihosting = " 0.5"
2324embedded-hal = { version = " 0.2" , features =[" unproven" ] }
24- embedded-time = " 0.12"
2525
2626defmt = " 0.3"
2727defmt-rtt = " 0.3"
Original file line number Diff line number Diff line change 1212//!
1313//! ```toml
1414//! [dependencies]
15- //! esp32_wroom_rp = 0.1
15+ //! esp32_wroom_rp = 0.3
1616//! ```
1717//!
1818//! Next:
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//!
You can’t perform that action at this time.
0 commit comments