Update embedded-hal to 1.0.0-rc.1 (#1783)
This commit is contained in:
		
							parent
							
								
									ffe9688952
								
							
						
					
					
						commit
						f26dd54f63
					
				| @ -24,7 +24,7 @@ cortex-m = "0.7.6" | ||||
| cortex-m-rt = "0.7.0" | ||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } | ||||
| 
 | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.11" } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-rc.1" } | ||||
| num_enum = { version = "0.5.7", default-features = false } | ||||
| 
 | ||||
| [package.metadata.embassy_docs] | ||||
|  | ||||
| @ -25,8 +25,8 @@ embassy-time = { version = "0.1.2", path = "../embassy-time", optional = true } | ||||
| embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ | ||||
|     "unproven", | ||||
| ] } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1", optional = true } | ||||
| embedded-storage = "0.3.0" | ||||
| embedded-storage-async = { version = "0.4.0", optional = true } | ||||
| nb = "1.0.0" | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| use embedded_hal_02::{blocking, serial}; | ||||
| use embedded_hal_02::blocking; | ||||
| 
 | ||||
| /// Wrapper that implements async traits using blocking implementations.
 | ||||
| ///
 | ||||
| @ -103,15 +103,6 @@ where | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| // Uart implementatinos
 | ||||
| impl<T, E> embedded_hal_1::serial::ErrorType for BlockingAsync<T> | ||||
| where | ||||
|     T: serial::Read<u8, Error = E>, | ||||
|     E: embedded_hal_1::serial::Error + 'static, | ||||
| { | ||||
|     type Error = E; | ||||
| } | ||||
| 
 | ||||
| /// NOR flash wrapper
 | ||||
| use embedded_storage::nor_flash::{ErrorType, NorFlash, ReadNorFlash}; | ||||
| use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; | ||||
|  | ||||
| @ -23,7 +23,7 @@ log = { version = "0.4.14", optional = true } | ||||
| embassy-time = { version = "0.1.2", path = "../embassy-time", optional = true } | ||||
| embassy-sync = { version = "0.2.0", path = "../embassy-sync" } | ||||
| embassy-stm32 = { version = "0.1.0", path = "../embassy-stm32", default-features = false, optional = true } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| embedded-hal = { version = "0.2", features = ["unproven"] } | ||||
| 
 | ||||
| futures = { version = "0.3.17", default-features = false, features = [ "async-await" ] } | ||||
|  | ||||
| @ -8,8 +8,8 @@ license = "MIT OR Apache-2.0" | ||||
| edition = "2021" | ||||
| 
 | ||||
