From 9017c4957dc9b8a55cfeb7fa634ff9ad5bd2cad2 Mon Sep 17 00:00:00 2001 From: kebonly Date: Wed, 24 Jul 2024 13:28:26 -0700 Subject: [PATCH 1/2] Updated USB-related dependencies - Also updated respective examples/usb_serial.rs - Will fix #369 --- Cargo.toml | 2 +- examples/usb_serial.rs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 55fbfa75b..9710953a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ nb = "1.1.0" num-traits = { version = "0.2.17", default-features = false} paste = "1.0.14" rtcc = { version = "0.3.0", optional = true } -stm32-usbd = { version = "0.6.0", optional = true } +stm32-usbd = { version = "0.7.0", optional = true } stm32f3 = { version = "0.15.1", default-features = false } void = { version = "1.0.2", default-features = false } diff --git a/examples/usb_serial.rs b/examples/usb_serial.rs index 749bbeadd..d7e34a64a 100644 --- a/examples/usb_serial.rs +++ b/examples/usb_serial.rs @@ -68,10 +68,12 @@ fn main() -> ! { let mut 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(USB_CLASS_CDC) + .strings(&[StringDescriptors::default() + .serial_number("TEST_STM32_USB") + .manufacturer("Fake Company") + .product("Serial port product")]) + .unwrap() .build(); loop { From 3dbb38895a696b6adb47c214e2b14e745f00e24e Mon Sep 17 00:00:00 2001 From: kebonly Date: Wed, 24 Jul 2024 13:44:00 -0700 Subject: [PATCH 2/2] updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d357e1f7a..85fafa094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Unreleased -No changes. +- Update 'stm32-usbd' to v0.7.0 to make examples/usb_serial.rs work ## [v0.10.0] - 2023-11-30