diff options
Diffstat (limited to 'embassy-net-adin1110')
| -rw-r--r-- | embassy-net-adin1110/Cargo.toml | 8 | ||||
| -rw-r--r-- | embassy-net-adin1110/src/lib.rs | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/embassy-net-adin1110/Cargo.toml b/embassy-net-adin1110/Cargo.toml index f1be52da5..52b89fce9 100644 --- a/embassy-net-adin1110/Cargo.toml +++ b/embassy-net-adin1110/Cargo.toml | |||
| @@ -12,16 +12,16 @@ repository = "https://github.com/embassy-rs/embassy" | |||
| 12 | heapless = "0.8" | 12 | heapless = "0.8" |
| 13 | defmt = { version = "0.3", optional = true } | 13 | defmt = { version = "0.3", optional = true } |
| 14 | log = { version = "0.4", default-features = false, optional = true } | 14 | log = { version = "0.4", default-features = false, optional = true } |
| 15 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" } | 15 | embedded-hal-1 = { package = "embedded-hal", version = "1.0" } |
| 16 | embedded-hal-async = { version = "=1.0.0-rc.3" } | 16 | embedded-hal-async = { version = "1.0" } |
| 17 | embedded-hal-bus = { version = "=0.1.0-rc.3", features = ["async"] } | 17 | embedded-hal-bus = { version = "0.1", features = ["async"] } |
| 18 | embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel" } | 18 | embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel" } |
| 19 | embassy-time = { version = "0.2", path = "../embassy-time" } | 19 | embassy-time = { version = "0.2", path = "../embassy-time" } |
| 20 | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | 20 | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } |
| 21 | bitfield = "0.14.0" | 21 | bitfield = "0.14.0" |
| 22 | 22 | ||
| 23 | [dev-dependencies] | 23 | [dev-dependencies] |
| 24 | embedded-hal-mock = { version = "0.10.0-rc.4", features = ["embedded-hal-async", "eh1"] } | 24 | embedded-hal-mock = { git = "https://github.com/Dirbaio/embedded-hal-mock", rev = "e3c820094ea0fc71449916bd790d0e3d76f4c0e4", features = ["embedded-hal-async", "eh1"] } |
| 25 | crc = "3.0.1" | 25 | crc = "3.0.1" |
| 26 | env_logger = "0.10" | 26 | env_logger = "0.10" |
| 27 | critical-section = { version = "1.1.2", features = ["std"] } | 27 | critical-section = { version = "1.1.2", features = ["std"] } |
diff --git a/embassy-net-adin1110/src/lib.rs b/embassy-net-adin1110/src/lib.rs index 6ecfa587d..d98e98422 100644 --- a/embassy-net-adin1110/src/lib.rs +++ b/embassy-net-adin1110/src/lib.rs | |||
| @@ -777,19 +777,19 @@ mod tests { | |||
| 777 | } | 777 | } |
| 778 | 778 | ||
| 779 | struct TestHarnass { | 779 | struct TestHarnass { |
| 780 | spe: ADIN1110<ExclusiveDevice<embedded_hal_mock::common::Generic<SpiTransaction>, CsPinMock, MockDelay>>, | 780 | spe: ADIN1110<ExclusiveDevice<embedded_hal_mock::common::Generic<SpiTransaction<u8>>, CsPinMock, MockDelay>>, |
| 781 | spi: Generic<SpiTransaction>, | 781 | spi: Generic<SpiTransaction<u8>>, |
| 782 | } | 782 | } |
| 783 | 783 | ||
| 784 | impl TestHarnass { | 784 | impl TestHarnass { |
| 785 | pub fn new(expectations: &[SpiTransaction], spi_crc: bool, append_fcs_on_tx: bool) -> Self { | 785 | pub fn new(expectations: &[SpiTransaction<u8>], spi_crc: bool, append_fcs_on_tx: bool) -> Self { |
| 786 | let cs = CsPinMock::default(); | 786 | let cs = CsPinMock::default(); |
| 787 | let delay = MockDelay {}; | 787 | let delay = MockDelay {}; |
| 788 | let spi = SpiMock::new(expectations); | 788 | let spi = SpiMock::new(expectations); |
| 789 | let spi_dev: ExclusiveDevice<embedded_hal_mock::common::Generic<SpiTransaction>, CsPinMock, MockDelay> = | 789 | let spi_dev: ExclusiveDevice<embedded_hal_mock::common::Generic<SpiTransaction<u8>>, CsPinMock, MockDelay> = |
| 790 | ExclusiveDevice::new(spi.clone(), cs, delay); | 790 | ExclusiveDevice::new(spi.clone(), cs, delay); |
| 791 | let spe: ADIN1110< | 791 | let spe: ADIN1110< |
| 792 | ExclusiveDevice<embedded_hal_mock::common::Generic<SpiTransaction>, CsPinMock, MockDelay>, | 792 | ExclusiveDevice<embedded_hal_mock::common::Generic<SpiTransaction<u8>>, CsPinMock, MockDelay>, |
| 793 | > = ADIN1110::new(spi_dev, spi_crc, append_fcs_on_tx); | 793 | > = ADIN1110::new(spi_dev, spi_crc, append_fcs_on_tx); |
| 794 | 794 | ||
| 795 | Self { spe, spi } | 795 | Self { spe, spi } |
