diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/stm32f4/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/usb_uart.rs | 99 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/usb_uart_ulpi.rs | 114 | ||||
| -rw-r--r-- | examples/stm32l4/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/usb_uart.rs | 115 |
5 files changed, 2 insertions, 330 deletions
diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml index 1bc406495..e2065bed9 100644 --- a/examples/stm32f4/Cargo.toml +++ b/examples/stm32f4/Cargo.toml | |||
| @@ -8,7 +8,7 @@ resolver = "2" | |||
| 8 | 8 | ||
| 9 | [dependencies] | 9 | [dependencies] |
| 10 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits"] } | 10 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits"] } |
| 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-any", "exti", "usb-otg"] } | 11 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-any", "exti"] } |
| 12 | 12 | ||
| 13 | defmt = "0.3" | 13 | defmt = "0.3" |
| 14 | defmt-rtt = "0.3" | 14 | defmt-rtt = "0.3" |
diff --git a/examples/stm32f4/src/bin/usb_uart.rs b/examples/stm32f4/src/bin/usb_uart.rs deleted file mode 100644 index 251ed1eb0..000000000 --- a/examples/stm32f4/src/bin/usb_uart.rs +++ /dev/null | |||
| @@ -1,99 +0,0 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use defmt_rtt as _; // global logger | ||
| 6 | use panic_probe as _; | ||
| 7 | |||
| 8 | use defmt::{info, unwrap}; | ||
| 9 | use defmt_rtt as _; // global logger | ||
| 10 | use embassy::interrupt::InterruptExt; | ||
| 11 | use futures::pin_mut; | ||
| 12 | use panic_probe as _; // print out panic messages | ||
| 13 | |||
| 14 | use embassy::executor::Spawner; | ||
| 15 | use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; | ||
| 16 | use embassy_stm32::usb_otg::{State, Usb, UsbBus, UsbOtg, UsbSerial}; | ||
| 17 | use embassy_stm32::{interrupt, time::Hertz, Config, Peripherals}; | ||
| 18 | use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; | ||
| 19 | |||
| 20 | static mut EP_MEMORY: [u32; 2048] = [0; 2048]; | ||
| 21 | |||
| 22 | // USB requires at least 48 MHz clock | ||
| 23 | fn config() -> Config { | ||
| 24 | let mut config = Config::default(); | ||
| 25 | config.rcc.sys_ck = Some(Hertz(48_000_000)); | ||
| 26 | config | ||
| 27 | } | ||
| 28 | |||
| 29 | #[embassy::main(config = "config()")] | ||
| 30 | async fn main(_spawner: Spawner, p: Peripherals) { | ||
| 31 | let mut rx_buffer = [0u8; 64]; | ||
| 32 | // we send back input + cr + lf | ||
| 33 | let mut tx_buffer = [0u8; 66]; | ||
| 34 | |||
| 35 | let peri = UsbOtg::new_fs(p.USB_OTG_FS, p.PA12, p.PA11); | ||
| 36 | let usb_bus = UsbBus::new(peri, unsafe { &mut EP_MEMORY }); | ||
| 37 | |||
| 38 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); | ||
| 39 | |||
| 40 | let device = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd)) | ||
| 41 | .manufacturer("Fake company") | ||
| 42 | .product("Serial port") | ||
| 43 | .serial_number("TEST") | ||
| 44 | .device_class(0x02) | ||
| 45 | .build(); | ||
| 46 | |||
| 47 | let irq = interrupt::take!(OTG_FS); | ||
| 48 | irq.set_priority(interrupt::Priority::P3); | ||
| 49 | |||
| 50 | let mut state = State::new(); | ||
| 51 | let usb = unsafe { Usb::new(&mut state, device, serial, irq) }; | ||
| 52 | pin_mut!(usb); | ||
| 53 | |||
| 54 | let (mut reader, mut writer) = usb.as_ref().take_serial_0(); | ||
| 55 | |||
| 56 | info!("usb initialized!"); | ||
| 57 | |||
| 58 | unwrap!( | ||
| 59 | writer | ||
| 60 | .write_all(b"\r\nInput returned upper cased on CR+LF\r\n") | ||
| 61 | .await | ||
| 62 | ); | ||
| 63 | |||
| 64 | let mut buf = [0u8; 64]; | ||
| 65 | loop { | ||
| 66 | let mut n = 0; | ||
| 67 | |||
| 68 | async { | ||
| 69 | loop { | ||
| 70 | let char = unwrap!(reader.read_byte().await); | ||
| 71 | |||
| 72 | if char == b'\r' || char == b'\n' { | ||
| 73 | break; | ||
| 74 | } | ||
| 75 | |||
| 76 | buf[n] = char; | ||
| 77 | n += 1; | ||
| 78 | |||
| 79 | // stop if we're out of room | ||
| 80 | if n == buf.len() { | ||
| 81 | break; | ||
| 82 | } | ||
| 83 | } | ||
| 84 | } | ||
| 85 | .await; | ||
| 86 | |||
| 87 | if n > 0 { | ||
| 88 | for char in buf[..n].iter_mut() { | ||
| 89 | // upper case | ||
| 90 | if 0x61 <= *char && *char <= 0x7a { | ||
| 91 | *char &= !0x20; | ||
| 92 | } | ||
| 93 | } | ||
| 94 | unwrap!(writer.write_all(&buf[..n]).await); | ||
| 95 | unwrap!(writer.write_all(b"\r\n").await); | ||
| 96 | unwrap!(writer.flush().await); | ||
| 97 | } | ||
| 98 | } | ||
| 99 | } | ||
diff --git a/examples/stm32f4/src/bin/usb_uart_ulpi.rs b/examples/stm32f4/src/bin/usb_uart_ulpi.rs deleted file mode 100644 index f6c373602..000000000 --- a/examples/stm32f4/src/bin/usb_uart_ulpi.rs +++ /dev/null | |||
| @@ -1,114 +0,0 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use defmt_rtt as _; // global logger | ||
| 6 | use panic_probe as _; | ||
| 7 | |||
| 8 | use defmt::{info, unwrap}; | ||
| 9 | use defmt_rtt as _; // global logger | ||
| 10 | use embassy::interrupt::InterruptExt; | ||
| 11 | use futures::pin_mut; | ||
| 12 | use panic_probe as _; // print out panic messages | ||
| 13 | |||
| 14 | use embassy::executor::Spawner; | ||
| 15 | use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; | ||
| 16 | use embassy_stm32::usb_otg::{State, Usb, UsbBus, UsbOtg, UsbSerial}; | ||
| 17 | use embassy_stm32::{interrupt, time::Hertz, Config, Peripherals}; | ||
| 18 | use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; | ||
| 19 | |||
| 20 | static mut EP_MEMORY: [u32; 2048] = [0; 2048]; | ||
| 21 | |||
| 22 | // USB requires at least 48 MHz clock | ||
| 23 | fn config() -> Config { | ||
| 24 | let mut config = Config::default(); | ||
| 25 | config.rcc.sys_ck = Some(Hertz(48_000_000)); | ||
| 26 | config | ||
| 27 | } | ||
| 28 | |||
| 29 | #[embassy::main(config = "config()")] | ||
| 30 | async fn main(_spawner: Spawner, p: Peripherals) { | ||
| 31 | let mut rx_buffer = [0u8; 64]; | ||
| 32 | // we send back input + cr + lf | ||
| 33 | let mut tx_buffer = [0u8; 66]; | ||
| 34 | |||
| 35 | // USB with external high-speed PHY | ||
| 36 | let peri = UsbOtg::new_hs_ulpi( | ||
| 37 | p.USB_OTG_HS, | ||
| 38 | p.PA5, | ||
| 39 | p.PC2, | ||
| 40 | p.PC3, | ||
| 41 | p.PC0, | ||
| 42 | p.PA3, | ||
| 43 | p.PB0, | ||
| 44 | p.PB1, | ||
| 45 | p.PB10, | ||
| 46 | p.PB11, | ||
| 47 | p.PB12, | ||
| 48 | p.PB13, | ||
| 49 | p.PB5, | ||
| 50 | ); | ||
| 51 | let usb_bus = UsbBus::new(peri, unsafe { &mut EP_MEMORY }); | ||
| 52 | |||
| 53 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); | ||
| 54 | |||
| 55 | let device = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd)) | ||
| 56 | .manufacturer("Fake company") | ||
| 57 | .product("Serial port") | ||
| 58 | .serial_number("TEST") | ||
| 59 | .device_class(0x02) | ||
| 60 | .build(); | ||
| 61 | |||
| 62 | let irq = interrupt::take!(OTG_FS); | ||
| 63 | irq.set_priority(interrupt::Priority::P3); | ||
| 64 | |||
| 65 | let mut state = State::new(); | ||
| 66 | let usb = unsafe { Usb::new(&mut state, device, serial, irq) }; | ||
| 67 | pin_mut!(usb); | ||
| 68 | |||
| 69 | let (mut reader, mut writer) = usb.as_ref().take_serial_0(); | ||
| 70 | |||
| 71 | info!("usb initialized!"); | ||
| 72 | |||
| 73 | unwrap!( | ||
| 74 | writer | ||
| 75 | .write_all(b"\r\nInput returned upper cased on CR+LF\r\n") | ||
| 76 | .await | ||
| 77 | ); | ||
| 78 | |||
| 79 | let mut buf = [0u8; 64]; | ||
| 80 | loop { | ||
| 81 | let mut n = 0; | ||
| 82 | |||
| 83 | async { | ||
| 84 | loop { | ||
| 85 | let char = unwrap!(reader.read_byte().await); | ||
| 86 | |||
| 87 | if char == b'\r' || char == b'\n' { | ||
| 88 | break; | ||
| 89 | } | ||
| 90 | |||
| 91 | buf[n] = char; | ||
| 92 | n += 1; | ||
| 93 | |||
| 94 | // stop if we're out of room | ||
| 95 | if n == buf.len() { | ||
| 96 | break; | ||
| 97 | } | ||
| 98 | } | ||
| 99 | } | ||
| 100 | .await; | ||
| 101 | |||
| 102 | if n > 0 { | ||
| 103 | for char in buf[..n].iter_mut() { | ||
| 104 | // upper case | ||
| 105 | if 0x61 <= *char && *char <= 0x7a { | ||
| 106 | *char &= !0x20; | ||
| 107 | } | ||
| 108 | } | ||
| 109 | unwrap!(writer.write_all(&buf[..n]).await); | ||
| 110 | unwrap!(writer.write_all(b"\r\n").await); | ||
| 111 | unwrap!(writer.flush().await); | ||
| 112 | } | ||
| 113 | } | ||
| 114 | } | ||
diff --git a/examples/stm32l4/Cargo.toml b/examples/stm32l4/Cargo.toml index 2da549bb2..b3478f74e 100644 --- a/examples/stm32l4/Cargo.toml +++ b/examples/stm32l4/Cargo.toml | |||
| @@ -10,7 +10,7 @@ resolver = "2" | |||
| 10 | [dependencies] | 10 | [dependencies] |
| 11 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] } | 11 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] } |
| 12 | embassy-traits = { version = "0.1.0", path = "../../embassy-traits" } | 12 | embassy-traits = { version = "0.1.0", path = "../../embassy-traits" } |
| 13 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l4s5vi", "time-driver-any", "exti", "unstable-traits", "usb-otg"] } | 13 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l4s5vi", "time-driver-any", "exti", "unstable-traits"] } |
| 14 | 14 | ||
| 15 | defmt = "0.3" | 15 | defmt = "0.3" |
| 16 | defmt-rtt = "0.3" | 16 | defmt-rtt = "0.3" |
diff --git a/examples/stm32l4/src/bin/usb_uart.rs b/examples/stm32l4/src/bin/usb_uart.rs deleted file mode 100644 index 878309550..000000000 --- a/examples/stm32l4/src/bin/usb_uart.rs +++ /dev/null | |||
| @@ -1,115 +0,0 @@ | |||
| 1 | #![no_std] | ||
| 2 | #![no_main] | ||
| 3 | #![feature(type_alias_impl_trait)] | ||
| 4 | |||
| 5 | use defmt_rtt as _; // global logger | ||
| 6 | use panic_probe as _; | ||
| 7 | |||
| 8 | use defmt::{info, unwrap}; | ||
| 9 | use defmt_rtt as _; // global logger | ||
| 10 | use embassy::interrupt::InterruptExt; | ||
| 11 | use futures::pin_mut; | ||
| 12 | use panic_probe as _; // print out panic messages | ||
| 13 | |||
| 14 | use embassy::executor::Spawner; | ||
| 15 | use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; | ||
| 16 | use embassy_stm32::pac::pwr::vals::Usv; | ||
| 17 | use embassy_stm32::pac::{PWR, RCC}; | ||
| 18 | use embassy_stm32::rcc::{ClockSrc, PLLClkDiv, PLLMul, PLLSource, PLLSrcDiv}; | ||
| 19 | use embassy_stm32::usb_otg::{State, Usb, UsbBus, UsbOtg, UsbSerial}; | ||
| 20 | use embassy_stm32::{interrupt, Config, Peripherals}; | ||
| 21 | use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; | ||
| 22 | |||
| 23 | static mut EP_MEMORY: [u32; 2048] = [0; 2048]; | ||
| 24 | |||
| 25 | // USB requires at least 48 MHz clock | ||
| 26 | fn config() -> Config { | ||
| 27 | let mut config = Config::default(); | ||
| 28 | // set up a 80Mhz clock | ||
| 29 | config.rcc.mux = ClockSrc::PLL( | ||
| 30 | PLLSource::HSI16, | ||
| 31 | PLLClkDiv::Div2, | ||
| 32 | PLLSrcDiv::Div2, | ||
| 33 | PLLMul::Mul20, | ||
| 34 | None, | ||
| 35 | ); | ||
| 36 | // enable HSI48 clock for USB | ||
| 37 | config.rcc.hsi48 = true; | ||
| 38 | config | ||
| 39 | } | ||
| 40 | |||
| 41 | #[embassy::main(config = "config()")] | ||
| 42 | async fn main(_spawner: Spawner, p: Peripherals) { | ||
| 43 | // Enable PWR peripheral | ||
| 44 | unsafe { RCC.apb1enr1().modify(|w| w.set_pwren(true)) }; | ||
| 45 | unsafe { PWR.cr2().modify(|w| w.set_usv(Usv::VALID)) } | ||
| 46 | |||
| 47 | let mut rx_buffer = [0u8; 64]; | ||
| 48 | // we send back input + cr + lf | ||
| 49 | let mut tx_buffer = [0u8; 66]; | ||
| 50 | |||
| 51 | let peri = UsbOtg::new_fs(p.USB_OTG_FS, p.PA12, p.PA11); | ||
| 52 | let usb_bus = UsbBus::new(peri, unsafe { &mut EP_MEMORY }); | ||
| 53 | |||
| 54 | let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); | ||
| 55 | |||
| 56 | let device = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd)) | ||
| 57 | .manufacturer("Fake company") | ||
| 58 | .product("Serial port") | ||
| 59 | .serial_number("TEST") | ||
| 60 | .device_class(0x02) | ||
| 61 | .build(); | ||
| 62 | |||
| 63 | let irq = interrupt::take!(OTG_FS); | ||
| 64 | irq.set_priority(interrupt::Priority::P3); | ||
| 65 | |||
| 66 | let mut state = State::new(); | ||
| 67 | let usb = unsafe { Usb::new(&mut state, device, serial, irq) }; | ||
| 68 | pin_mut!(usb); | ||
| 69 | |||
| 70 | let (mut reader, mut writer) = usb.as_ref().take_serial_0(); | ||
| 71 | |||
| 72 | info!("usb initialized!"); | ||
| 73 | |||
| 74 | unwrap!( | ||
| 75 | writer | ||
| 76 | .write_all(b"\r\nInput returned upper cased on CR+LF\r\n") | ||
| 77 | .await | ||
| 78 | ); | ||
| 79 | |||
| 80 | let mut buf = [0u8; 64]; | ||
| 81 | loop { | ||
| 82 | let mut n = 0; | ||
| 83 | |||
| 84 | async { | ||
| 85 | loop { | ||
| 86 | let char = unwrap!(reader.read_byte().await); | ||
| 87 | |||
| 88 | if char == b'\r' || char == b'\n' { | ||
| 89 | break; | ||
| 90 | } | ||
| 91 | |||
| 92 | buf[n] = char; | ||
| 93 | n += 1; | ||
| 94 | |||
| 95 | // stop if we're out of room | ||
| 96 | if n == buf.len() { | ||
| 97 | break; | ||
| 98 | } | ||
| 99 | } | ||
| 100 | } | ||
| 101 | .await; | ||
| 102 | |||
| 103 | if n > 0 { | ||
| 104 | for char in buf[..n].iter_mut() { | ||
| 105 | // upper case | ||
| 106 | if 0x61 <= *char && *char <= 0x7a { | ||
| 107 | *char &= !0x20; | ||
| 108 | } | ||
| 109 | } | ||
| 110 | unwrap!(writer.write_all(&buf[..n]).await); | ||
| 111 | unwrap!(writer.write_all(b"\r\n").await); | ||
| 112 | unwrap!(writer.flush().await); | ||
| 113 | } | ||
| 114 | } | ||
| 115 | } | ||
