-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19 from decaday/feat/usb
USB Support
- Loading branch information
Showing
22 changed files
with
1,499 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| [target.thumbv6m-none-eabi] | ||
| # probe-rs chip list | grep -i PY32 | ||
| runner = 'probe-rs run --chip PY32F072xb' | ||
| runner = "probe-rs run --chip PY32F072xB" | ||
|
|
||
| # rustflags = [ | ||
| # "-C", "linker=flip-link", | ||
| # ] | ||
|
|
||
| [build] | ||
| target = "thumbv6m-none-eabi" | ||
| target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+ | ||
|
|
||
| [env] | ||
| DEFMT_LOG = "trace" | ||
|
|
||
| # rustflags = ["-C", "link-arg=-Tlink.x"] | ||
| DEFMT_LOG = "info" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| #![no_std] | ||
| #![no_main] | ||
| #![feature(impl_trait_in_assoc_type)] | ||
|
|
||
| use core::sync::atomic::{AtomicBool, Ordering}; | ||
|
|
||
| use defmt::*; | ||
| use {defmt_rtt as _, panic_probe as _}; | ||
| use embassy_executor::Spawner; | ||
| use embassy_futures::join::join; | ||
| use py32_hal::bind_interrupts; | ||
| use py32_hal::gpio::Pull; | ||
| use py32_hal::exti::ExtiInput; | ||
| use py32_hal::time::Hertz; | ||
| use py32_hal::rcc::{Pll, PllSource, Sysclk, PllMul}; | ||
| use py32_hal::usb::{Driver, InterruptHandler}; | ||
|
|
||
|
|
||
| use embassy_usb::class::hid::{HidReaderWriter, ReportId, RequestHandler, State}; | ||
| use embassy_usb::control::OutResponse; | ||
| use embassy_usb::{Builder, Handler}; | ||
| use usbd_hid::descriptor::{KeyboardReport, SerializedDescriptor}; | ||
|
|
||
|
|
||
| bind_interrupts!(struct Irqs { | ||
| USB => InterruptHandler<py32_hal::peripherals::USB>; | ||
| }); | ||
|
|
||
| #[embassy_executor::main] | ||
| async fn main(_spawner: Spawner) { | ||
| let mut cfg: py32_hal::Config = Default::default(); | ||
|
|
||
| // PY32 USB uses PLL as the clock source and can only run at 48Mhz. | ||
| cfg.rcc.hsi = Some(Hertz::mhz(16)); | ||
| cfg.rcc.pll = Some(Pll { | ||
| src: PllSource::HSI, | ||
| mul: PllMul::MUL3, | ||
| }); | ||
| cfg.rcc.sys = Sysclk::PLL; | ||
| let p = py32_hal::init(cfg); | ||
|
|
||
| // Create the driver, from the HAL. | ||
|
|
||
| let driver = Driver::new(p.USB, Irqs, p.PA12, p.PA11); | ||
|
|
||
| // Create embassy-usb Config | ||
| let mut config = embassy_usb::Config::new(0xc0de, 0xcafe); | ||
| config.manufacturer = Some("Embassy"); | ||
| config.product = Some("HID keyboard example"); | ||
| config.serial_number = Some("12345678"); | ||
| config.max_power = 100; | ||
| config.max_packet_size_0 = 64; | ||
|
|
||
| // Required for windows compatibility. | ||
| // https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help | ||
| config.device_class = 0xEF; | ||
| config.device_sub_class = 0x02; | ||
| config.device_protocol = 0x01; | ||
| config.composite_with_iads = true; | ||
|
|
||
| // Create embassy-usb DeviceBuilder using the driver and config. | ||
| // It needs some buffers for building the descriptors. | ||
| let mut config_descriptor = [0; 256]; | ||
| let mut bos_descriptor = [0; 256]; | ||
| // You can also add a Microsoft OS descriptor. | ||
| let mut msos_descriptor = [0; 256]; | ||
| let mut control_buf = [0; 64]; | ||
|
|
||
| let mut request_handler = MyRequestHandler {}; | ||
| let mut device_handler = MyDeviceHandler::new(); | ||
|
|
||
| let mut state = State::new(); | ||
|
|
||
| let mut builder = Builder::new( | ||
| driver, | ||
| config, | ||
| &mut config_descriptor, | ||
| &mut bos_descriptor, | ||
| &mut msos_descriptor, | ||
| &mut control_buf, | ||
| ); | ||
|
|
||
| builder.handler(&mut device_handler); | ||
|
|
||
| // Create classes on the builder. | ||
| let config = embassy_usb::class::hid::Config { | ||
| report_descriptor: KeyboardReport::desc(), | ||
| request_handler: None, | ||
| poll_ms: 60, | ||
| max_packet_size: 8, | ||
| }; | ||
|
|
||
| let hid = HidReaderWriter::<_, 1, 8>::new(&mut builder, &mut state, config); | ||
|
|
||
| // Build the builder. | ||
| let mut usb = builder.build(); | ||
|
|
||
| // Run the USB device. | ||
| let usb_fut = usb.run(); | ||
|
|
||
| let (reader, mut writer) = hid.split(); | ||
|
|
||
| let mut button = ExtiInput::new(p.PB0, p.EXTI0, Pull::Down); | ||
|
|
||
| // Do stuff with the class! | ||
| let in_fut = async { | ||
| loop { | ||
| button.wait_for_rising_edge().await; | ||
| // signal_pin.wait_for_high().await; | ||
| info!("Button pressed!"); | ||
| // Create a report with the A key pressed. (no shift modifier) | ||
| let report = KeyboardReport { | ||
| keycodes: [4, 0, 0, 0, 0, 0], | ||
| leds: 0, | ||
| modifier: 0, | ||
| reserved: 0, | ||
| }; | ||
| // Send the report. | ||
| match writer.write_serialize(&report).await { | ||
| Ok(()) => {} | ||
| Err(e) => warn!("Failed to send report: {:?}", e), | ||
| }; | ||
|
|
||
| button.wait_for_falling_edge().await; | ||
| // signal_pin.wait_for_low().await; | ||
| info!("Button released!"); | ||
| let report = KeyboardReport { | ||
| keycodes: [0, 0, 0, 0, 0, 0], | ||
| leds: 0, | ||
| modifier: 0, | ||
| reserved: 0, | ||
| }; | ||
| match writer.write_serialize(&report).await { | ||
| Ok(()) => {} | ||
| Err(e) => warn!("Failed to send report: {:?}", e), | ||
| }; | ||
| } | ||
| }; | ||
|
|
||
| let out_fut = async { | ||
| reader.run(false, &mut request_handler).await; | ||
| }; | ||
|
|
||
| // Run everything concurrently. | ||
| // If we had made everything `'static` above instead, we could do this using separate tasks instead. | ||
| join(usb_fut, join(in_fut, out_fut)).await; | ||
| } | ||
|
|
||
| struct MyRequestHandler {} | ||
|
|
||
| impl RequestHandler for MyRequestHandler { | ||
| fn get_report(&mut self, id: ReportId, _buf: &mut [u8]) -> Option<usize> { | ||
| info!("Get report for {:?}", id); | ||
| None | ||
| } | ||
|
|
||
| fn set_report(&mut self, id: ReportId, data: &[u8]) -> OutResponse { | ||
| info!("Set report for {:?}: {=[u8]}", id, data); | ||
| OutResponse::Accepted | ||
| } | ||
|
|
||
| fn set_idle_ms(&mut self, id: Option<ReportId>, dur: u32) { | ||
| info!("Set idle rate for {:?} to {:?}", id, dur); | ||
| } | ||
|
|
||
| fn get_idle_ms(&mut self, id: Option<ReportId>) -> Option<u32> { | ||
| info!("Get idle rate for {:?}", id); | ||
| None | ||
| } | ||
| } | ||
|
|
||
| struct MyDeviceHandler { | ||
| configured: AtomicBool, | ||
| } | ||
|
|
||
| impl MyDeviceHandler { | ||
| fn new() -> Self { | ||
| MyDeviceHandler { | ||
| configured: AtomicBool::new(false), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Handler for MyDeviceHandler { | ||
| fn enabled(&mut self, enabled: bool) { | ||
| self.configured.store(false, Ordering::Relaxed); | ||
| if enabled { | ||
| info!("Device enabled"); | ||
| } else { | ||
| info!("Device disabled"); | ||
| } | ||
| } | ||
|
|
||
| fn reset(&mut self) { | ||
| self.configured.store(false, Ordering::Relaxed); | ||
| info!("Bus reset, the Vbus current limit is 100mA"); | ||
| } | ||
|
|
||
| fn addressed(&mut self, addr: u8) { | ||
| self.configured.store(false, Ordering::Relaxed); | ||
| info!("USB address set to: {}", addr); | ||
| } | ||
|
|
||
| fn configured(&mut self, configured: bool) { | ||
| self.configured.store(configured, Ordering::Relaxed); | ||
| if configured { | ||
| info!("Device configured, it may now draw up to the configured current limit from Vbus.") | ||
| } else { | ||
| info!("Device is no longer configured, the Vbus current limit is 100mA."); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.