Merge pull request #699 from hacknus/master

update synopsys-usb-otg to v0.4

Author: burrbull

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 - Added an example to show how to do DMA with UART (Rx only) [#698]
+- Updated `synopsys-usb-otg` to `0.4.0`
 
 ### Fixed
 

Cargo.toml

@@ -34,7 +34,7 @@ cortex-m-rt = "0.7.3"
 nb = "1.1"
 rand_core = "0.6.4"
 stm32f4 = "0.15.1"
-synopsys-usb-otg = { version = "0.3.2", features = ["cortex-m"], optional = true }
+synopsys-usb-otg = { version = "0.4.0", features = ["cortex-m"], optional = true }
 sdio-host = { version = "0.6.0", optional = true }
 embedded-dma = "0.2.0"
 bare-metal = { version = "1" }
@@ -72,8 +72,8 @@ heapless = "0.7.16"
 panic-halt = "0.2.0"
 ssd1306 = "0.7.1"
 embedded-graphics = "0.7.1"
-usb-device = "0.2.9"
-usbd-serial = "0.1.1"
+usb-device = "0.3.1"
+usbd-serial = "0.2.0"
 micromath = "2"
 cortex-m-rtic = { version = "1.1.4", features = ["test-critical-section"] }
 dwt-systick-monotonic = "1.1"

examples/rtic-usb-cdc-echo.rs

@@ -73,10 +73,12 @@ mod app {
             unsafe { USB_BUS.as_ref().unwrap() },
             UsbVidPid(0x16c0, 0x27dd),
         )
-        .manufacturer("rust embedded")
-        .product("usb echo server")
-        .serial_number("4242")
         .device_class(usbd_serial::USB_CLASS_CDC)
+        .strings(&[StringDescriptors::default()
+            .manufacturer("Fake Company")
+            .product("Product")
+            .serial_number("TEST")])
+        .unwrap()
         .build();
 
         (

examples/usb-serial-irq.rs

@@ -50,10 +50,12 @@ fn main() -> ! {
 
         *G_USB_DEVICE.borrow(cs).borrow_mut() = Some(
             UsbDeviceBuilder::new(usb_bus, UsbVidPid(0x16c0, 0x27dd))
-                .manufacturer("Fake company")
-                .product("Serial port")
-                .serial_number("TEST")
                 .device_class(usbd_serial::USB_CLASS_CDC)
+                .strings(&[StringDescriptors::default()
+                    .manufacturer("Fake Company")
+                    .product("Product")
+                    .serial_number("TEST")])
+                .unwrap()
                 .build(),
         );
     });

examples/usb-serial-poll.rs

@@ -38,10 +38,12 @@ fn main() -> ! {
     let mut serial = usbd_serial::SerialPort::new(&usb_bus);
 
     let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd))
-        .manufacturer("Fake company")
-        .product("Serial port")
-        .serial_number("TEST")
         .device_class(usbd_serial::USB_CLASS_CDC)
+        .strings(&[StringDescriptors::default()
+            .manufacturer("Fake Company")
+            .product("Product")
+            .serial_number("TEST")])
+        .unwrap()
         .build();
 
     loop {