From 66e3d4da8d6eda003666b633bb57e67f2a10e31b Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Mon, 13 May 2024 01:01:44 +0200
Subject: [PATCH] examples/stm32: do not enable vbus detect by default, it
doesn't work on all boards.
---
examples/stm32f4/src/bin/usb_ethernet.rs | 12 +++++-------
examples/stm32f4/src/bin/usb_hid_keyboard.rs | 12 +++++-------
examples/stm32f4/src/bin/usb_hid_mouse.rs | 12 +++++-------
examples/stm32f4/src/bin/usb_raw.rs | 12 +++++-------
examples/stm32f4/src/bin/usb_serial.rs | 12 +++++-------
examples/stm32f7/src/bin/usb_serial.rs | 12 +++++-------
examples/stm32h7/src/bin/usb_serial.rs | 12 +++++-------
examples/stm32l4/src/bin/usb_serial.rs | 12 +++++-------
examples/stm32u5/src/bin/usb_serial.rs | 4 ++++
9 files changed, 44 insertions(+), 56 deletions(-)
diff --git a/examples/stm32f4/src/bin/usb_ethernet.rs b/examples/stm32f4/src/bin/usb_ethernet.rs
index 34e58f282..19ae16e8b 100644
--- a/examples/stm32f4/src/bin/usb_ethernet.rs
+++ b/examples/stm32f4/src/bin/usb_ethernet.rs
@@ -77,13 +77,11 @@ async fn main(spawner: Spawner) {
let ep_out_buffer = &mut OUTPUT_BUFFER.init([0; 256])[..];
let mut config = embassy_stm32::usb::Config::default();
- // Enable vbus_detection
- // Note: some boards don't have this wired up and might not require it,
- // as they are powered through usb!
- // If you hang on boot, try setting this to "false"!
- // See https://embassy.dev/book/dev/faq.html#_the_usb_examples_are_not_working_on_my_board_is_there_anything_else_i_need_to_configure
- // for more information
- config.vbus_detection = true;
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
+ config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, ep_out_buffer, config);
diff --git a/examples/stm32f4/src/bin/usb_hid_keyboard.rs b/examples/stm32f4/src/bin/usb_hid_keyboard.rs
index de9b692b1..537ff63ea 100644
--- a/examples/stm32f4/src/bin/usb_hid_keyboard.rs
+++ b/examples/stm32f4/src/bin/usb_hid_keyboard.rs
@@ -55,13 +55,11 @@ async fn main(_spawner: Spawner) {
let mut ep_out_buffer = [0u8; 256];
let mut config = embassy_stm32::usb::Config::default();
- // Enable vbus_detection
- // Note: some boards don't have this wired up and might not require it,
- // as they are powered through usb!
- // If you hang on boot, try setting this to "false"!
- // See https://embassy.dev/book/dev/faq.html#_the_usb_examples_are_not_working_on_my_board_is_there_anything_else_i_need_to_configure
- // for more information
- config.vbus_detection = true;
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
+ config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
diff --git a/examples/stm32f4/src/bin/usb_hid_mouse.rs b/examples/stm32f4/src/bin/usb_hid_mouse.rs
index d15ad52dc..df4b7426c 100644
--- a/examples/stm32f4/src/bin/usb_hid_mouse.rs
+++ b/examples/stm32f4/src/bin/usb_hid_mouse.rs
@@ -52,13 +52,11 @@ async fn main(_spawner: Spawner) {
let mut ep_out_buffer = [0u8; 256];
let mut config = embassy_stm32::usb::Config::default();
- // Enable vbus_detection
- // Note: some boards don't have this wired up and might not require it,
- // as they are powered through usb!
- // If you hang on boot, try setting this to "false"!
- // See https://embassy.dev/book/dev/faq.html#_the_usb_examples_are_not_working_on_my_board_is_there_anything_else_i_need_to_configure
- // for more information
- config.vbus_detection = true;
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
+ config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
diff --git a/examples/stm32f4/src/bin/usb_raw.rs b/examples/stm32f4/src/bin/usb_raw.rs
index d058abdd0..1452e7c5f 100644
--- a/examples/stm32f4/src/bin/usb_raw.rs
+++ b/examples/stm32f4/src/bin/usb_raw.rs
@@ -105,13 +105,11 @@ async fn main(_spawner: Spawner) {
let mut ep_out_buffer = [0u8; 256];
let mut config = embassy_stm32::usb::Config::default();
- // Enable vbus_detection
- // Note: some boards don't have this wired up and might not require it,
- // as they are powered through usb!
- // If you hang on boot, try setting this to "false"!
- // See https://embassy.dev/book/dev/faq.html#_the_usb_examples_are_not_working_on_my_board_is_there_anything_else_i_need_to_configure
- // for more information
- config.vbus_detection = true;
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
+ config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
diff --git a/examples/stm32f4/src/bin/usb_serial.rs b/examples/stm32f4/src/bin/usb_serial.rs
index 91cfae87b..b2bd390b6 100644
--- a/examples/stm32f4/src/bin/usb_serial.rs
+++ b/examples/stm32f4/src/bin/usb_serial.rs
@@ -52,13 +52,11 @@ async fn main(_spawner: Spawner) {
let mut ep_out_buffer = [0u8; 256];
let mut config = embassy_stm32::usb::Config::default();
- // Enable vbus_detection
- // Note: some boards don't have this wired up and might not require it,
- // as they are powered through usb!
- // If you hang on boot, try setting this to "false"!
- // See https://embassy.dev/book/dev/faq.html#_the_usb_examples_are_not_working_on_my_board_is_there_anything_else_i_need_to_configure
- // for more information
- config.vbus_detection = true;
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
+ config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
diff --git a/examples/stm32f7/src/bin/usb_serial.rs b/examples/stm32f7/src/bin/usb_serial.rs
index 02ab4d1f2..0e5cc7c5c 100644
--- a/examples/stm32f7/src/bin/usb_serial.rs
+++ b/examples/stm32f7/src/bin/usb_serial.rs
@@ -52,13 +52,11 @@ async fn main(_spawner: Spawner) {
let mut ep_out_buffer = [0u8; 256];
let mut config = embassy_stm32::usb::Config::default();
- // Enable vbus_detection
- // Note: some boards don't have this wired up and might not require it,
- // as they are powered through usb!
- // If you hang on boot, try setting this to "false"!
- // See https://embassy.dev/book/dev/faq.html#_the_usb_examples_are_not_working_on_my_board_is_there_anything_else_i_need_to_configure
- // for more information
- config.vbus_detection = true;
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
+ config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
diff --git a/examples/stm32h7/src/bin/usb_serial.rs b/examples/stm32h7/src/bin/usb_serial.rs
index 71d0c0a25..1c50fc1c8 100644
--- a/examples/stm32h7/src/bin/usb_serial.rs
+++ b/examples/stm32h7/src/bin/usb_serial.rs
@@ -53,13 +53,11 @@ async fn main(_spawner: Spawner) {
let mut ep_out_buffer = [0u8; 256];
let mut config = embassy_stm32::usb::Config::default();
- // Enable vbus_detection
- // Note: some boards don't have this wired up and might not require it,
- // as they are powered through usb!
- // If you hang on boot, try setting this to "false"!
- // See https://embassy.dev/book/dev/faq.html#_the_usb_examples_are_not_working_on_my_board_is_there_anything_else_i_need_to_configure
- // for more information
- config.vbus_detection = true;
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
+ config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
diff --git a/examples/stm32l4/src/bin/usb_serial.rs b/examples/stm32l4/src/bin/usb_serial.rs
index a378cdc6b..ed9671d0f 100644
--- a/examples/stm32l4/src/bin/usb_serial.rs
+++ b/examples/stm32l4/src/bin/usb_serial.rs
@@ -47,13 +47,11 @@ async fn main(_spawner: Spawner) {
let mut ep_out_buffer = [0u8; 256];
let mut config = embassy_stm32::usb::Config::default();
- // Enable vbus_detection
- // Note: some boards don't have this wired up and might not require it,
- // as they are powered through usb!
- // If you hang on boot, try setting this to "false"!
- // See https://embassy.dev/book/dev/faq.html#_the_usb_examples_are_not_working_on_my_board_is_there_anything_else_i_need_to_configure
- // for more information
- config.vbus_detection = true;
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
+ config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
diff --git a/examples/stm32u5/src/bin/usb_serial.rs b/examples/stm32u5/src/bin/usb_serial.rs
index f107928a9..4d56395da 100644
--- a/examples/stm32u5/src/bin/usb_serial.rs
+++ b/examples/stm32u5/src/bin/usb_serial.rs
@@ -43,6 +43,10 @@ async fn main(_spawner: Spawner) {
// Create the driver, from the HAL.
let mut ep_out_buffer = [0u8; 256];
let mut config = embassy_stm32::usb::Config::default();
+ // Do not enable vbus_detection. This is a safe default that works in all boards.
+ // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
+ // to enable vbus_detection to comply with the USB spec. If you enable it, the board
+ // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
config.vbus_detection = false;
let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);