Merge pull request #221 from korken89/stm32-usbd_v0.6

Updated stm32-usbd to v0.6

Author: korken89

Cargo.toml

@@ -46,8 +46,7 @@ version = "0.2.3"
 features = ["unproven"]
 
 [dependencies.stm32-usbd]
-version = "0.5.0"
-features = ["ram_access_2x16"]
+version = "0.6.0"
 optional = true
 
 [dependencies.synopsys-usb-otg]

examples/usb_serial.rs

@@ -44,9 +44,7 @@ fn main() -> ! {
     let _clocks = rcc
         .cfgr
         .hsi48(true)
-        .sysclk(48.mhz())
-        .pclk1(24.mhz())
-        .pclk2(24.mhz())
+        .sysclk(80.mhz())
         .freeze(&mut flash.acr, &mut pwr);
 
     enable_crs();
@@ -59,7 +57,7 @@ fn main() -> ! {
     let mut led = gpiob
         .pb3
         .into_push_pull_output(&mut gpiob.moder, &mut gpiob.otyper);
-    led.set_low(); // Turn off
+    led.set_low().ok(); // Turn off
 
     let mut gpioa = dp.GPIOA.split(&mut rcc.ahb2);
 
@@ -88,7 +86,7 @@ fn main() -> ! {
 
         match serial.read(&mut buf) {
             Ok(count) if count > 0 => {
-                led.set_high(); // Turn on
+                led.set_high().ok(); // Turn on
 
                 // Echo back in upper case
                 for c in buf[0..count].iter_mut() {
@@ -110,6 +108,6 @@ fn main() -> ! {
             _ => {}
         }
 
-        led.set_low(); // Turn off
+        led.set_low().ok(); // Turn off
     }
 }

src/usb.rs

@@ -25,6 +25,7 @@ unsafe impl UsbPeripheral for Peripheral {
     const DP_PULL_UP_FEATURE: bool = true;
     const EP_MEMORY: *const () = 0x4000_6c00 as _;
     const EP_MEMORY_SIZE: usize = 1024;
+    const EP_MEMORY_ACCESS_2X16: bool = true;
 
     fn enable() {
         let rcc = unsafe { (&*RCC::ptr()) };