diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-08-16 00:40:56 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-16 00:40:56 +0200 |
| commit | f26dd54f6378be87a71f0c9f351b56851df96014 (patch) | |
| tree | 6fbaea24c44d4fbbe01b08a0d87b9d8e49a4ad5a | |
| parent | ffe96889525105ac37cb74add67ac73f148726f6 (diff) | |
Update embedded-hal to 1.0.0-rc.1 (#1783)
32 files changed, 84 insertions, 206 deletions
diff --git a/cyw43/Cargo.toml b/cyw43/Cargo.toml index 50fb7c5db..855d54b11 100644 --- a/cyw43/Cargo.toml +++ b/cyw43/Cargo.toml | |||
| @@ -24,7 +24,7 @@ cortex-m = "0.7.6" | |||
| 24 | cortex-m-rt = "0.7.0" | 24 | cortex-m-rt = "0.7.0" |
| 25 | futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } | 25 | futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } |
| 26 | 26 | ||
| 27 | embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.11" } | 27 | embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-rc.1" } |
| 28 | num_enum = { version = "0.5.7", default-features = false } | 28 | num_enum = { version = "0.5.7", default-features = false } |
| 29 | 29 | ||
| 30 | [package.metadata.embassy_docs] | 30 | [package.metadata.embassy_docs] |
diff --git a/embassy-embedded-hal/Cargo.toml b/embassy-embedded-hal/Cargo.toml index bba3d48be..fd921d277 100644 --- a/embassy-embedded-hal/Cargo.toml +++ b/embassy-embedded-hal/Cargo.toml | |||
| @@ -25,8 +25,8 @@ embassy-time = { version = "0.1.2", path = "../embassy-time", optional = true } | |||
| 25 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ | 25 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ |
| 26 | "unproven", | 26 | "unproven", |
| 27 | ] } | 27 | ] } |
| 28 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | 28 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } |
| 29 | embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true } | 29 | embedded-hal-async = { version = "=1.0.0-rc.1", optional = true } |
| 30 | embedded-storage = "0.3.0" | 30 | embedded-storage = "0.3.0" |
| 31 | embedded-storage-async = { version = "0.4.0", optional = true } | 31 | embedded-storage-async = { version = "0.4.0", optional = true } |
| 32 | nb = "1.0.0" | 32 | nb = "1.0.0" |
diff --git a/embassy-embedded-hal/src/adapter/blocking_async.rs b/embassy-embedded-hal/src/adapter/blocking_async.rs index 98ae2b02c..ae0d0a7f9 100644 --- a/embassy-embedded-hal/src/adapter/blocking_async.rs +++ b/embassy-embedded-hal/src/adapter/blocking_async.rs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | use embedded_hal_02::{blocking, serial}; | 1 | use embedded_hal_02::blocking; |
| 2 | 2 | ||
| 3 | /// Wrapper that implements async traits using blocking implementations. | 3 | /// Wrapper that implements async traits using blocking implementations. |
| 4 | /// | 4 | /// |
| @@ -103,15 +103,6 @@ where | |||
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | // Uart implementatinos | ||
| 107 | impl<T, E> embedded_hal_1::serial::ErrorType for BlockingAsync<T> | ||
| 108 | where | ||
| 109 | T: serial::Read<u8, Error = E>, | ||
| 110 | E: embedded_hal_1::serial::Error + 'static, | ||
| 111 | { | ||
| 112 | type Error = E; | ||
| 113 | } | ||
| 114 | |||
| 115 | /// NOR flash wrapper | 106 | /// NOR flash wrapper |
| 116 | use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash}; | 107 | use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash}; |
| 117 | use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; | 108 | use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; |
diff --git a/embassy-lora/Cargo.toml b/embassy-lora/Cargo.toml index 402ad2d70..90c544d8d 100644 --- a/embassy-lora/Cargo.toml +++ b/embassy-lora/Cargo.toml | |||
| @@ -23,7 +23,7 @@ log = { version = "0.4.14", optional = true } | |||
| 23 | embassy-time = { version = "0.1.2", path = "../embassy-time", optional = true } | 23 | embassy-time = { version = "0.1.2", path = "../embassy-time", optional = true } |
| 24 | embassy-sync = { version = "0.2.0", path = "../embassy-sync" } | 24 | embassy-sync = { version = "0.2.0", path = "../embassy-sync" } |
| 25 | embassy-stm32 = { version = "0.1.0", path = "../embassy-stm32", default-features = false, optional = true } | 25 | embassy-stm32 = { version = "0.1.0", path = "../embassy-stm32", default-features = false, optional = true } |
| 26 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 26 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 27 | embedded-hal = { version = "0.2", features = ["unproven"] } | 27 | embedded-hal = { version = "0.2", features = ["unproven"] } |
| 28 | 28 | ||
| 29 | futures = { version = "0.3.17", default-features = false, features = [ "async-await" ] } | 29 | futures = { version = "0.3.17", default-features = false, features = [ "async-await" ] } |
diff --git a/embassy-net-enc28j60/Cargo.toml b/embassy-net-enc28j60/Cargo.toml index c502ed04b..e02c984e9 100644 --- a/embassy-net-enc28j60/Cargo.toml +++ b/embassy-net-enc28j60/Cargo.toml | |||
| @@ -8,8 +8,8 @@ license = "MIT OR Apache-2.0" | |||
| 8 | edition = "2021" | 8 | edition = "2021" |
| 9 | 9 | ||
| 10 | [dependencies] | 10 | [dependencies] |
| 11 | embedded-hal = { version = "1.0.0-alpha.11" } | 11 | embedded-hal = { version = "1.0.0-rc.1" } |
| 12 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 12 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 13 | embassy-net-driver = { version = "0.1.0", path = "../embassy-net-driver" } | 13 | embassy-net-driver = { version = "0.1.0", path = "../embassy-net-driver" } |
| 14 | embassy-time = { version = "0.1.2", path = "../embassy-time" } | 14 | embassy-time = { version = "0.1.2", path = "../embassy-time" } |
| 15 | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | 15 | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } |
diff --git a/embassy-net-esp-hosted/Cargo.toml b/embassy-net-esp-hosted/Cargo.toml index 0053c49a4..d334cf3fe 100644 --- a/embassy-net-esp-hosted/Cargo.toml +++ b/embassy-net-esp-hosted/Cargo.toml | |||
| @@ -12,8 +12,8 @@ embassy-sync = { version = "0.2.0", path = "../embassy-sync"} | |||
| 12 | embassy-futures = { version = "0.1.0", path = "../embassy-futures"} | 12 | embassy-futures = { version = "0.1.0", path = "../embassy-futures"} |
| 13 | embassy-net-driver-channel = { version = "0.1.0", path = "../embassy-net-driver-channel"} | 13 | embassy-net-driver-channel = { version = "0.1.0", path = "../embassy-net-driver-channel"} |
| 14 | 14 | ||
| 15 | embedded-hal = { version = "1.0.0-alpha.11" } | 15 | embedded-hal = { version = "1.0.0-rc.1" } |
| 16 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 16 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 17 | 17 | ||
| 18 | noproto = { git="https://github.com/embassy-rs/noproto", default-features = false, features = ["derive"] } | 18 | noproto = { git="https://github.com/embassy-rs/noproto", default-features = false, features = ["derive"] } |
| 19 | #noproto = { version = "0.1", path = "/home/dirbaio/noproto", default-features = false, features = ["derive"] } | 19 | #noproto = { version = "0.1", path = "/home/dirbaio/noproto", default-features = false, features = ["derive"] } |
diff --git a/embassy-net-wiznet/Cargo.toml b/embassy-net-wiznet/Cargo.toml index dff03ac83..adf0b45fc 100644 --- a/embassy-net-wiznet/Cargo.toml +++ b/embassy-net-wiznet/Cargo.toml | |||
| @@ -8,8 +8,8 @@ license = "MIT OR Apache-2.0" | |||
| 8 | edition = "2021" | 8 | edition = "2021" |
| 9 | 9 | ||
| 10 | [dependencies] | 10 | [dependencies] |
| 11 | embedded-hal = { version = "1.0.0-alpha.11" } | 11 | embedded-hal = { version = "1.0.0-rc.1" } |
| 12 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 12 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 13 | embassy-net-driver-channel = { version = "0.1.0", path = "../embassy-net-driver-channel" } | 13 | embassy-net-driver-channel = { version = "0.1.0", path = "../embassy-net-driver-channel" } |
| 14 | embassy-time = { version = "0.1.2", path = "../embassy-time" } | 14 | embassy-time = { version = "0.1.2", path = "../embassy-time" } |
| 15 | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | 15 | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } |
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml index da1cd38e1..c4790f2c6 100644 --- a/embassy-nrf/Cargo.toml +++ b/embassy-nrf/Cargo.toml | |||
| @@ -98,8 +98,8 @@ embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" } | |||
| 98 | embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional=true } | 98 | embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional=true } |
| 99 | 99 | ||
| 100 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | 100 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } |
| 101 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} | 101 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} |
| 102 | embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} | 102 | embedded-hal-async = { version = "=1.0.0-rc.1", optional = true} |
| 103 | embedded-io = { version = "0.5.0" } | 103 | embedded-io = { version = "0.5.0" } |
| 104 | embedded-io-async = { version = "0.5.0", optional = true } | 104 | embedded-io-async = { version = "0.5.0", optional = true } |
| 105 | 105 | ||
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index e79df3561..95434e7a7 100644 --- a/embassy-nrf/src/uarte.rs +++ b/embassy-nrf/src/uarte.rs | |||
| @@ -949,51 +949,3 @@ mod eh02 { | |||
| 949 | } | 949 | } |
| 950 | } | 950 | } |
| 951 | } | 951 | } |
| 952 | |||
| 953 | #[cfg(feature = "unstable-traits")] | ||
| 954 | mod eh1 { | ||
| 955 | use super::*; | ||
| 956 | |||
| 957 | impl embedded_hal_1::serial::Error for Error { | ||
| 958 | fn kind(&self) -> embedded_hal_1::serial::ErrorKind { | ||
| 959 | match *self { | ||
| 960 | Self::BufferTooLong => embedded_hal_1::serial::ErrorKind::Other, | ||
| 961 | Self::BufferNotInRAM => embedded_hal_1::serial::ErrorKind::Other, | ||
| 962 | } | ||
| 963 | } | ||
| 964 | } | ||
| 965 | |||
| 966 | // ===================== | ||
| 967 | |||
| 968 | impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for Uarte<'d, T> { | ||
| 969 | type Error = Error; | ||
| 970 | } | ||
| 971 | |||
| 972 | impl<'d, T: Instance> embedded_hal_1::serial::Write for Uarte<'d, T> { | ||
| 973 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 974 | self.blocking_write(buffer) | ||
| 975 | } | ||
| 976 | |||
| 977 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 978 | Ok(()) | ||
| 979 | } | ||
| 980 | } | ||
| 981 | |||
| 982 | impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for UarteTx<'d, T> { | ||
| 983 | type Error = Error; | ||
| 984 | } | ||
| 985 | |||
| 986 | impl<'d, T: Instance> embedded_hal_1::serial::Write for UarteTx<'d, T> { | ||
| 987 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 988 | self.blocking_write(buffer) | ||
| 989 | } | ||
| 990 | |||
| 991 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 992 | Ok(()) | ||
| 993 | } | ||
| 994 | } | ||
| 995 | |||
| 996 | impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for UarteRx<'d, T> { | ||
| 997 | type Error = Error; | ||
| 998 | } | ||
| 999 | } | ||
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml index b1680d487..b9ebcc866 100644 --- a/embassy-rp/Cargo.toml +++ b/embassy-rp/Cargo.toml | |||
| @@ -85,9 +85,9 @@ fixed = "1.23.1" | |||
| 85 | rp-pac = { version = "6" } | 85 | rp-pac = { version = "6" } |
| 86 | 86 | ||
| 87 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | 87 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } |
| 88 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} | 88 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} |
| 89 | embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} | 89 | embedded-hal-async = { version = "=1.0.0-rc.1", optional = true} |
| 90 | embedded-hal-nb = { version = "=1.0.0-alpha.3", optional = true} | 90 | embedded-hal-nb = { version = "=1.0.0-rc.1", optional = true} |
| 91 | 91 | ||
| 92 | paste = "1.0" | 92 | paste = "1.0" |
| 93 | pio-proc = {version= "0.2" } | 93 | pio-proc = {version= "0.2" } |
diff --git a/embassy-rp/src/uart/buffered.rs b/embassy-rp/src/uart/buffered.rs index 58dc0bf1a..e57b72599 100644 --- a/embassy-rp/src/uart/buffered.rs +++ b/embassy-rp/src/uart/buffered.rs | |||
| @@ -749,15 +749,15 @@ mod eh02 { | |||
| 749 | mod eh1 { | 749 | mod eh1 { |
| 750 | use super::*; | 750 | use super::*; |
| 751 | 751 | ||
| 752 | impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for BufferedUart<'d, T> { | 752 | impl<'d, T: Instance> embedded_hal_nb::serial::ErrorType for BufferedUartRx<'d, T> { |
| 753 | type Error = Error; | 753 | type Error = Error; |
| 754 | } | 754 | } |
| 755 | 755 | ||
| 756 | impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for BufferedUartTx<'d, T> { | 756 | impl<'d, T: Instance> embedded_hal_nb::serial::ErrorType for BufferedUartTx<'d, T> { |
| 757 | type Error = Error; | 757 | type Error = Error; |
| 758 | } | 758 | } |
| 759 | 759 | ||
| 760 | impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for BufferedUartRx<'d, T> { | 760 | impl<'d, T: Instance> embedded_hal_nb::serial::ErrorType for BufferedUart<'d, T> { |
| 761 | type Error = Error; | 761 | type Error = Error; |
| 762 | } | 762 | } |
| 763 | 763 | ||
| @@ -767,16 +767,6 @@ mod eh1 { | |||
| 767 | } | 767 | } |
| 768 | } | 768 | } |
| 769 | 769 | ||
| 770 | impl<'d, T: Instance> embedded_hal_1::serial::Write for BufferedUartTx<'d, T> { | ||
| 771 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 772 | self.blocking_write(buffer).map(drop) | ||
| 773 | } | ||
| 774 | |||
| 775 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 776 | self.blocking_flush() | ||
| 777 | } | ||
| 778 | } | ||
| 779 | |||
| 780 | impl<'d, T: Instance> embedded_hal_nb::serial::Write for BufferedUartTx<'d, T> { | 770 | impl<'d, T: Instance> embedded_hal_nb::serial::Write for BufferedUartTx<'d, T> { |
| 781 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | 771 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { |
| 782 | self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) | 772 | self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) |
| @@ -793,16 +783,6 @@ mod eh1 { | |||
| 793 | } | 783 | } |
| 794 | } | 784 | } |
| 795 | 785 | ||
| 796 | impl<'d, T: Instance> embedded_hal_1::serial::Write for BufferedUart<'d, T> { | ||
| 797 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 798 | self.blocking_write(buffer).map(drop) | ||
| 799 | } | ||
| 800 | |||
| 801 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 802 | self.blocking_flush() | ||
| 803 | } | ||
| 804 | } | ||
| 805 | |||
| 806 | impl<'d, T: Instance> embedded_hal_nb::serial::Write for BufferedUart<'d, T> { | 786 | impl<'d, T: Instance> embedded_hal_nb::serial::Write for BufferedUart<'d, T> { |
| 807 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | 787 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { |
| 808 | self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) | 788 | self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) |
diff --git a/embassy-rp/src/uart/mod.rs b/embassy-rp/src/uart/mod.rs index 00070b80a..202b0883e 100644 --- a/embassy-rp/src/uart/mod.rs +++ b/embassy-rp/src/uart/mod.rs | |||
| @@ -807,26 +807,26 @@ mod eh02 { | |||
| 807 | mod eh1 { | 807 | mod eh1 { |
| 808 | use super::*; | 808 | use super::*; |
| 809 | 809 | ||
| 810 | impl embedded_hal_1::serial::Error for Error { | 810 | impl embedded_hal_nb::serial::Error for Error { |
| 811 | fn kind(&self) -> embedded_hal_1::serial::ErrorKind { | 811 | fn kind(&self) -> embedded_hal_nb::serial::ErrorKind { |
| 812 | match *self { | 812 | match *self { |
| 813 | Self::Framing => embedded_hal_1::serial::ErrorKind::FrameFormat, | 813 | Self::Framing => embedded_hal_nb::serial::ErrorKind::FrameFormat, |
| 814 | Self::Break => embedded_hal_1::serial::ErrorKind::Other, | 814 | Self::Break => embedded_hal_nb::serial::ErrorKind::Other, |
| 815 | Self::Overrun => embedded_hal_1::serial::ErrorKind::Overrun, | 815 | Self::Overrun => embedded_hal_nb::serial::ErrorKind::Overrun, |
| 816 | Self::Parity => embedded_hal_1::serial::ErrorKind::Parity, | 816 | Self::Parity => embedded_hal_nb::serial::ErrorKind::Parity, |
| 817 | } | 817 | } |
| 818 | } | 818 | } |
| 819 | } | 819 | } |
| 820 | 820 | ||
| 821 | impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::ErrorType for Uart<'d, T, M> { | 821 | impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::ErrorType for UartRx<'d, T, M> { |
| 822 | type Error = Error; | 822 | type Error = Error; |
| 823 | } | 823 | } |
| 824 | 824 | ||
| 825 | impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::ErrorType for UartTx<'d, T, M> { | 825 | impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::ErrorType for UartTx<'d, T, M> { |
| 826 | type Error = Error; | 826 | type Error = Error; |
| 827 | } | 827 | } |
| 828 | 828 | ||
| 829 | impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::ErrorType for UartRx<'d, T, M> { | 829 | impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::ErrorType for Uart<'d, T, M> { |
| 830 | type Error = Error; | 830 | type Error = Error; |
| 831 | } | 831 | } |
| 832 | 832 | ||
| @@ -851,16 +851,6 @@ mod eh1 { | |||
| 851 | } | 851 | } |
| 852 | } | 852 | } |
| 853 | 853 | ||
| 854 | impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::Write for UartTx<'d, T, M> { | ||
| 855 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 856 | self.blocking_write(buffer) | ||
| 857 | } | ||
| 858 | |||
| 859 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 860 | self.blocking_flush() | ||
| 861 | } | ||
| 862 | } | ||
| 863 | |||
| 864 | impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::Write for UartTx<'d, T, M> { | 854 | impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::Write for UartTx<'d, T, M> { |
| 865 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | 855 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { |
| 866 | self.blocking_write(&[char]).map_err(nb::Error::Other) | 856 | self.blocking_write(&[char]).map_err(nb::Error::Other) |
| @@ -877,16 +867,6 @@ mod eh1 { | |||
| 877 | } | 867 | } |
| 878 | } | 868 | } |
| 879 | 869 | ||
| 880 | impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::Write for Uart<'d, T, M> { | ||
| 881 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 882 | self.blocking_write(buffer) | ||
| 883 | } | ||
| 884 | |||
| 885 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 886 | self.blocking_flush() | ||
| 887 | } | ||
| 888 | } | ||
| 889 | |||
| 890 | impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::Write for Uart<'d, T, M> { | 870 | impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::Write for Uart<'d, T, M> { |
| 891 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | 871 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { |
| 892 | self.blocking_write(&[char]).map_err(nb::Error::Other) | 872 | self.blocking_write(&[char]).map_err(nb::Error::Other) |
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 8f765e9d3..c3f5706e8 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -40,9 +40,9 @@ embassy-net-driver = { version = "0.1.0", path = "../embassy-net-driver" } | |||
| 40 | embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional = true } | 40 | embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional = true } |
| 41 | 41 | ||
| 42 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | 42 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } |
| 43 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} | 43 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} |
| 44 | embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} | 44 | embedded-hal-async = { version = "=1.0.0-rc.1", optional = true} |
| 45 | embedded-hal-nb = { version = "=1.0.0-alpha.3", optional = true} | 45 | embedded-hal-nb = { version = "=1.0.0-rc.1", optional = true} |
| 46 | 46 | ||
| 47 | embedded-storage = "0.3.0" | 47 | embedded-storage = "0.3.0" |
| 48 | embedded-storage-async = { version = "0.4.0", optional = true } | 48 | embedded-storage-async = { version = "0.4.0", optional = true } |
diff --git a/embassy-stm32/src/usart/buffered.rs b/embassy-stm32/src/usart/buffered.rs index 329fc7da6..596d40bf9 100644 --- a/embassy-stm32/src/usart/buffered.rs +++ b/embassy-stm32/src/usart/buffered.rs | |||
| @@ -584,15 +584,15 @@ mod eh02 { | |||
| 584 | mod eh1 { | 584 | mod eh1 { |
| 585 | use super::*; | 585 | use super::*; |
| 586 | 586 | ||
| 587 | impl<'d, T: BasicInstance> embedded_hal_1::serial::ErrorType for BufferedUart<'d, T> { | 587 | impl<'d, T: BasicInstance> embedded_hal_nb::serial::ErrorType for BufferedUart<'d, T> { |
| 588 | type Error = Error; | 588 | type Error = Error; |
| 589 | } | 589 | } |
| 590 | 590 | ||
| 591 | impl<'d, T: BasicInstance> embedded_hal_1::serial::ErrorType for BufferedUartTx<'d, T> { | 591 | impl<'d, T: BasicInstance> embedded_hal_nb::serial::ErrorType for BufferedUartTx<'d, T> { |
| 592 | type Error = Error; | 592 | type Error = Error; |
| 593 | } | 593 | } |
| 594 | 594 | ||
| 595 | impl<'d, T: BasicInstance> embedded_hal_1::serial::ErrorType for BufferedUartRx<'d, T> { | 595 | impl<'d, T: BasicInstance> embedded_hal_nb::serial::ErrorType for BufferedUartRx<'d, T> { |
| 596 | type Error = Error; | 596 | type Error = Error; |
| 597 | } | 597 | } |
| 598 | 598 | ||
| @@ -602,16 +602,6 @@ mod eh1 { | |||
| 602 | } | 602 | } |
| 603 | } | 603 | } |
| 604 | 604 | ||
| 605 | impl<'d, T: BasicInstance> embedded_hal_1::serial::Write for BufferedUartTx<'d, T> { | ||
| 606 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 607 | self.blocking_write(buffer).map(drop) | ||
| 608 | } | ||
| 609 | |||
| 610 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 611 | self.blocking_flush() | ||
| 612 | } | ||
| 613 | } | ||
| 614 | |||
| 615 | impl<'d, T: BasicInstance> embedded_hal_nb::serial::Write for BufferedUartTx<'d, T> { | 605 | impl<'d, T: BasicInstance> embedded_hal_nb::serial::Write for BufferedUartTx<'d, T> { |
| 616 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | 606 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { |
| 617 | self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) | 607 | self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) |
| @@ -628,16 +618,6 @@ mod eh1 { | |||
| 628 | } | 618 | } |
| 629 | } | 619 | } |
| 630 | 620 | ||
| 631 | impl<'d, T: BasicInstance> embedded_hal_1::serial::Write for BufferedUart<'d, T> { | ||
| 632 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 633 | self.tx.blocking_write(buffer).map(drop) | ||
| 634 | } | ||
| 635 | |||
| 636 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 637 | self.tx.blocking_flush() | ||
| 638 | } | ||
| 639 | } | ||
| 640 | |||
| 641 | impl<'d, T: BasicInstance> embedded_hal_nb::serial::Write for BufferedUart<'d, T> { | 621 | impl<'d, T: BasicInstance> embedded_hal_nb::serial::Write for BufferedUart<'d, T> { |
| 642 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | 622 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { |
| 643 | self.tx.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) | 623 | self.tx.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) |
diff --git a/embassy-stm32/src/usart/mod.rs b/embassy-stm32/src/usart/mod.rs index 0c69a4882..e203336e1 100644 --- a/embassy-stm32/src/usart/mod.rs +++ b/embassy-stm32/src/usart/mod.rs | |||
| @@ -943,27 +943,27 @@ mod eh02 { | |||
| 943 | mod eh1 { | 943 | mod eh1 { |
| 944 | use super::*; | 944 | use super::*; |
| 945 | 945 | ||
| 946 | impl embedded_hal_1::serial::Error for Error { | 946 | impl embedded_hal_nb::serial::Error for Error { |
| 947 | fn kind(&self) -> embedded_hal_1::serial::ErrorKind { | 947 | fn kind(&self) -> embedded_hal_nb::serial::ErrorKind { |
| 948 | match *self { | 948 | match *self { |
| 949 | Self::Framing => embedded_hal_1::serial::ErrorKind::FrameFormat, | 949 | Self::Framing => embedded_hal_nb::serial::ErrorKind::FrameFormat, |
| 950 | Self::Noise => embedded_hal_1::serial::ErrorKind::Noise, | 950 | Self::Noise => embedded_hal_nb::serial::ErrorKind::Noise, |
| 951 | Self::Overrun => embedded_hal_1::serial::ErrorKind::Overrun, | 951 | Self::Overrun => embedded_hal_nb::serial::ErrorKind::Overrun, |
| 952 | Self::Parity => embedded_hal_1::serial::ErrorKind::Parity, | 952 | Self::Parity => embedded_hal_nb::serial::ErrorKind::Parity, |
| 953 | Self::BufferTooLong => embedded_hal_1::serial::ErrorKind::Other, | 953 | Self::BufferTooLong => embedded_hal_nb::serial::ErrorKind::Other, |
| 954 | } | 954 | } |
| 955 | } | 955 | } |
| 956 | } | 956 | } |
| 957 | 957 | ||
| 958 | impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_1::serial::ErrorType for Uart<'d, T, TxDma, RxDma> { | 958 | impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_nb::serial::ErrorType for Uart<'d, T, TxDma, RxDma> { |
| 959 | type Error = Error; | 959 | type Error = Error; |
| 960 | } | 960 | } |
| 961 | 961 | ||
| 962 | impl<'d, T: BasicInstance, TxDma> embedded_hal_1::serial::ErrorType for UartTx<'d, T, TxDma> { | 962 | impl<'d, T: BasicInstance, TxDma> embedded_hal_nb::serial::ErrorType for UartTx<'d, T, TxDma> { |
| 963 | type Error = Error; | 963 | type Error = Error; |
| 964 | } | 964 | } |
| 965 | 965 | ||
| 966 | impl<'d, T: BasicInstance, RxDma> embedded_hal_1::serial::ErrorType for UartRx<'d, T, RxDma> { | 966 | impl<'d, T: BasicInstance, RxDma> embedded_hal_nb::serial::ErrorType for UartRx<'d, T, RxDma> { |
| 967 | type Error = Error; | 967 | type Error = Error; |
| 968 | } | 968 | } |
| 969 | 969 | ||
| @@ -973,16 +973,6 @@ mod eh1 { | |||
| 973 | } | 973 | } |
| 974 | } | 974 | } |
| 975 | 975 | ||
| 976 | impl<'d, T: BasicInstance, TxDma> embedded_hal_1::serial::Write for UartTx<'d, T, TxDma> { | ||
| 977 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 978 | self.blocking_write(buffer) | ||
| 979 | } | ||
| 980 | |||
| 981 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 982 | self.blocking_flush() | ||
| 983 | } | ||
| 984 | } | ||
| 985 | |||
| 986 | impl<'d, T: BasicInstance, TxDma> embedded_hal_nb::serial::Write for UartTx<'d, T, TxDma> { | 976 | impl<'d, T: BasicInstance, TxDma> embedded_hal_nb::serial::Write for UartTx<'d, T, TxDma> { |
| 987 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | 977 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { |
| 988 | self.blocking_write(&[char]).map_err(nb::Error::Other) | 978 | self.blocking_write(&[char]).map_err(nb::Error::Other) |
| @@ -999,16 +989,6 @@ mod eh1 { | |||
| 999 | } | 989 | } |
| 1000 | } | 990 | } |
| 1001 | 991 | ||
| 1002 | impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_1::serial::Write for Uart<'d, T, TxDma, RxDma> { | ||
| 1003 | fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||
| 1004 | self.blocking_write(buffer) | ||
| 1005 | } | ||
| 1006 | |||
| 1007 | fn flush(&mut self) -> Result<(), Self::Error> { | ||
| 1008 | self.blocking_flush() | ||
| 1009 | } | ||
| 1010 | } | ||
| 1011 | |||
| 1012 | impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_nb::serial::Write for Uart<'d, T, TxDma, RxDma> { | 992 | impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_nb::serial::Write for Uart<'d, T, TxDma, RxDma> { |
| 1013 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | 993 | fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { |
| 1014 | self.blocking_write(&[char]).map_err(nb::Error::Other) | 994 | self.blocking_write(&[char]).map_err(nb::Error::Other) |
diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml index 0afb1103d..ec1f2ec3f 100644 --- a/embassy-time/Cargo.toml +++ b/embassy-time/Cargo.toml | |||
| @@ -152,8 +152,8 @@ defmt = { version = "0.3", optional = true } | |||
| 152 | log = { version = "0.4.14", optional = true } | 152 | log = { version = "0.4.14", optional = true } |
| 153 | 153 | ||
| 154 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } | 154 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } |
| 155 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} | 155 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} |
| 156 | embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} | 156 | embedded-hal-async = { version = "=1.0.0-rc.1", optional = true} |
| 157 | 157 | ||
| 158 | futures-util = { version = "0.3.17", default-features = false } | 158 | futures-util = { version = "0.3.17", default-features = false } |
| 159 | atomic-polyfill = "1.0.1" | 159 | atomic-polyfill = "1.0.1" |
diff --git a/examples/nrf52840/Cargo.toml b/examples/nrf52840/Cargo.toml index 8c6f6bccf..2ce44b516 100644 --- a/examples/nrf52840/Cargo.toml +++ b/examples/nrf52840/Cargo.toml | |||
| @@ -19,6 +19,7 @@ nightly = [ | |||
| 19 | "static_cell/nightly", | 19 | "static_cell/nightly", |
| 20 | "embassy-usb", | 20 | "embassy-usb", |
| 21 | "embedded-io-async", | 21 | "embedded-io-async", |
| 22 | "embedded-hal-bus/async", | ||
| 22 | "embassy-net", | 23 | "embassy-net", |
| 23 | "embassy-lora", | 24 | "embassy-lora", |
| 24 | "lora-phy", | 25 | "lora-phy", |
| @@ -56,11 +57,14 @@ rand = { version = "0.8.4", default-features = false } | |||
| 56 | embedded-storage = "0.3.0" | 57 | embedded-storage = "0.3.0" |
| 57 | usbd-hid = "0.6.0" | 58 | usbd-hid = "0.6.0" |
| 58 | serde = { version = "1.0.136", default-features = false } | 59 | serde = { version = "1.0.136", default-features = false } |
| 59 | embedded-hal = { version = "1.0.0-alpha.11" } | 60 | embedded-hal = { version = "1.0.0-rc.1" } |
| 60 | embedded-hal-async = { version = "0.2.0-alpha.2", optional = true } | 61 | embedded-hal-async = { version = "1.0.0-rc.1", optional = true } |
| 61 | embedded-hal-bus = { version = "0.1.0-alpha.3" } | 62 | embedded-hal-bus = { version = "0.1.0-rc.1" } |
| 62 | num-integer = { version = "0.1.45", default-features = false } | 63 | num-integer = { version = "0.1.45", default-features = false } |
| 63 | microfft = "0.5.0" | 64 | microfft = "0.5.0" |
| 64 | 65 | ||
| 65 | [profile.release] | 66 | [profile.release] |
| 66 | debug = 2 | 67 | debug = 2 |
| 68 | |||
| 69 | [patch.crates-io] | ||
| 70 | lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"} \ No newline at end of file | ||
diff --git a/examples/nrf52840/src/bin/wifi_esp_hosted.rs b/examples/nrf52840/src/bin/wifi_esp_hosted.rs index e3b80d821..e114e50b9 100644 --- a/examples/nrf52840/src/bin/wifi_esp_hosted.rs +++ b/examples/nrf52840/src/bin/wifi_esp_hosted.rs | |||
| @@ -11,7 +11,7 @@ use embassy_nrf::rng::Rng; | |||
| 11 | use embassy_nrf::spim::{self, Spim}; | 11 | use embassy_nrf::spim::{self, Spim}; |
| 12 | use embassy_nrf::{bind_interrupts, peripherals}; | 12 | use embassy_nrf::{bind_interrupts, peripherals}; |
| 13 | use embassy_time::Delay; | 13 | use embassy_time::Delay; |
| 14 | use embedded_hal_async::spi::ExclusiveDevice; | 14 | use embedded_hal_bus::spi::ExclusiveDevice; |
| 15 | use embedded_io_async::Write; | 15 | use embedded_io_async::Write; |
| 16 | use static_cell::make_static; | 16 | use static_cell::make_static; |
| 17 | use {defmt_rtt as _, embassy_net_esp_hosted as hosted, panic_probe as _}; | 17 | use {defmt_rtt as _, embassy_net_esp_hosted as hosted, panic_probe as _}; |
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml index 6742ce7ef..102611bc0 100644 --- a/examples/rp/Cargo.toml +++ b/examples/rp/Cargo.toml | |||
| @@ -42,8 +42,9 @@ smart-leds = "0.3.0" | |||
| 42 | heapless = "0.7.15" | 42 | heapless = "0.7.15" |
| 43 | usbd-hid = "0.6.1" | 43 | usbd-hid = "0.6.1" |
| 44 | 44 | ||
| 45 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | 45 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } |
| 46 | embedded-hal-async = "0.2.0-alpha.2" | 46 | embedded-hal-async = "1.0.0-rc.1" |
| 47 | embedded-hal-bus = { version = "0.1.0-rc.1", features = ["async"] } | ||
| 47 | embedded-io-async = { version = "0.5.0", features = ["defmt-03"] } | 48 | embedded-io-async = { version = "0.5.0", features = ["defmt-03"] } |
| 48 | embedded-storage = { version = "0.3" } | 49 | embedded-storage = { version = "0.3" } |
| 49 | static_cell = { version = "1.1", features = ["nightly"]} | 50 | static_cell = { version = "1.1", features = ["nightly"]} |
| @@ -53,4 +54,7 @@ pio = "0.2.1" | |||
| 53 | rand = { version = "0.8.5", default-features = false } | 54 | rand = { version = "0.8.5", default-features = false } |
| 54 | 55 | ||
| 55 | [profile.release] | 56 | [profile.release] |
| 56 | debug = 2 \ No newline at end of file | 57 | debug = 2 |
| 58 | |||
| 59 | [patch.crates-io] | ||
| 60 | lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"} \ No newline at end of file | ||
diff --git a/examples/rp/src/bin/ethernet_w5500_multisocket.rs b/examples/rp/src/bin/ethernet_w5500_multisocket.rs index d4af87642..c0fde62ab 100644 --- a/examples/rp/src/bin/ethernet_w5500_multisocket.rs +++ b/examples/rp/src/bin/ethernet_w5500_multisocket.rs | |||
| @@ -17,7 +17,7 @@ use embassy_rp::gpio::{Input, Level, Output, Pull}; | |||
| 17 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 17 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; |
| 18 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 18 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 19 | use embassy_time::{Delay, Duration}; | 19 | use embassy_time::{Delay, Duration}; |
| 20 | use embedded_hal_async::spi::ExclusiveDevice; | 20 | use embedded_hal_bus::spi::ExclusiveDevice; |
| 21 | use embedded_io_async::Write; | 21 | use embedded_io_async::Write; |
| 22 | use rand::RngCore; | 22 | use rand::RngCore; |
| 23 | use static_cell::make_static; | 23 | use static_cell::make_static; |
diff --git a/examples/rp/src/bin/ethernet_w5500_tcp_client.rs b/examples/rp/src/bin/ethernet_w5500_tcp_client.rs index 78340492e..e593acae4 100644 --- a/examples/rp/src/bin/ethernet_w5500_tcp_client.rs +++ b/examples/rp/src/bin/ethernet_w5500_tcp_client.rs | |||
| @@ -19,7 +19,7 @@ use embassy_rp::gpio::{Input, Level, Output, Pull}; | |||
| 19 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 19 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; |
| 20 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 20 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 21 | use embassy_time::{Delay, Duration, Timer}; | 21 | use embassy_time::{Delay, Duration, Timer}; |
| 22 | use embedded_hal_async::spi::ExclusiveDevice; | 22 | use embedded_hal_bus::spi::ExclusiveDevice; |
| 23 | use embedded_io_async::Write; | 23 | use embedded_io_async::Write; |
| 24 | use rand::RngCore; | 24 | use rand::RngCore; |
| 25 | use static_cell::make_static; | 25 | use static_cell::make_static; |
diff --git a/examples/rp/src/bin/ethernet_w5500_tcp_server.rs b/examples/rp/src/bin/ethernet_w5500_tcp_server.rs index e6d132740..c62caed7a 100644 --- a/examples/rp/src/bin/ethernet_w5500_tcp_server.rs +++ b/examples/rp/src/bin/ethernet_w5500_tcp_server.rs | |||
| @@ -18,7 +18,7 @@ use embassy_rp::gpio::{Input, Level, Output, Pull}; | |||
| 18 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 18 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; |
| 19 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 19 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 20 | use embassy_time::{Delay, Duration}; | 20 | use embassy_time::{Delay, Duration}; |
| 21 | use embedded_hal_async::spi::ExclusiveDevice; | 21 | use embedded_hal_bus::spi::ExclusiveDevice; |
| 22 | use embedded_io_async::Write; | 22 | use embedded_io_async::Write; |
| 23 | use rand::RngCore; | 23 | use rand::RngCore; |
| 24 | use static_cell::make_static; | 24 | use static_cell::make_static; |
diff --git a/examples/rp/src/bin/ethernet_w5500_udp.rs b/examples/rp/src/bin/ethernet_w5500_udp.rs index b546714df..76dabce1c 100644 --- a/examples/rp/src/bin/ethernet_w5500_udp.rs +++ b/examples/rp/src/bin/ethernet_w5500_udp.rs | |||
| @@ -18,7 +18,7 @@ use embassy_rp::gpio::{Input, Level, Output, Pull}; | |||
| 18 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | 18 | use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; |
| 19 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | 19 | use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; |
| 20 | use embassy_time::Delay; | 20 | use embassy_time::Delay; |
| 21 | use embedded_hal_async::spi::ExclusiveDevice; | 21 | use embedded_hal_bus::spi::ExclusiveDevice; |
| 22 | use rand::RngCore; | 22 | use rand::RngCore; |
| 23 | use static_cell::make_static; | 23 | use static_cell::make_static; |
| 24 | use {defmt_rtt as _, panic_probe as _}; | 24 | use {defmt_rtt as _, panic_probe as _}; |
diff --git a/examples/stm32h5/Cargo.toml b/examples/stm32h5/Cargo.toml index 44d0a9574..5d73e435e 100644 --- a/examples/stm32h5/Cargo.toml +++ b/examples/stm32h5/Cargo.toml | |||
| @@ -20,8 +20,8 @@ defmt-rtt = "0.4" | |||
| 20 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | 20 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } |
| 21 | cortex-m-rt = "0.7.0" | 21 | cortex-m-rt = "0.7.0" |
| 22 | embedded-hal = "0.2.6" | 22 | embedded-hal = "0.2.6" |
| 23 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | 23 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } |
| 24 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 24 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 25 | embedded-nal-async = { version = "0.5.0" } | 25 | embedded-nal-async = { version = "0.5.0" } |
| 26 | panic-probe = { version = "0.3", features = ["print-defmt"] } | 26 | panic-probe = { version = "0.3", features = ["print-defmt"] } |
| 27 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | 27 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } |
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml index e2e5f9364..c78c4c602 100644 --- a/examples/stm32h7/Cargo.toml +++ b/examples/stm32h7/Cargo.toml | |||
| @@ -20,8 +20,8 @@ defmt-rtt = "0.4" | |||
| 20 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | 20 | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } |
| 21 | cortex-m-rt = "0.7.0" | 21 | cortex-m-rt = "0.7.0" |
| 22 | embedded-hal = "0.2.6" | 22 | embedded-hal = "0.2.6" |
| 23 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | 23 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } |
| 24 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 24 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 25 | embedded-nal-async = { version = "0.5.0" } | 25 | embedded-nal-async = { version = "0.5.0" } |
| 26 | panic-probe = { version = "0.3", features = ["print-defmt"] } | 26 | panic-probe = { version = "0.3", features = ["print-defmt"] } |
| 27 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | 27 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } |
diff --git a/examples/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml index 33aa05e65..332a6c5e5 100644 --- a/examples/stm32l0/Cargo.toml +++ b/examples/stm32l0/Cargo.toml | |||
| @@ -37,3 +37,6 @@ static_cell = "1.1" | |||
| 37 | 37 | ||
| 38 | [profile.release] | 38 | [profile.release] |
| 39 | debug = 2 | 39 | debug = 2 |
| 40 | |||
| 41 | [patch.crates-io] | ||
| 42 | lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"} \ No newline at end of file | ||
diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml index 3b27d8e81..944c8c27b 100644 --- a/examples/stm32l4/Cargo.toml +++ b/examples/stm32l4/Cargo.toml | |||
| @@ -19,8 +19,8 @@ defmt-rtt = "0.4" | |||
| 19 | cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } | 19 | cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } |
| 20 | cortex-m-rt = "0.7.0" | 20 | cortex-m-rt = "0.7.0" |
| 21 | embedded-hal = "0.2.6" | 21 | embedded-hal = "0.2.6" |
| 22 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | 22 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } |
| 23 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 23 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 24 | panic-probe = { version = "0.3", features = ["print-defmt"] } | 24 | panic-probe = { version = "0.3", features = ["print-defmt"] } |
| 25 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | 25 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } |
| 26 | heapless = { version = "0.7.5", default-features = false } | 26 | heapless = { version = "0.7.5", default-features = false } |
diff --git a/examples/stm32wl/Cargo.toml b/examples/stm32wl/Cargo.toml index 48b69c8d0..5440807f6 100644 --- a/examples/stm32wl/Cargo.toml +++ b/examples/stm32wl/Cargo.toml | |||
| @@ -30,3 +30,6 @@ chrono = { version = "^0.4", default-features = false } | |||
| 30 | 30 | ||
| 31 | [profile.release] | 31 | [profile.release] |
| 32 | debug = 2 | 32 | debug = 2 |
| 33 | |||
| 34 | [patch.crates-io] | ||
| 35 | lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"} \ No newline at end of file | ||
diff --git a/tests/nrf/Cargo.toml b/tests/nrf/Cargo.toml index 974a9413f..e2dab81af 100644 --- a/tests/nrf/Cargo.toml +++ b/tests/nrf/Cargo.toml | |||
| @@ -15,7 +15,8 @@ embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defm | |||
| 15 | embedded-io-async = { version = "0.5.0" } | 15 | embedded-io-async = { version = "0.5.0" } |
| 16 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", "nightly"] } | 16 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", "nightly"] } |
| 17 | embassy-net-esp-hosted = { version = "0.1.0", path = "../../embassy-net-esp-hosted", features = ["defmt"] } | 17 | embassy-net-esp-hosted = { version = "0.1.0", path = "../../embassy-net-esp-hosted", features = ["defmt"] } |
| 18 | embedded-hal-async = { version = "0.2.0-alpha.2" } | 18 | embedded-hal-async = { version = "1.0.0-rc.1" } |
| 19 | embedded-hal-bus = { version = "0.1.0-rc.1", features = ["async"] } | ||
| 19 | static_cell = { version = "1.1", features = [ "nightly" ] } | 20 | static_cell = { version = "1.1", features = [ "nightly" ] } |
| 20 | 21 | ||
| 21 | defmt = "0.3" | 22 | defmt = "0.3" |
diff --git a/tests/nrf/src/bin/wifi_esp_hosted_perf.rs b/tests/nrf/src/bin/wifi_esp_hosted_perf.rs index e2adfe0be..16055fae8 100644 --- a/tests/nrf/src/bin/wifi_esp_hosted_perf.rs +++ b/tests/nrf/src/bin/wifi_esp_hosted_perf.rs | |||
| @@ -15,7 +15,7 @@ use embassy_nrf::rng::Rng; | |||
| 15 | use embassy_nrf::spim::{self, Spim}; | 15 | use embassy_nrf::spim::{self, Spim}; |
| 16 | use embassy_nrf::{bind_interrupts, peripherals}; | 16 | use embassy_nrf::{bind_interrupts, peripherals}; |
| 17 | use embassy_time::{with_timeout, Delay, Duration, Timer}; | 17 | use embassy_time::{with_timeout, Delay, Duration, Timer}; |
| 18 | use embedded_hal_async::spi::ExclusiveDevice; | 18 | use embedded_hal_bus::spi::ExclusiveDevice; |
| 19 | use static_cell::make_static; | 19 | use static_cell::make_static; |
| 20 | use {defmt_rtt as _, embassy_net_esp_hosted as hosted, panic_probe as _}; | 20 | use {defmt_rtt as _, embassy_net_esp_hosted as hosted, panic_probe as _}; |
| 21 | 21 | ||
diff --git a/tests/rp/Cargo.toml b/tests/rp/Cargo.toml index 90a3bd0cf..c69bf7a88 100644 --- a/tests/rp/Cargo.toml +++ b/tests/rp/Cargo.toml | |||
| @@ -22,8 +22,8 @@ defmt-rtt = "0.4" | |||
| 22 | cortex-m = { version = "0.7.6" } | 22 | cortex-m = { version = "0.7.6" } |
| 23 | cortex-m-rt = "0.7.0" | 23 | cortex-m-rt = "0.7.0" |
| 24 | embedded-hal = "0.2.6" | 24 | embedded-hal = "0.2.6" |
| 25 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | 25 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } |
| 26 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 26 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 27 | panic-probe = { version = "0.3.0", features = ["print-defmt"] } | 27 | panic-probe = { version = "0.3.0", features = ["print-defmt"] } |
| 28 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | 28 | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } |
| 29 | embedded-io-async = { version = "0.5.0" } | 29 | embedded-io-async = { version = "0.5.0" } |
diff --git a/tests/stm32/Cargo.toml b/tests/stm32/Cargo.toml index 17320649e..e26388976 100644 --- a/tests/stm32/Cargo.toml +++ b/tests/stm32/Cargo.toml | |||
| @@ -41,8 +41,8 @@ defmt-rtt = "0.4" | |||
| 41 | cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } | 41 | cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } |
| 42 | cortex-m-rt = "0.7.0" | 42 | cortex-m-rt = "0.7.0" |
| 43 | embedded-hal = "0.2.6" | 43 | embedded-hal = "0.2.6" |
| 44 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | 44 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } |
| 45 | embedded-hal-async = { version = "=0.2.0-alpha.2" } | 45 | embedded-hal-async = { version = "=1.0.0-rc.1" } |
| 46 | micromath = "2.0.0" | 46 | micromath = "2.0.0" |
| 47 | panic-probe = { version = "0.3.0", features = ["print-defmt"] } | 47 | panic-probe = { version = "0.3.0", features = ["print-defmt"] } |
| 48 | rand_core = { version = "0.6", default-features = false } | 48 | rand_core = { version = "0.6", default-features = false } |
