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.

Sign up for GitHub

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

Jump to bottom

embedded-hal: 1.0.0-alpha.10 -> 1.0.0-alpha.11 #255

Merged
merged 1 commit into from
Aug 4, 2023
Merged

embedded-hal: 1.0.0-alpha.10 -> 1.0.0-alpha.11 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dhcp/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
### Added
- Added support for `embedded-hal` version `1.0.0-alpha.10` with the `eh1` feature.
- Added support for `embedded-hal` version `1.0.0-alpha.11` with the `eh1` feature.

### Changed
- Changed the name of the `embedded-hal` feature to `eh0`.
Expand Down
2 changes: 1 addition & 1 deletion dns/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
### Added
- Added support for `embedded-hal` version `1.0.0-alpha.10` with the `eh1` feature.
- Added support for `embedded-hal` version `1.0.0-alpha.11` with the `eh1` feature.

### Changed
- Changed the name of the `embedded-hal` feature to `eh0`.
Expand Down
2 changes: 1 addition & 1 deletion hl/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]
### Added
- Added support for `embedded-hal` version `1.0.0-alpha.10` with the `eh1` feature.
- Added support for `embedded-hal` version `1.0.0-alpha.11` with the `eh1` feature.

### Changed
- Changed the name of the `embedded-hal` feature to `eh0`.
Expand Down
9 changes: 7 additions & 2 deletions hl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,15 @@ defmt = { version = "0.3.4", optional = true }
w5500-ll = { path = "../ll", version = "0.10" }

[dev-dependencies]
embedded-hal-mock = { git = "https://github.com/dbrgn/embedded-hal-mock", branch = "1-alpha" }
embedded-hal = "=1.0.0-alpha.10"
embedded-hal = "=1.0.0-alpha.11"
w5500-ll = { path = "../ll", version = "0.10", features = ["eh1", "defmt"] }