| [dependencies] | ||||
| embedded-hal = { version = "1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal = { version = "1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| embassy-net-driver = { version = "0.1.0", path = "../embassy-net-driver" } | ||||
| embassy-time = { version = "0.1.2", path = "../embassy-time" } | ||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||
|  | ||||
| @ -12,8 +12,8 @@ embassy-sync = { version = "0.2.0", path = "../embassy-sync"} | ||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures"} | ||||
| embassy-net-driver-channel = { version = "0.1.0", path = "../embassy-net-driver-channel"} | ||||
| 
 | ||||
| embedded-hal = { version = "1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal = { version = "1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| 
 | ||||
| noproto = { git="https://github.com/embassy-rs/noproto", default-features = false, features = ["derive"] } | ||||
| #noproto = { version = "0.1", path = "/home/dirbaio/noproto", default-features = false, features = ["derive"] } | ||||
|  | ||||
| @ -8,8 +8,8 @@ license = "MIT OR Apache-2.0" | ||||
| edition = "2021" | ||||
| 
 | ||||
| [dependencies] | ||||
| embedded-hal = { version = "1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal = { version = "1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| embassy-net-driver-channel = { version = "0.1.0", path = "../embassy-net-driver-channel" } | ||||
| embassy-time = { version = "0.1.2", path = "../embassy-time" } | ||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||
|  | ||||
| @ -98,8 +98,8 @@ embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" } | ||||
| embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional=true } | ||||
| 
 | ||||
| embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1", optional = true} | ||||
| embedded-io = { version = "0.5.0" } | ||||
| embedded-io-async = { version = "0.5.0", optional = true } | ||||
| 
 | ||||
|  | ||||
| @ -949,51 +949,3 @@ mod eh02 { | ||||
|         } | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| #[cfg(feature = "unstable-traits")] | ||||
| mod eh1 { | ||||
|     use super::*; | ||||
| 
 | ||||
|     impl embedded_hal_1::serial::Error for Error { | ||||
|         fn kind(&self) -> embedded_hal_1::serial::ErrorKind { | ||||
|             match *self { | ||||
|                 Self::BufferTooLong => embedded_hal_1::serial::ErrorKind::Other, | ||||
|                 Self::BufferNotInRAM => embedded_hal_1::serial::ErrorKind::Other, | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     // =====================
 | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for Uarte<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::Write for Uarte<'d, T> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             Ok(()) | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for UarteTx<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::Write for UarteTx<'d, T> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             Ok(()) | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for UarteRx<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -85,9 +85,9 @@ fixed = "1.23.1" | ||||
| rp-pac = { version = "6" } | ||||
| 
 | ||||
| embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} | ||||
| embedded-hal-nb = { version = "=1.0.0-alpha.3", optional = true} | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1", optional = true} | ||||
| embedded-hal-nb = { version = "=1.0.0-rc.1", optional = true} | ||||
| 
 | ||||
| paste = "1.0" | ||||
| pio-proc = {version= "0.2" } | ||||
|  | ||||
| @ -749,15 +749,15 @@ mod eh02 { | ||||
| mod eh1 { | ||||
|     use super::*; | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for BufferedUart<'d, T> { | ||||
|     impl<'d, T: Instance> embedded_hal_nb::serial::ErrorType for BufferedUartRx<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for BufferedUartTx<'d, T> { | ||||
|     impl<'d, T: Instance> embedded_hal_nb::serial::ErrorType for BufferedUartTx<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::ErrorType for BufferedUartRx<'d, T> { | ||||
|     impl<'d, T: Instance> embedded_hal_nb::serial::ErrorType for BufferedUart<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
| @ -767,16 +767,6 @@ mod eh1 { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::Write for BufferedUartTx<'d, T> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer).map(drop) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             self.blocking_flush() | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_nb::serial::Write for BufferedUartTx<'d, T> { | ||||
|         fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | ||||
|             self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) | ||||
| @ -793,16 +783,6 @@ mod eh1 { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_1::serial::Write for BufferedUart<'d, T> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer).map(drop) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             self.blocking_flush() | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance> embedded_hal_nb::serial::Write for BufferedUart<'d, T> { | ||||
|         fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | ||||
|             self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) | ||||
|  | ||||
| @ -807,26 +807,26 @@ mod eh02 { | ||||
| mod eh1 { | ||||
|     use super::*; | ||||
| 
 | ||||
|     impl embedded_hal_1::serial::Error for Error { | ||||
|         fn kind(&self) -> embedded_hal_1::serial::ErrorKind { | ||||
|     impl embedded_hal_nb::serial::Error for Error { | ||||
|         fn kind(&self) -> embedded_hal_nb::serial::ErrorKind { | ||||
|             match *self { | ||||
|                 Self::Framing => embedded_hal_1::serial::ErrorKind::FrameFormat, | ||||
|                 Self::Break => embedded_hal_1::serial::ErrorKind::Other, | ||||
|                 Self::Overrun => embedded_hal_1::serial::ErrorKind::Overrun, | ||||
|                 Self::Parity => embedded_hal_1::serial::ErrorKind::Parity, | ||||
|                 Self::Framing => embedded_hal_nb::serial::ErrorKind::FrameFormat, | ||||
|                 Self::Break => embedded_hal_nb::serial::ErrorKind::Other, | ||||
|                 Self::Overrun => embedded_hal_nb::serial::ErrorKind::Overrun, | ||||
|                 Self::Parity => embedded_hal_nb::serial::ErrorKind::Parity, | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::ErrorType for Uart<'d, T, M> { | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::ErrorType for UartRx<'d, T, M> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::ErrorType for UartTx<'d, T, M> { | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::ErrorType for UartTx<'d, T, M> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::ErrorType for UartRx<'d, T, M> { | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::ErrorType for Uart<'d, T, M> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
| @ -851,16 +851,6 @@ mod eh1 { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::Write for UartTx<'d, T, M> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             self.blocking_flush() | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::Write for UartTx<'d, T, M> { | ||||
|         fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | ||||
|             self.blocking_write(&[char]).map_err(nb::Error::Other) | ||||
| @ -877,16 +867,6 @@ mod eh1 { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_1::serial::Write for Uart<'d, T, M> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             self.blocking_flush() | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: Instance, M: Mode> embedded_hal_nb::serial::Write for Uart<'d, T, M> { | ||||
|         fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | ||||
|             self.blocking_write(&[char]).map_err(nb::Error::Other) | ||||
|  | ||||
| @ -40,9 +40,9 @@ embassy-net-driver = { version = "0.1.0", path = "../embassy-net-driver" } | ||||
| embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional = true } | ||||
| 
 | ||||
| embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} | ||||
| embedded-hal-nb = { version = "=1.0.0-alpha.3", optional = true} | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1", optional = true} | ||||
| embedded-hal-nb = { version = "=1.0.0-rc.1", optional = true} | ||||
| 
 | ||||
| embedded-storage = "0.3.0" | ||||
| embedded-storage-async = { version = "0.4.0", optional = true } | ||||
|  | ||||
| @ -584,15 +584,15 @@ mod eh02 { | ||||
| mod eh1 { | ||||
|     use super::*; | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance> embedded_hal_1::serial::ErrorType for BufferedUart<'d, T> { | ||||
|     impl<'d, T: BasicInstance> embedded_hal_nb::serial::ErrorType for BufferedUart<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance> embedded_hal_1::serial::ErrorType for BufferedUartTx<'d, T> { | ||||
|     impl<'d, T: BasicInstance> embedded_hal_nb::serial::ErrorType for BufferedUartTx<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance> embedded_hal_1::serial::ErrorType for BufferedUartRx<'d, T> { | ||||
|     impl<'d, T: BasicInstance> embedded_hal_nb::serial::ErrorType for BufferedUartRx<'d, T> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
| @ -602,16 +602,6 @@ mod eh1 { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance> embedded_hal_1::serial::Write for BufferedUartTx<'d, T> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer).map(drop) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             self.blocking_flush() | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance> embedded_hal_nb::serial::Write for BufferedUartTx<'d, T> { | ||||
|         fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | ||||
|             self.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) | ||||
| @ -628,16 +618,6 @@ mod eh1 { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance> embedded_hal_1::serial::Write for BufferedUart<'d, T> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.tx.blocking_write(buffer).map(drop) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             self.tx.blocking_flush() | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance> embedded_hal_nb::serial::Write for BufferedUart<'d, T> { | ||||
|         fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | ||||
|             self.tx.blocking_write(&[char]).map(drop).map_err(nb::Error::Other) | ||||
|  | ||||
| @ -943,27 +943,27 @@ mod eh02 { | ||||
| mod eh1 { | ||||
|     use super::*; | ||||
| 
 | ||||
|     impl embedded_hal_1::serial::Error for Error { | ||||
|         fn kind(&self) -> embedded_hal_1::serial::ErrorKind { | ||||
|     impl embedded_hal_nb::serial::Error for Error { | ||||
|         fn kind(&self) -> embedded_hal_nb::serial::ErrorKind { | ||||
|             match *self { | ||||
|                 Self::Framing => embedded_hal_1::serial::ErrorKind::FrameFormat, | ||||
|                 Self::Noise => embedded_hal_1::serial::ErrorKind::Noise, | ||||
|                 Self::Overrun => embedded_hal_1::serial::ErrorKind::Overrun, | ||||
|                 Self::Parity => embedded_hal_1::serial::ErrorKind::Parity, | ||||
|                 Self::BufferTooLong => embedded_hal_1::serial::ErrorKind::Other, | ||||
|                 Self::Framing => embedded_hal_nb::serial::ErrorKind::FrameFormat, | ||||
|                 Self::Noise => embedded_hal_nb::serial::ErrorKind::Noise, | ||||
|                 Self::Overrun => embedded_hal_nb::serial::ErrorKind::Overrun, | ||||
|                 Self::Parity => embedded_hal_nb::serial::ErrorKind::Parity, | ||||
|                 Self::BufferTooLong => embedded_hal_nb::serial::ErrorKind::Other, | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_1::serial::ErrorType for Uart<'d, T, TxDma, RxDma> { | ||||
|     impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_nb::serial::ErrorType for Uart<'d, T, TxDma, RxDma> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance, TxDma> embedded_hal_1::serial::ErrorType for UartTx<'d, T, TxDma> { | ||||
|     impl<'d, T: BasicInstance, TxDma> embedded_hal_nb::serial::ErrorType for UartTx<'d, T, TxDma> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance, RxDma> embedded_hal_1::serial::ErrorType for UartRx<'d, T, RxDma> { | ||||
|     impl<'d, T: BasicInstance, RxDma> embedded_hal_nb::serial::ErrorType for UartRx<'d, T, RxDma> { | ||||
|         type Error = Error; | ||||
|     } | ||||
| 
 | ||||
| @ -973,16 +973,6 @@ mod eh1 { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance, TxDma> embedded_hal_1::serial::Write for UartTx<'d, T, TxDma> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             self.blocking_flush() | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance, TxDma> embedded_hal_nb::serial::Write for UartTx<'d, T, TxDma> { | ||||
|         fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | ||||
|             self.blocking_write(&[char]).map_err(nb::Error::Other) | ||||
| @ -999,16 +989,6 @@ mod eh1 { | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_1::serial::Write for Uart<'d, T, TxDma, RxDma> { | ||||
|         fn write(&mut self, buffer: &[u8]) -> Result<(), Self::Error> { | ||||
|             self.blocking_write(buffer) | ||||
|         } | ||||
| 
 | ||||
|         fn flush(&mut self) -> Result<(), Self::Error> { | ||||
|             self.blocking_flush() | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     impl<'d, T: BasicInstance, TxDma, RxDma> embedded_hal_nb::serial::Write for Uart<'d, T, TxDma, RxDma> { | ||||
|         fn write(&mut self, char: u8) -> nb::Result<(), Self::Error> { | ||||
|             self.blocking_write(&[char]).map_err(nb::Error::Other) | ||||
|  | ||||
| @ -152,8 +152,8 @@ defmt = { version = "0.3", optional = true } | ||||
| log = { version = "0.4.14", optional = true } | ||||
| 
 | ||||
| embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true} | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true} | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1", optional = true} | ||||
| 
 | ||||
| futures-util = { version = "0.3.17", default-features = false } | ||||
| atomic-polyfill = "1.0.1" | ||||
|  | ||||
| @ -19,6 +19,7 @@ nightly = [ | ||||
|     "static_cell/nightly", | ||||
|     "embassy-usb", | ||||
|     "embedded-io-async", | ||||
|     "embedded-hal-bus/async", | ||||
|     "embassy-net", | ||||
|     "embassy-lora", | ||||
|     "lora-phy", | ||||
| @ -56,11 +57,14 @@ rand = { version = "0.8.4", default-features = false } | ||||
| embedded-storage = "0.3.0" | ||||
| usbd-hid = "0.6.0" | ||||
| serde = { version = "1.0.136", default-features = false } | ||||
| embedded-hal = { version = "1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "0.2.0-alpha.2", optional = true } | ||||
| embedded-hal-bus = { version = "0.1.0-alpha.3" } | ||||
| embedded-hal = { version = "1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "1.0.0-rc.1", optional = true } | ||||
| embedded-hal-bus = { version = "0.1.0-rc.1" } | ||||
| num-integer = { version = "0.1.45", default-features = false } | ||||
| microfft = "0.5.0" | ||||
| 
 | ||||
| [profile.release] | ||||
| debug = 2 | ||||
| 
 | ||||
| [patch.crates-io] | ||||
| lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"} | ||||
| @ -11,7 +11,7 @@ use embassy_nrf::rng::Rng; | ||||
| use embassy_nrf::spim::{self, Spim}; | ||||
| use embassy_nrf::{bind_interrupts, peripherals}; | ||||
| use embassy_time::Delay; | ||||
| use embedded_hal_async::spi::ExclusiveDevice; | ||||
| use embedded_hal_bus::spi::ExclusiveDevice; | ||||
| use embedded_io_async::Write; | ||||
| use static_cell::make_static; | ||||
| use {defmt_rtt as _, embassy_net_esp_hosted as hosted, panic_probe as _}; | ||||
|  | ||||
| @ -42,8 +42,9 @@ smart-leds = "0.3.0" | ||||
| heapless = "0.7.15" | ||||
| usbd-hid = "0.6.1" | ||||
| 
 | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | ||||
| embedded-hal-async = "0.2.0-alpha.2" | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } | ||||
| embedded-hal-async = "1.0.0-rc.1" | ||||
| embedded-hal-bus = { version = "0.1.0-rc.1", features = ["async"] } | ||||
| embedded-io-async = { version = "0.5.0", features = ["defmt-03"] } | ||||
| embedded-storage = { version = "0.3" } | ||||
| static_cell = { version = "1.1", features = ["nightly"]} | ||||
| @ -54,3 +55,6 @@ rand = { version = "0.8.5", default-features = false } | ||||
| 
 | ||||
| [profile.release] | ||||
| debug = 2 | ||||
| 
 | ||||
| [patch.crates-io] | ||||
| lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"} | ||||
| @ -17,7 +17,7 @@ use embassy_rp::gpio::{Input, Level, Output, Pull}; | ||||
| use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | ||||
| use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | ||||
| use embassy_time::{Delay, Duration}; | ||||
| use embedded_hal_async::spi::ExclusiveDevice; | ||||
| use embedded_hal_bus::spi::ExclusiveDevice; | ||||
| use embedded_io_async::Write; | ||||
| use rand::RngCore; | ||||
| use static_cell::make_static; | ||||
|  | ||||
| @ -19,7 +19,7 @@ use embassy_rp::gpio::{Input, Level, Output, Pull}; | ||||
| use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | ||||
| use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | ||||
| use embassy_time::{Delay, Duration, Timer}; | ||||
| use embedded_hal_async::spi::ExclusiveDevice; | ||||
| use embedded_hal_bus::spi::ExclusiveDevice; | ||||
| use embedded_io_async::Write; | ||||
| use rand::RngCore; | ||||
| use static_cell::make_static; | ||||
|  | ||||
| @ -18,7 +18,7 @@ use embassy_rp::gpio::{Input, Level, Output, Pull}; | ||||
| use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | ||||
| use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | ||||
| use embassy_time::{Delay, Duration}; | ||||
| use embedded_hal_async::spi::ExclusiveDevice; | ||||
| use embedded_hal_bus::spi::ExclusiveDevice; | ||||
| use embedded_io_async::Write; | ||||
| use rand::RngCore; | ||||
| use static_cell::make_static; | ||||
|  | ||||
| @ -18,7 +18,7 @@ use embassy_rp::gpio::{Input, Level, Output, Pull}; | ||||
| use embassy_rp::peripherals::{PIN_17, PIN_20, PIN_21, SPI0}; | ||||
| use embassy_rp::spi::{Async, Config as SpiConfig, Spi}; | ||||
| use embassy_time::Delay; | ||||
| use embedded_hal_async::spi::ExclusiveDevice; | ||||
| use embedded_hal_bus::spi::ExclusiveDevice; | ||||
| use rand::RngCore; | ||||
| use static_cell::make_static; | ||||
| use {defmt_rtt as _, panic_probe as _}; | ||||
|  | ||||
| @ -20,8 +20,8 @@ defmt-rtt = "0.4" | ||||
| cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | ||||
| cortex-m-rt = "0.7.0" | ||||
| embedded-hal = "0.2.6" | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| embedded-nal-async = { version = "0.5.0" } | ||||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | ||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | ||||
|  | ||||
| @ -20,8 +20,8 @@ defmt-rtt = "0.4" | ||||
| cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | ||||
| cortex-m-rt = "0.7.0" | ||||
| embedded-hal = "0.2.6" | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| embedded-nal-async = { version = "0.5.0" } | ||||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | ||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | ||||
|  | ||||
| @ -37,3 +37,6 @@ static_cell = "1.1" | ||||
| 
 | ||||
| [profile.release] | ||||
| debug = 2 | ||||
| 
 | ||||
| [patch.crates-io] | ||||
| lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"} | ||||
| @ -19,8 +19,8 @@ defmt-rtt = "0.4" | ||||
| cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } | ||||
| cortex-m-rt = "0.7.0" | ||||
| embedded-hal = "0.2.6" | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | ||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | ||||
| heapless = { version = "0.7.5", default-features = false } | ||||
|  | ||||
| @ -30,3 +30,6 @@ chrono = { version = "^0.4", default-features = false } | ||||
| 
 | ||||
| [profile.release] | ||||
| debug = 2 | ||||
| 
 | ||||
| [patch.crates-io] | ||||
| lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"} | ||||
| @ -15,7 +15,8 @@ embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defm | ||||
| embedded-io-async = { version = "0.5.0" } | ||||
| embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", "nightly"] } | ||||
| embassy-net-esp-hosted = { version = "0.1.0", path = "../../embassy-net-esp-hosted", features = ["defmt"] } | ||||
| embedded-hal-async = { version = "0.2.0-alpha.2" } | ||||
| embedded-hal-async = { version = "1.0.0-rc.1" } | ||||
| embedded-hal-bus = { version = "0.1.0-rc.1", features = ["async"] } | ||||
| static_cell = { version = "1.1", features = [ "nightly" ] } | ||||
| 
 | ||||
| defmt = "0.3" | ||||
|  | ||||
| @ -15,7 +15,7 @@ use embassy_nrf::rng::Rng; | ||||
| use embassy_nrf::spim::{self, Spim}; | ||||
| use embassy_nrf::{bind_interrupts, peripherals}; | ||||
| use embassy_time::{with_timeout, Delay, Duration, Timer}; | ||||
| use embedded_hal_async::spi::ExclusiveDevice; | ||||
| use embedded_hal_bus::spi::ExclusiveDevice; | ||||
| use static_cell::make_static; | ||||
| use {defmt_rtt as _, embassy_net_esp_hosted as hosted, panic_probe as _}; | ||||
| 
 | ||||
|  | ||||
| @ -22,8 +22,8 @@ defmt-rtt = "0.4" | ||||
| cortex-m = { version = "0.7.6" } | ||||
| cortex-m-rt = "0.7.0" | ||||
| embedded-hal = "0.2.6" | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| panic-probe = { version = "0.3.0", features = ["print-defmt"] } | ||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | ||||
| embedded-io-async = { version = "0.5.0" } | ||||
|  | ||||
| @ -41,8 +41,8 @@ defmt-rtt = "0.4" | ||||
| cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } | ||||
| cortex-m-rt = "0.7.0" | ||||
| embedded-hal = "0.2.6" | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11" } | ||||
| embedded-hal-async = { version = "=0.2.0-alpha.2" } | ||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" } | ||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||
| micromath = "2.0.0" | ||||
| panic-probe = { version = "0.3.0", features = ["print-defmt"] } | ||||
| rand_core = { version = "0.6", default-features = false } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user