From cce617366fb83a9197b9d4a718810a3928249460 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 13 Jun 2022 00:20:14 +0800 Subject: [PATCH] move to the release version of usbd-human-interface-device thanks @dlkj! --- Cargo.lock | 28 +++++++++++++++++++--------- apps/vault/Cargo.toml | 3 +-- services/usb-device-xous/Cargo.toml | 3 +-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 30be62c9e..67b45e252 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -844,6 +844,17 @@ dependencies = [ "syn", ] +[[package]] +name = "delegate" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d70a2d4995466955a415223acf3c9c934b9ff2339631cdf4ffc893da4bacd717" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "der" version = "0.5.1" @@ -3618,7 +3629,7 @@ dependencies = [ "susres", "ticktimer-server", "usb-device", - "usbd-human-interface-device 0.1.1 (git+https://github.com/betrusted-io/usbd-human-interface-device.git?branch=main)", + "usbd-human-interface-device 0.2.1", "utralib", "vcell", "xous", @@ -3642,7 +3653,7 @@ dependencies = [ "susres", "ticktimer-server", "usb-device", - "usbd-human-interface-device 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "usbd-human-interface-device 0.1.1", "utralib", "vcell", "xous", @@ -3655,7 +3666,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "262ce4294612a8fc830daeaded8b111e241dff8520965979d1754eb87fb33951" dependencies = [ - "delegate", + "delegate 0.6.2", "embedded-time", "frunk", "hash32", @@ -3669,14 +3680,13 @@ dependencies = [ [[package]] name = "usbd-human-interface-device" -version = "0.1.1" -source = "git+https://github.com/betrusted-io/usbd-human-interface-device.git?branch=main#1bf7df956d26b25485a6d9faa186e5b387c55a67" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f01ee9d05b01603f4d6ee43e7d0ebe140f16567d6ff99fde0dc1ea6e7564e65" dependencies = [ - "delegate", + "delegate 0.7.0", "embedded-time", "frunk", - "hash32", - "hash32-derive", "heapless", "log", "num_enum", @@ -3720,7 +3730,7 @@ dependencies = [ "ticktimer-server", "tts-frontend", "usb-device-xous", - "usbd-human-interface-device 0.1.1 (git+https://github.com/betrusted-io/usbd-human-interface-device.git?branch=main)", + "usbd-human-interface-device 0.2.1", "xous", "xous-ipc 0.9.7", "xous-names", diff --git a/apps/vault/Cargo.toml b/apps/vault/Cargo.toml index f8c8bf869..fc28464b8 100644 --- a/apps/vault/Cargo.toml +++ b/apps/vault/Cargo.toml @@ -17,8 +17,7 @@ graphics-server = {path = "../../services/graphics-server" } locales = {path = "../../locales"} tts-frontend = {path="../../services/tts"} usb-device-xous = {path="../../services/usb-device-xous"} -usbd-human-interface-device = {git="https://github.com/betrusted-io/usbd-human-interface-device.git", branch="main"} -#usbd-human-interface-device = {path="../../../usbd-human-interface-device"} +usbd-human-interface-device = "0.2.1" pddb = {path = "../../services/pddb" } modals = {path = "../../services/modals" } diff --git a/services/usb-device-xous/Cargo.toml b/services/usb-device-xous/Cargo.toml index 740137a92..701622a91 100644 --- a/services/usb-device-xous/Cargo.toml +++ b/services/usb-device-xous/Cargo.toml @@ -23,8 +23,7 @@ keyboard = {path = "../keyboard"} bitfield = "0.13.2" vcell = "0.1.3" -usbd-human-interface-device = {git="https://github.com/betrusted-io/usbd-human-interface-device.git", branch="main"} -#usbd-human-interface-device = {path="../../../usbd-human-interface-device"} +usbd-human-interface-device = "0.2.1" embedded-time = "0.12.1" # required by the keyboard interface packed_struct = { version = "0.10", default-features = false } # used by the usbd-human-interface-device crate num_enum = { version = "0.5", default-features = false } # used by the usbd-human-interface-device crate