From 1651e941c7c02863beb00cd7b8be52d9fb9ae1b0 Mon Sep 17 00:00:00 2001 From: SiTinc <23432137+Tinnci@users.noreply.github.com> Date: Sat, 3 May 2025 19:37:38 +0800 Subject: [PATCH 1/5] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 69a75c7..df13974 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["no-std", "embedded", "usb"] [dependencies] critical-section = "1.1.1" -embedded-hal = "0.2.4" +embedded-hal = "1.0.0" vcell = "0.1.0" usb-device = "0.3" ral-registers = "0.1.3" From b70d80ae5e450a1d9e91cb2b599cc5c9baeeefab Mon Sep 17 00:00:00 2001 From: SiTinc <23432137+Tinnci@users.noreply.github.com> Date: Sat, 3 May 2025 19:46:08 +0800 Subject: [PATCH 2/5] Update bus.rs --- src/bus.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bus.rs b/src/bus.rs index 02d9d03..2e91bd9 100644 --- a/src/bus.rs +++ b/src/bus.rs @@ -4,7 +4,7 @@ use crate::ral::{ use crate::transition::{EndpointConfig, EndpointDescriptor}; use core::marker::PhantomData; use critical_section::{CriticalSection, Mutex}; -use embedded_hal::blocking::delay::DelayMs; +use embedded_hal::blocking::delay::DelayNs; use usb_device::bus::{PollResult, UsbBusAllocator}; use usb_device::endpoint::{EndpointAddress, EndpointType}; use usb_device::{Result, UsbDirection, UsbError}; From 0c3a3147800120adc0103954d0badfcd71eb843d Mon Sep 17 00:00:00 2001 From: SiTinc <23432137+Tinnci@users.noreply.github.com> Date: Sat, 3 May 2025 19:47:32 +0800 Subject: [PATCH 3/5] Update bus.rs --- src/bus.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bus.rs b/src/bus.rs index 2e91bd9..738bae7 100644 --- a/src/bus.rs +++ b/src/bus.rs @@ -4,7 +4,7 @@ use crate::ral::{ use crate::transition::{EndpointConfig, EndpointDescriptor}; use core::marker::PhantomData; use critical_section::{CriticalSection, Mutex}; -use embedded_hal::blocking::delay::DelayNs; +use embedded_hal::delay::DelayNs; use usb_device::bus::{PollResult, UsbBusAllocator}; use usb_device::endpoint::{EndpointAddress, EndpointType}; use usb_device::{Result, UsbDirection, UsbError}; From 510f3b357f730bd16b582c9fe12204ee164c6aaf Mon Sep 17 00:00:00 2001 From: SiTinc <23432137+Tinnci@users.noreply.github.com> Date: Sat, 3 May 2025 19:48:44 +0800 Subject: [PATCH 4/5] Update bus.rs --- src/bus.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bus.rs b/src/bus.rs index 738bae7..40e7d8c 100644 --- a/src/bus.rs +++ b/src/bus.rs @@ -139,7 +139,7 @@ impl UsbBus { } } - pub fn force_reset(&self, delay: &mut impl DelayMs) -> Result<()> { + pub fn force_reset(&self, delay: &mut impl DelayNs) -> Result<()> { critical_section::with(|cs| { let regs = self.regs.borrow(cs); write_reg!(otg_device, regs.device(), DCTL, SDIS: 1); // Soft disconnect From fbb5f4bd908fe04c5e2dbfdfe08979d6136879b0 Mon Sep 17 00:00:00 2001 From: SiTinc <23432137+Tinnci@users.noreply.github.com> Date: Sat, 3 May 2025 19:51:19 +0800 Subject: [PATCH 5/5] Update bus.rs --- src/bus.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bus.rs b/src/bus.rs index 40e7d8c..f173dfe 100644 --- a/src/bus.rs +++ b/src/bus.rs @@ -139,7 +139,7 @@ impl UsbBus { } } - pub fn force_reset(&self, delay: &mut impl DelayNs) -> Result<()> { + pub fn force_reset(&self, delay: &mut impl DelayNs) -> Result<()> { critical_section::with(|cs| { let regs = self.regs.borrow(cs); write_reg!(otg_device, regs.device(), DCTL, SDIS: 1); // Soft disconnect