diff options
| author | alexmoon <[email protected]> | 2022-04-05 22:04:11 -0400 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-04-09 01:48:17 +0200 |
| commit | e867364d42477ecf3dc48e6fd787dff96cb6fadf (patch) | |
| tree | 9bd64f21d1343b60186ce437f576c6a0fbbfdda6 /examples/nrf/src/bin/usb_serial.rs | |
| parent | b2cdaa56c1dca5ce293dad3b1e450f97bcf85251 (diff) | |
Unify ReadError and WriteError into EndpointError
Diffstat (limited to 'examples/nrf/src/bin/usb_serial.rs')
| -rw-r--r-- | examples/nrf/src/bin/usb_serial.rs | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/examples/nrf/src/bin/usb_serial.rs b/examples/nrf/src/bin/usb_serial.rs index 500be2ce8..684322837 100644 --- a/examples/nrf/src/bin/usb_serial.rs +++ b/examples/nrf/src/bin/usb_serial.rs | |||
| @@ -10,7 +10,7 @@ use embassy_nrf::interrupt; | |||
| 10 | use embassy_nrf::pac; | 10 | use embassy_nrf::pac; |
| 11 | use embassy_nrf::usb::{Driver, Instance}; | 11 | use embassy_nrf::usb::{Driver, Instance}; |
| 12 | use embassy_nrf::Peripherals; | 12 | use embassy_nrf::Peripherals; |
| 13 | use embassy_usb::driver::{ReadError, WriteError}; | 13 | use embassy_usb::driver::EndpointError; |
| 14 | use embassy_usb::{Config, UsbDeviceBuilder}; | 14 | use embassy_usb::{Config, UsbDeviceBuilder}; |
| 15 | use embassy_usb_serial::{CdcAcmClass, State}; | 15 | use embassy_usb_serial::{CdcAcmClass, State}; |
| 16 | use futures::future::join; | 16 | use futures::future::join; |
| @@ -82,20 +82,11 @@ async fn main(_spawner: Spawner, p: Peripherals) { | |||
| 82 | 82 | ||
| 83 | struct Disconnected {} | 83 | struct Disconnected {} |
| 84 | 84 | ||
| 85 | impl From<ReadError> for Disconnected { | 85 | impl From<EndpointError> for Disconnected { |
| 86 | fn from(val: ReadError) -> Self { | 86 | fn from(val: EndpointError) -> Self { |
| 87 | match val { | 87 | match val { |
| 88 | ReadError::BufferOverflow => panic!("Buffer overflow"), | 88 | EndpointError::BufferOverflow => panic!("Buffer overflow"), |
| 89 | ReadError::Disabled => Disconnected {}, | 89 | EndpointError::Disabled => Disconnected {}, |
| 90 | } | ||
| 91 | } | ||
| 92 | } | ||
| 93 | |||
| 94 | impl From<WriteError> for Disconnected { | ||
| 95 | fn from(val: WriteError) -> Self { | ||
| 96 | match val { | ||
| 97 | WriteError::BufferOverflow => panic!("Buffer overflow"), | ||
| 98 | WriteError::Disabled => Disconnected {}, | ||
| 99 | } | 90 | } |
| 100 | } | 91 | } |
| 101 | } | 92 | } |
