diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-02-01 00:48:33 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-02-01 01:17:41 +0100 |
| commit | b5cf332cc076a0de11ce6a0563a2235c9e57eb5c (patch) | |
| tree | ce14e014dfbe8c3764040d7f9f1ffee84ab5747b /examples/nrf52840/src/bin/usb_serial.rs | |
| parent | ca10fe7135d10084e38038f3cd433da39e505bea (diff) | |
nrf: docs.
Diffstat (limited to 'examples/nrf52840/src/bin/usb_serial.rs')
| -rw-r--r-- | examples/nrf52840/src/bin/usb_serial.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/nrf52840/src/bin/usb_serial.rs b/examples/nrf52840/src/bin/usb_serial.rs index 7c9c4184b..18b6f25b9 100644 --- a/examples/nrf52840/src/bin/usb_serial.rs +++ b/examples/nrf52840/src/bin/usb_serial.rs | |||
| @@ -7,7 +7,7 @@ use core::mem; | |||
| 7 | use defmt::{info, panic}; | 7 | use defmt::{info, panic}; |
| 8 | use embassy_executor::Spawner; | 8 | use embassy_executor::Spawner; |
| 9 | use embassy_futures::join::join; | 9 | use embassy_futures::join::join; |
| 10 | use embassy_nrf::usb::{Driver, Instance, PowerUsb, UsbSupply}; | 10 | use embassy_nrf::usb::{Driver, HardwareVbusDetect, Instance, VbusDetect}; |
| 11 | use embassy_nrf::{interrupt, pac}; | 11 | use embassy_nrf::{interrupt, pac}; |
| 12 | use embassy_usb::class::cdc_acm::{CdcAcmClass, State}; | 12 | use embassy_usb::class::cdc_acm::{CdcAcmClass, State}; |
| 13 | use embassy_usb::driver::EndpointError; | 13 | use embassy_usb::driver::EndpointError; |
| @@ -26,7 +26,7 @@ async fn main(_spawner: Spawner) { | |||
| 26 | // Create the driver, from the HAL. | 26 | // Create the driver, from the HAL. |
| 27 | let irq = interrupt::take!(USBD); | 27 | let irq = interrupt::take!(USBD); |
| 28 | let power_irq = interrupt::take!(POWER_CLOCK); | 28 | let power_irq = interrupt::take!(POWER_CLOCK); |
| 29 | let driver = Driver::new(p.USBD, irq, PowerUsb::new(power_irq)); | 29 | let driver = Driver::new(p.USBD, irq, HardwareVbusDetect::new(power_irq)); |
| 30 | 30 | ||
| 31 | // Create embassy-usb Config | 31 | // Create embassy-usb Config |
| 32 | let mut config = Config::new(0xc0de, 0xcafe); | 32 | let mut config = Config::new(0xc0de, 0xcafe); |
| @@ -97,7 +97,7 @@ impl From<EndpointError> for Disconnected { | |||
| 97 | } | 97 | } |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | async fn echo<'d, T: Instance + 'd, P: UsbSupply + 'd>( | 100 | async fn echo<'d, T: Instance + 'd, P: VbusDetect + 'd>( |
| 101 | class: &mut CdcAcmClass<'d, Driver<'d, T, P>>, | 101 | class: &mut CdcAcmClass<'d, Driver<'d, T, P>>, |
| 102 | ) -> Result<(), Disconnected> { | 102 | ) -> Result<(), Disconnected> { |
| 103 | let mut buf = [0; 64]; | 103 | let mut buf = [0; 64]; |
