Skip to content

Commit 8017dcb

Browse files
committed
Update to embedded-hal v1.0.0
1 parent 93cf21e commit 8017dcb

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## [Unreleased]
44

5+
* Upgrade to embedded-hal v1.0.0-rc.3
6+
57
## [v0.3.0] 2022-12-29
68

79
* Parallel NAND Flash is supported with the `nand ` feature flag [#9]

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ version = "0.3"
2424
optional = true
2525

2626
[dependencies]
27-
embedded-hal = "0.2.4"
27+
embedded-hal = { version = "=1.0.0-rc.3" }
2828

2929
[dev-dependencies]
3030
paste = "1.0"

src/nand.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use core::cmp;
55
use core::marker::PhantomData;
66

7-
use embedded_hal::blocking::delay::DelayUs;
7+
use embedded_hal::delay::DelayNs;
88

99
use crate::fmc::{FmcBank, FmcRegisters};
1010
use crate::FmcPeripheral;
@@ -136,7 +136,7 @@ impl<IC: NandChip, FMC: FmcPeripheral> Nand<FMC, IC> {
136136
/// required by the NAND device
137137
pub fn init<D>(&mut self, delay: &mut D) -> device::NandDevice
138138
where
139-
D: DelayUs<u8>,
139+
D: DelayNs,
140140
{
141141
// calculate clock period, round down
142142
let fmc_source_ck_hz = self.fmc.source_clock_hz();
@@ -150,7 +150,7 @@ impl<IC: NandChip, FMC: FmcPeripheral> Nand<FMC, IC> {
150150

151151
// enable memory controller
152152
self.fmc.memory_controller_enable();
153-
delay.delay_us(1u8);
153+
delay.delay_us(1);
154154

155155
// NOTE(unsafe): FMC controller has been initialized and enabled for
156156
// this bank

src/sdram.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use core::cmp;
44
use core::convert::TryInto;
55
use core::marker::PhantomData;
66

7-
use embedded_hal::blocking::delay::DelayUs;
7+
use embedded_hal::delay::DelayNs;
88

99
use crate::fmc::{AddressPinSet, FmcBank, FmcRegisters};
1010
use crate::FmcPeripheral;
@@ -254,7 +254,7 @@ impl<IC: SdramChip, FMC: FmcPeripheral> Sdram<FMC, IC> {
254254
/// maximum SD clock in `IC::TIMING`
255255
pub fn init<D>(&mut self, delay: &mut D) -> *mut u32
256256
where
257-
D: DelayUs<u8>,
257+
D: DelayNs,
258258
{
259259
use SdramCommand::*;
260260

0 commit comments

Comments
 (0)