Merge pull request #5 from probe-rs/update-usb-device

Update usb device

Author: korken89

Cargo.toml

@@ -2,15 +2,20 @@
 name = "dap-rs"
 version = "0.1.0"
 edition = "2021"
-authors = ["Emil Fresk <[email protected]>", "Adam Greig <[email protected]>"]
+authors = [
+    "Emil Fresk <[email protected]>",
+    "Adam Greig <[email protected]>",
+]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 num_enum = { version = "0.5.6", default-features = false }
-usb-device = { version = "0.2.8", features = ["control-buffer-256"] }
-embedded-hal = "0.2.7"
-replace_with = { version = "0.1.7", default-features = false, features = ["panic_abort"] }
+usb-device = { version = "0.3.1", features = ["control-buffer-256"] }
+embedded-hal = "1.0.0"
+replace_with = { version = "0.1.7", default-features = false, features = [
+    "panic_abort",
+] }
 bitflags = "1.3.2"
 
 [dependencies.defmt]

src/dap.rs

@@ -1,4 +1,4 @@
-use crate::{swj, jtag, swd, swo, usb};
+use crate::{jtag, swd, swj, swo, usb};
 
 mod command;
 mod request;
@@ -9,7 +9,7 @@ pub use command::*;
 pub use request::*;
 pub use response::*;
 
-pub use embedded_hal::blocking::delay::DelayUs;
+pub use embedded_hal::delay::DelayNs;
 
 use state::State;
 
@@ -36,7 +36,7 @@ impl<'a, DEPS, LEDS, WAIT, JTAG, SWD, SWO> Dap<'a, DEPS, LEDS, WAIT, JTAG, SWD,
 where
     DEPS: swj::Dependencies<SWD, JTAG>,
     LEDS: DapLeds,
-    WAIT: DelayUs<u32>,
+    WAIT: DelayNs,
     JTAG: jtag::Jtag<DEPS>,
     SWD: swd::Swd<DEPS>,
     SWO: swo::Swo,

src/lib.rs

@@ -10,3 +10,7 @@ pub mod swd;
 pub mod swj;
 pub mod swo;
 pub mod usb;
+
+// Re-export the usb-device crate, so that crates depending on us can use it without
+// having to track it as a separate dependency.
+pub use usb_device;

src/usb/dap_v1.rs

@@ -104,9 +104,9 @@ impl<B: UsbBus> UsbClass<B> for CmsisDapV1<'_, B> {
         Ok(())
     }
 
-    fn get_string(&self, index: StringIndex, _lang_id: u16) -> Option<&str> {
+    fn get_string(&self, index: StringIndex, _lang_id: LangID) -> Option<&str> {
         if index == self.name {
-            Some("HS-Probe CMSIS-DAP v1 Interface")
+            Some("CMSIS-DAP v1 Interface")
         } else {
             None
         }

src/usb/dap_v2.rs

@@ -64,9 +64,9 @@ impl<B: UsbBus> UsbClass<B> for CmsisDapV2<'_, B> {
         Ok(())
     }
 
-    fn get_string(&self, index: StringIndex, _lang_id: u16) -> Option<&str> {
+    fn get_string(&self, index: StringIndex, _lang_id: LangID) -> Option<&str> {
         if index == self.name {
-            Some("HS-probe CMSIS-DAP v2 Interface")
+            Some("CMSIS-DAP v2 Interface")
         } else {
             None
         }