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_multitask.rs | |
| parent | b2cdaa56c1dca5ce293dad3b1e450f97bcf85251 (diff) | |
Unify ReadError and WriteError into EndpointError
Diffstat (limited to 'examples/nrf/src/bin/usb_serial_multitask.rs')
| -rw-r--r-- | examples/nrf/src/bin/usb_serial_multitask.rs | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/examples/nrf/src/bin/usb_serial_multitask.rs b/examples/nrf/src/bin/usb_serial_multitask.rs index 1258bc53d..bfb09014c 100644 --- a/examples/nrf/src/bin/usb_serial_multitask.rs +++ b/examples/nrf/src/bin/usb_serial_multitask.rs | |||
| @@ -11,7 +11,7 @@ use embassy_nrf::pac; | |||
| 11 | use embassy_nrf::usb::Driver; | 11 | use embassy_nrf::usb::Driver; |
| 12 | use embassy_nrf::Peripherals; | 12 | use embassy_nrf::Peripherals; |
| 13 | use embassy_nrf::{interrupt, peripherals}; | 13 | use embassy_nrf::{interrupt, peripherals}; |
| 14 | use embassy_usb::driver::{ReadError, WriteError}; | 14 | use embassy_usb::driver::EndpointError; |
| 15 | use embassy_usb::{Config, UsbDevice, UsbDeviceBuilder}; | 15 | use embassy_usb::{Config, UsbDevice, UsbDeviceBuilder}; |
| 16 | use embassy_usb_serial::{CdcAcmClass, State}; | 16 | use embassy_usb_serial::{CdcAcmClass, State}; |
| 17 | 17 | ||
| @@ -93,20 +93,11 @@ async fn main(spawner: Spawner, p: Peripherals) { | |||
| 93 | 93 | ||
| 94 | struct Disconnected {} | 94 | struct Disconnected {} |
| 95 | 95 | ||
| 96 | impl From<ReadError> for Disconnected { | 96 | impl From<EndpointError> for Disconnected { |
| 97 | fn from(val: ReadError) -> Self { | 97 | fn from(val: EndpointError) -> Self { |
| 98 | match val { | 98 | match val { |
| 99 | ReadError::BufferOverflow => panic!("Buffer overflow"), | 99 | EndpointError::BufferOverflow => panic!("Buffer overflow"), |
| 100 | ReadError::Disabled => Disconnected {}, | 100 | EndpointError::Disabled => Disconnected {}, |
| 101 | } | ||
| 102 | } | ||
| 103 | } | ||
| 104 | |||
| 105 | impl From<WriteError> for Disconnected { | ||
| 106 | fn from(val: WriteError) -> Self { | ||
| 107 | match val { | ||
| 108 | WriteError::BufferOverflow => panic!("Buffer overflow"), | ||
| 109 | WriteError::Disabled => Disconnected {}, | ||
| 110 | } | 101 | } |
| 111 | } | 102 | } |
| 112 | } | 103 | } |
