Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

embedded-hal: 1.0.0-rc.1 -> 1.0.0-rc.2 #283

Merged
merged 1 commit into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ defmt = { version = "0.3.4", optional = true }
w5500-ll = { path = "../ll", version = "0.12.0" }

[dev-dependencies]
embedded-hal = "=1.0.0-rc.1"
embedded-hal = "=1.0.0-rc.2"
w5500-ll = { path = "../ll", version = "0.12.0", features = ["eh1", "defmt"] }
ehm = { package = "embedded-hal-mock", version = "=0.10.0-rc.1", features = ["embedded-hal-async", "eh0", "eh1"] }
ehm = { package = "embedded-hal-mock", version = "=0.10.0-rc.3", features = ["embedded-hal-async", "eh0", "eh1"] }

[package.metadata.docs.rs]
all-features = true
Expand Down
4 changes: 4 additions & 0 deletions ll/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
- Updated `embedded-hal` from `1.0.0-rc.11` to `1.0.0-rc.2`.

## [0.12.0] - 2023-10-02
### Changed
- Updated `embedded-hal` from `1.0.0-alpha.11` to `1.0.0-rc.1`.
Expand Down
6 changes: 3 additions & 3 deletions ll/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ std = []
[dependencies]
defmt = { version = "0.3.4", optional = true }
eh0 = { package = "embedded-hal", version = "0.2.7", optional = true }
eh1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true }
eha0a = { package = "embedded-hal-async", version = "=1.0.0-rc.1", optional = true }
eh1 = { package = "embedded-hal", version = "=1.0.0-rc.2", optional = true }
eha0a = { package = "embedded-hal-async", version = "=1.0.0-rc.2", optional = true }

[dev-dependencies]
tokio = { version = "1.21.2", features = ["rt", "macros"] }
ehm = { package = "embedded-hal-mock", version = "=0.10.0-rc.1", features = ["embedded-hal-async", "eh0", "eh1"] }
ehm = { package = "embedded-hal-mock", version = "=0.10.0-rc.3", features = ["embedded-hal-async", "eh0", "eh1"] }

[package.metadata.docs.rs]
all-features = true
Expand Down
6 changes: 3 additions & 3 deletions ll/src/eh1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ pub mod vdm;
pub fn reset<P, D, E>(pin: &mut P, delay: &mut D) -> Result<(), E>
where
P: eh1::digital::OutputPin<Error = E>,
D: eh1::delay::DelayUs,
D: eh1::delay::DelayNs,
{
pin.set_low()?;
delay.delay_ms(1);
delay.delay_us(1000);
pin.set_high()?;
delay.delay_ms(2);
delay.delay_us(2000);
Ok(())
}

Expand Down
2 changes: 1 addition & 1 deletion testsuite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false
edition = "2021"

[dependencies]
ftdi-embedded-hal = { version = "0.18.0", features = ["libftd2xx", "libftd2xx-static"] }
ftdi-embedded-hal = { version = "0.19.0", features = ["libftd2xx", "libftd2xx-static"] }
log = "0.4"
rand_core = { version = "0.6.3", features = ["getrandom"] }
stderrlog = "0.5"
Expand Down