[dev-dependencies.ehm]
package = "embedded-hal-mock"
git = "https://github.com/newAM/embedded-hal-mock"
branch = "eh1-alpha.11"
features = ["embedded-hal-async", "eh0", "eh1"]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
16 changes: 8 additions & 8 deletions hl/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
//! UDP sockets
//!
//! ```no_run
//! # use embedded_hal_mock as h;
//! # use ehm::eh1 as h;
//! # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(h::spi::Mock::new(&[]));
//! use w5500_hl::ll::{
//! net::{Ipv4Addr, SocketAddrV4},
Expand All @@ -54,7 +54,7 @@
//! TCP streams (client)
//!
//! ```no_run
//! # use embedded_hal_mock as h;
//! # use ehm::eh1 as h;
//! # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(h::spi::Mock::new(&[]));
//! use w5500_hl::ll::{
//! net::{Ipv4Addr, SocketAddrV4},
Expand All @@ -74,7 +74,7 @@
//! TCP listeners (server)
//!
//! ```no_run
//! # use embedded_hal_mock as h;
//! # use ehm::eh1 as h;
//! # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(h::spi::Mock::new(&[]));
//! use w5500_hl::ll::{
//! net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -197,7 +197,7 @@ pub trait Common: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::ll::{Registers, Sn::Sn0};
/// use w5500_hl::{Common, Udp};
///
Expand All @@ -219,7 +219,7 @@ pub trait Common: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::ll::{Registers, Sn::Sn0};
/// use w5500_hl::Common;
///
Expand All @@ -238,7 +238,7 @@ pub trait Common: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::ll::{Registers, Sn::Sn0};
/// use w5500_hl::{Common, Udp};
///
Expand Down Expand Up @@ -277,7 +277,7 @@ pub trait Common: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::ll::{Registers, Sn::Sn0};
/// use w5500_hl::{Common, Udp};
///
Expand Down Expand Up @@ -325,7 +325,7 @@ pub trait Common: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::ll::{Registers, Sn::Sn0};
/// use w5500_hl::{Common, Udp};
///
Expand Down
14 changes: 7 additions & 7 deletions hl/src/tcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use w5500_ll::{
/// # Example
///
/// ```no_run
/// # use embedded_hal_mock as h;
/// # use ehm::eh1 as h;
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(h::spi::Mock::new(&[]));
/// use w5500_hl::{
/// io::Read,
Expand Down Expand Up @@ -131,7 +131,7 @@ impl<'a, W5500: Registers> Read<W5500::Error> for TcpReader<'a, W5500> {
/// # Example
///
/// ```no_run
/// # use embedded_hal_mock as h;
/// # use ehm::eh1 as h;
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(h::spi::Mock::new(&[]));
/// use w5500_hl::{
/// io::Write,
Expand Down Expand Up @@ -256,7 +256,7 @@ pub trait Tcp: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn, SocketInterrupt},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -335,7 +335,7 @@ pub trait Tcp: Registers {
/// Create an HTTP server.
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn, SocketInterrupt},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -412,7 +412,7 @@ pub trait Tcp: Registers {
/// Send a MQTT CONNECT packet and read a CONNACK.
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn, SocketInterrupt},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -473,7 +473,7 @@ pub trait Tcp: Registers {
/// Send a MQTT CONNECT packet.
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn, SocketInterrupt},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -533,7 +533,7 @@ pub trait Tcp: Registers {
/// Connect and disconnect from a MQTT server.
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn, SocketInterrupt},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down
22 changes: 11 additions & 11 deletions hl/src/udp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl UdpHeader {
/// # Example
///
/// ```no_run
/// # use embedded_hal_mock as h;
/// # use ehm::eh1 as h;
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(h::spi::Mock::new(&[]));
/// use w5500_hl::{
/// io::Read,
Expand Down Expand Up @@ -134,7 +134,7 @@ impl<'w, W5500: Registers> Read<W5500::Error> for UdpReader<'w, W5500> {
/// # Example
///
/// ```no_run
/// # use embedded_hal_mock as h;
/// # use ehm::eh1 as h;
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(h::spi::Mock::new(&[]));
/// use w5500_hl::{
/// io::Write,
Expand Down Expand Up @@ -246,7 +246,7 @@ impl<'a, W: Registers> UdpReader<'a, W> {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn::Sn0},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -312,7 +312,7 @@ pub trait Udp: Registers {
/// Bind the first socket to port 8080.
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::ll::{Registers, Sn::Sn0};
/// use w5500_hl::Udp;
///
Expand Down Expand Up @@ -372,7 +372,7 @@ pub trait Udp: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// block,
/// ll::{Registers, Sn::Sn0},
Expand Down Expand Up @@ -452,7 +452,7 @@ pub trait Udp: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// block,
/// ll::{Registers, Sn::Sn0},
Expand Down Expand Up @@ -530,7 +530,7 @@ pub trait Udp: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// block,
/// ll::{Registers, Sn::Sn0},
Expand Down Expand Up @@ -581,7 +581,7 @@ pub trait Udp: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn::Sn0},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -621,7 +621,7 @@ pub trait Udp: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn::Sn0},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -661,7 +661,7 @@ pub trait Udp: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn::Sn0},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down Expand Up @@ -712,7 +712,7 @@ pub trait Udp: Registers {
/// # Example
///
/// ```no_run
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(embedded_hal_mock::spi::Mock::new(&[]));
/// # let mut w5500 = w5500_ll::eh1::vdm::W5500::new(ehm::eh1::spi::Mock::new(&[]));
/// use w5500_hl::{
/// ll::{Registers, Sn::Sn0},
/// net::{Ipv4Addr, SocketAddrV4},
Expand Down
2 changes: 1 addition & 1 deletion ll/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Added `#[must_use]` to functions in `w5500_ll::net`.
- Added support for `core::net` types with the `ip_in_core` feature.
- Added support for `embedded-hal` version `1.0.0-alpha.10` with the `eh1` feature.
- Added support for `embedded-hal` version `1.0.0-alpha.11` with the `eh1` feature.
- Added support for `embedded-hal-async` version `0.2.0-alpha.0` with the `eha0a` feature.
- Added an `aio` module with async traits.
- Added `sn_tx_ptrs` and `sn_rx_ptrs` to read socket buffer pointers in a single transaction.
Expand Down
13 changes: 6 additions & 7 deletions ll/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@ 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-alpha.10", optional = true }
eha0a = { package = "embedded-hal-async", version = "=0.2.0-alpha.1", optional = true }
eh1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true }
eha0a = { package = "embedded-hal-async", version = "=0.2.0-alpha.2", optional = true }

[dev-dependencies]
ehm0 = { package = "embedded-hal-mock", version = "0.8" }
tokio = { version = "1.21.2", features = ["rt", "macros"] }

[dev-dependencies.ehm1]
[dev-dependencies.ehm]
package = "embedded-hal-mock"
git = "https://github.com/dbrgn/embedded-hal-mock"
branch = "1-alpha"
features = ["embedded-hal-async"]
git = "https://github.com/newAM/embedded-hal-mock"
branch = "eh1-alpha.11"
features = ["embedded-hal-async", "eh0", "eh1"]

[package.metadata.docs.rs]
all-features = true
Expand Down
Loading