aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32l4/src
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2024-03-19 20:44:33 +0100
committerDario Nieuwenhuis <[email protected]>2024-03-19 22:07:16 +0100
commit530ff9d4d33abff34edb718d650c71a41dd68f8c (patch)
tree4b2508fe52e8f279a544e93550c6316e01b6f4c7 /examples/stm32l4/src
parent594d330a494a246bd2611e8793f34d08fde80b5c (diff)
stm32/usb: merge usb and usb_otg into single module.
Diffstat (limited to 'examples/stm32l4/src')
-rw-r--r--examples/stm32l4/src/bin/usb_serial.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/stm32l4/src/bin/usb_serial.rs b/examples/stm32l4/src/bin/usb_serial.rs
index 9247e56a1..c7f4add7f 100644
--- a/examples/stm32l4/src/bin/usb_serial.rs
+++ b/examples/stm32l4/src/bin/usb_serial.rs
@@ -5,8 +5,8 @@ use defmt::{panic, *};
5use defmt_rtt as _; // global logger 5use defmt_rtt as _; // global logger
6use embassy_executor::Spawner; 6use embassy_executor::Spawner;
7use embassy_stm32::rcc::*; 7use embassy_stm32::rcc::*;
8use embassy_stm32::usb_otg::{Driver, Instance}; 8use embassy_stm32::usb::{Driver, Instance};
9use embassy_stm32::{bind_interrupts, peripherals, usb_otg, Config}; 9use embassy_stm32::{bind_interrupts, peripherals, usb, Config};
10use embassy_usb::class::cdc_acm::{CdcAcmClass, State}; 10use embassy_usb::class::cdc_acm::{CdcAcmClass, State};
11use embassy_usb::driver::EndpointError; 11use embassy_usb::driver::EndpointError;
12use embassy_usb::Builder; 12use embassy_usb::Builder;
@@ -14,7 +14,7 @@ use futures::future::join;
14use panic_probe as _; 14use panic_probe as _;
15 15
16bind_interrupts!(struct Irqs { 16bind_interrupts!(struct Irqs {
17 OTG_FS => usb_otg::InterruptHandler<peripherals::USB_OTG_FS>; 17 OTG_FS => usb::InterruptHandler<peripherals::USB_OTG_FS>;
18}); 18});
19 19
20#[embassy_executor::main] 20#[embassy_executor::main]
@@ -38,7 +38,7 @@ async fn main(_spawner: Spawner) {
38 38
39 // Create the driver, from the HAL. 39 // Create the driver, from the HAL.
40 let mut ep_out_buffer = [0u8; 256]; 40 let mut ep_out_buffer = [0u8; 256];
41 let mut config = embassy_stm32::usb_otg::Config::default(); 41 let mut config = embassy_stm32::usb::Config::default();
42 config.vbus_detection = true; 42 config.vbus_detection = true;
43 let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config); 43 let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
44 44