Merge pull request #2934 from embassy-rs/example-papercuts

Fix misc example papercuts.
author: Dario Nieuwenhuis <[email protected]> 2024-05-12 23:16:57 +0000
committer: GitHub <[email protected]> 2024-05-12 23:16:57 +0000
commit: aaf4cb0cb2bdfc8ce7104d323ea8a364139c3a18 (patch)
tree: 40d286569130d872ca785c367931ffe618c49ccb /examples/stm32f4/src/bin
parent: fd97c52d78ac1f758c38972db5ea487dfad6c5ed (diff)
parent: b13110839624bc63904510e7bb815eca63b8c617 (diff)
6 files changed, 27 insertions, 37 deletions
diff --git a/examples/stm32f4/src/bin/eth.rs b/examples/stm32f4/src/bin/eth.rs
index 7f5c8fdb1..648c45bbd 100644
--- a/examples/stm32f4/src/bin/eth.rs
+++ b/examples/stm32f4/src/bin/eth.rs
@@ -62,9 +62,9 @@ async fn main(spawner: Spawner) -> ! {
    let mac_addr = [0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF];
-    static PACKETS: StaticCell<PacketQueue<16, 16>> = StaticCell::new();
+    static PACKETS: StaticCell<PacketQueue<4, 4>> = StaticCell::new();
    let device = Ethernet::new(
-        PACKETS.init(PacketQueue::<16, 16>::new()),
+        PACKETS.init(PacketQueue::<4, 4>::new()),
        p.ETH,
        Irqs,
        p.PA1,
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
+    // Do not enable vbus_detection. This is a safe default that works in all boards.
-    // Note: some boards don't have this wired up and might not require it,
+    // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
-    // as they are powered through usb!
+    // to enable vbus_detection to comply with the USB spec. If you enable it, the board
-    // If you hang on boot, try setting this to "false"!
+    // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
-    // 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
+    config.vbus_detection = false;
-    // for more information
-    config.vbus_detection = true;
    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
+    // Do not enable vbus_detection. This is a safe default that works in all boards.
-    // Note: some boards don't have this wired up and might not require it,
+    // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
-    // as they are powered through usb!
+    // to enable vbus_detection to comply with the USB spec. If you enable it, the board
-    // If you hang on boot, try setting this to "false"!
+    // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
-    // 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
+    config.vbus_detection = false;
-    // for more information
-    config.vbus_detection = true;
    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
+    // Do not enable vbus_detection. This is a safe default that works in all boards.
-    // Note: some boards don't have this wired up and might not require it,
+    // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
-    // as they are powered through usb!
+    // to enable vbus_detection to comply with the USB spec. If you enable it, the board
-    // If you hang on boot, try setting this to "false"!
+    // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
-    // 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
+    config.vbus_detection = false;
-    // for more information
-    config.vbus_detection = true;
    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
+    // Do not enable vbus_detection. This is a safe default that works in all boards.
-    // Note: some boards don't have this wired up and might not require it,
+    // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
-    // as they are powered through usb!
+    // to enable vbus_detection to comply with the USB spec. If you enable it, the board
-    // If you hang on boot, try setting this to "false"!
+    // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
-    // 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
+    config.vbus_detection = false;
-    // for more information
-    config.vbus_detection = true;
    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
+    // Do not enable vbus_detection. This is a safe default that works in all boards.
-    // Note: some boards don't have this wired up and might not require it,
+    // However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
-    // as they are powered through usb!
+    // to enable vbus_detection to comply with the USB spec. If you enable it, the board
-    // If you hang on boot, try setting this to "false"!
+    // has to support it or USB won't work at all. See docs on `vbus_detection` for details.
-    // 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
+    config.vbus_detection = false;
-    // for more information
-    config.vbus_detection = true;
    let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
author	Dario Nieuwenhuis <[email protected]>	2024-05-12 23:16:57 +0000
committer	GitHub <[email protected]>	2024-05-12 23:16:57 +0000
commit	aaf4cb0cb2bdfc8ce7104d323ea8a364139c3a18 (patch)
tree	40d286569130d872ca785c367931ffe618c49ccb /examples/stm32f4/src/bin
parent	fd97c52d78ac1f758c38972db5ea487dfad6c5ed (diff)
parent	b13110839624bc63904510e7bb815eca63b8c617 (diff)

diff --git a/examples/stm32f4/src/bin/eth.rs b/examples/stm32f4/src/bin/eth.rs index 7f5c8fdb1..648c45bbd 100644 --- a/examples/stm32f4/src/bin/eth.rs +++ b/examples/stm32f4/src/bin/eth.rs
@@ -62,9 +62,9 @@ async fn main(spawner: Spawner) -> ! {
62		62
63	let mac_addr = [0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF];	63	let mac_addr = [0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF];
64		64
65	static PACKETS: StaticCell<PacketQueue<16, 16>> = StaticCell::new();	65	static PACKETS: StaticCell<PacketQueue<4, 4>> = StaticCell::new();
66	let device = Ethernet::new(	66	let device = Ethernet::new(
67	PACKETS.init(PacketQueue::<16, 16>::new()),	67	PACKETS.init(PacketQueue::<4, 4>::new()),
68	p.ETH,	68	p.ETH,
69	Irqs,	69	Irqs,
70	p.PA1,	70	p.PA1,


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) {
77	let ep_out_buffer = &mut OUTPUT_BUFFER.init([0; 256])[..];	77	let ep_out_buffer = &mut OUTPUT_BUFFER.init([0; 256])[..];
78	let mut config = embassy_stm32::usb::Config::default();	78	let mut config = embassy_stm32::usb::Config::default();
79		79
80	// Enable vbus_detection	80	// Do not enable vbus_detection. This is a safe default that works in all boards.
81	// Note: some boards don't have this wired up and might not require it,	81	// However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
82	// as they are powered through usb!	82	// to enable vbus_detection to comply with the USB spec. If you enable it, the board
83	// If you hang on boot, try setting this to "false"!	83	// has to support it or USB won't work at all. See docs on `vbus_detection` for details.
84	// 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	84	config.vbus_detection = false;
85	// for more information
86	config.vbus_detection = true;
87		85
88	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, ep_out_buffer, config);	86	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, ep_out_buffer, config);
89		87


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) {
55	let mut ep_out_buffer = [0u8; 256];	55	let mut ep_out_buffer = [0u8; 256];
56	let mut config = embassy_stm32::usb::Config::default();	56	let mut config = embassy_stm32::usb::Config::default();
57		57
58	// Enable vbus_detection	58	// Do not enable vbus_detection. This is a safe default that works in all boards.
59	// Note: some boards don't have this wired up and might not require it,	59	// However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
60	// as they are powered through usb!	60	// to enable vbus_detection to comply with the USB spec. If you enable it, the board
61	// If you hang on boot, try setting this to "false"!	61	// has to support it or USB won't work at all. See docs on `vbus_detection` for details.
62	// 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	62	config.vbus_detection = false;
63	// for more information
64	config.vbus_detection = true;
65		63
66	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);	64	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
67		65


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) {
52	let mut ep_out_buffer = [0u8; 256];	52	let mut ep_out_buffer = [0u8; 256];
53	let mut config = embassy_stm32::usb::Config::default();	53	let mut config = embassy_stm32::usb::Config::default();
54		54
55	// Enable vbus_detection	55	// Do not enable vbus_detection. This is a safe default that works in all boards.
56	// Note: some boards don't have this wired up and might not require it,	56	// However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
57	// as they are powered through usb!	57	// to enable vbus_detection to comply with the USB spec. If you enable it, the board
58	// If you hang on boot, try setting this to "false"!	58	// has to support it or USB won't work at all. See docs on `vbus_detection` for details.
59	// 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	59	config.vbus_detection = false;
60	// for more information
61	config.vbus_detection = true;
62		60
63	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);	61	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
64		62


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) {
105	let mut ep_out_buffer = [0u8; 256];	105	let mut ep_out_buffer = [0u8; 256];
106	let mut config = embassy_stm32::usb::Config::default();	106	let mut config = embassy_stm32::usb::Config::default();
107		107
108	// Enable vbus_detection	108	// Do not enable vbus_detection. This is a safe default that works in all boards.
109	// Note: some boards don't have this wired up and might not require it,	109	// However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
110	// as they are powered through usb!	110	// to enable vbus_detection to comply with the USB spec. If you enable it, the board
111	// If you hang on boot, try setting this to "false"!	111	// has to support it or USB won't work at all. See docs on `vbus_detection` for details.
112	// 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	112	config.vbus_detection = false;
113	// for more information
114	config.vbus_detection = true;
115		113
116	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);	114	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
117		115


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) {
52	let mut ep_out_buffer = [0u8; 256];	52	let mut ep_out_buffer = [0u8; 256];
53	let mut config = embassy_stm32::usb::Config::default();	53	let mut config = embassy_stm32::usb::Config::default();
54		54
55	// Enable vbus_detection	55	// Do not enable vbus_detection. This is a safe default that works in all boards.
56	// Note: some boards don't have this wired up and might not require it,	56	// However, if your USB device is self-powered (can stay powered on if USB is unplugged), you need
57	// as they are powered through usb!	57	// to enable vbus_detection to comply with the USB spec. If you enable it, the board
58	// If you hang on boot, try setting this to "false"!	58	// has to support it or USB won't work at all. See docs on `vbus_detection` for details.
59	// 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	59	config.vbus_detection = false;
60	// for more information
61	config.vbus_detection = true;
62		60
63	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);	61	let driver = Driver::new_fs(p.USB_OTG_FS, Irqs, p.PA12, p.PA11, &mut ep_out_buffer, config);
64		62