USB support for Leonardo

arduino-hal/Cargo.toml

@@ -20,7 +20,7 @@ board-selected = []
 mcu-atmega = []
 mcu-attiny = []
 arduino-diecimila = ["mcu-atmega", "atmega-hal/atmega168", "board-selected"]
-arduino-leonardo = ["mcu-atmega", "atmega-hal/atmega32u4", "board-selected"]
+arduino-leonardo = ["mcu-atmega", "atmega-hal/atmega32u4", "board-selected", "usb-device"]
 arduino-mega2560 = ["mcu-atmega", "atmega-hal/atmega2560", "board-selected"]
 arduino-mega1280 = ["mcu-atmega", "atmega-hal/atmega1280", "board-selected"]
 arduino-nano = ["mcu-atmega", "atmega-hal/atmega328p", "atmega-hal/enable-extra-adc", "board-selected"]
@@ -39,6 +39,7 @@ docsrs = ["arduino-uno"]
 cfg-if = "1"
 embedded-hal = "1.0"
 ufmt = "0.2.0"
+usb-device = { version = "0.3.2", optional = true }
 
 [dependencies.embedded-hal-v0]
 version = "0.2.3"

arduino-hal/src/lib.rs

@@ -1,5 +1,6 @@
 #![no_std]
 #![feature(doc_cfg)]
+#![feature(decl_macro)]
 
 //! `arduino-hal`
 //! =============
@@ -175,11 +176,23 @@ pub mod usart {
     pub type UsartReader<USART, RX, TX> =
         crate::hal::usart::UsartReader<USART, RX, TX, crate::DefaultClock>;
 }
-
 #[doc(no_inline)]
 #[cfg(feature = "mcu-atmega")]
 pub use usart::Usart;
 
+#[cfg(feature = "arduino-leonardo")]
+use usb_device::{bus::UsbBusAllocator, device::{UsbDeviceBuilder, UsbVidPid}};
+#[cfg(feature = "arduino-leonardo")]
+pub mod usb {
+    pub use crate::hal::usb::*;
+
+    pub type AvrUsbBus = crate::hal::usb::AvrUsbBus;
+}
+#[doc(no_inline)]
+#[cfg(feature = "arduino-leonardo")]
+pub use usb::AvrUsbBus;
+
+
 #[cfg(feature = "board-selected")]
 pub mod eeprom {
     pub use crate::hal::eeprom::{Eeprom, EepromOps, OutOfBoundsError};
@@ -340,3 +353,34 @@ macro_rules! default_serial {
         )
     };
 }
+
+/// Convenience macro to instantiate the [`UsbBus`] driver for this board.
+///
+/// # Example
+/// ```no_run
+/// TODO
+/// ```
+#[cfg(feature = "arduino-leonardo")]
+pub macro default_usb_bus ($usb:expr, $pll:expr) {
+    unsafe {
+        static mut USB_BUS: Option<UsbBusAllocator<AvrUsbBus>> = None;
+        &*USB_BUS.insert($crate::AvrUsbBus::with_suspend_notifier($usb, $pll))
+    };
+}
+
+/// Convenience macro to instantiate the [`UsbDevice`] driver for this board.
+///
+/// # Example
+/// ```no_run
+/// TODO
+/// ```
+#[cfg(feature = "arduino-leonardo")]
+pub macro default_usb_device ($usb_bus:expr, $vid:expr, $pid:expr, $strings:expr) {
+    UsbDeviceBuilder::new(
+        $usb_bus,
+        UsbVidPid($vid, $pid)
+    )
+    .strings(&[$strings])
+    .unwrap()
+    .build()
+}

arduino-hal/src/port/leonardo.rs

@@ -1,5 +1,6 @@
 pub use atmega_hal::port::{mode, Pin, PinMode, PinOps};
 
+#[allow(non_camel_case_types)] // Mute LedRx and LedTx complaints
 avr_hal_generic::renamed_pins! {
     /// Pins of the **Arduino Leonardo**.
     ///

avr-hal-generic/Cargo.toml

@@ -25,6 +25,7 @@ embedded-storage = "0.2"
 embedded-hal = "1.0"
 embedded-hal-bus = "0.1"
 unwrap-infallible = "0.1.5"
+usb-device = "0.3.2"
 
 [dependencies.embedded-hal-v0]
 version = "0.2.3"

avr-hal-generic/src/lib.rs

@@ -1,5 +1,8 @@
 #![no_std]
-#![feature(asm_experimental_arch)]
+#![cfg_attr(avr_hal_asm_macro, feature(asm_experimental_arch))]
+#![cfg_attr(not(avr_hal_asm_macro), feature(llvm_asm))]
+#![feature(decl_macro)]
+
 
 pub use embedded_hal as hal;
 pub use embedded_hal_v0 as hal_v0;
@@ -21,6 +24,7 @@ pub mod simple_pwm;
 pub mod spi;
 pub mod usart;
 pub mod wdt;
+pub mod usb;
 
 /// Prelude containing all HAL traits
 pub mod prelude {