From a64edbdf2fac175b0f1b0595f78d3a78e99bb343 Mon Sep 17 00:00:00 2001 From: Gianguido Sora Date: Tue, 30 Jan 2024 19:05:17 +0100 Subject: [PATCH] services/usb-device-xous: use main branch for xous-usb-hid --- Cargo.lock | 20 +++++++++++++++++--- services/usb-device-xous/Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6667f6463..2e646919a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5366,7 +5366,7 @@ dependencies = [ "xous-api-ticktimer", "xous-ipc 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", - "xous-usb-hid", + "xous-usb-hid 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git?branch=main)", ] [[package]] @@ -5389,7 +5389,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-usb-hid", + "xous-usb-hid 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git)", ] [[package]] @@ -5572,7 +5572,7 @@ dependencies = [ "xous-api-susres", "xous-api-ticktimer", "xous-ipc 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-usb-hid", + "xous-usb-hid 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git)", ] [[package]] @@ -6349,6 +6349,20 @@ dependencies = [ "xous-ipc 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "xous-usb-hid" +version = "0.4.3" +source = "git+https://github.com/betrusted-io/xous-usb-hid.git?branch=main#793ec00243c525f2d17dc1d3a185abdeec57aaf6" +dependencies = [ + "frunk", + "fugit", + "heapless 0.7.16", + "num_enum 0.6.1", + "option-block", + "packed_struct", + "usb-device", +] + [[package]] name = "xous-usb-hid" version = "0.4.3" diff --git a/services/usb-device-xous/Cargo.toml b/services/usb-device-xous/Cargo.toml index d06b13c94..ce18cfbc7 100644 --- a/services/usb-device-xous/Cargo.toml +++ b/services/usb-device-xous/Cargo.toml @@ -28,7 +28,7 @@ xous-semver = "0.1.2" utralib = { version = "0.1.24", optional = true, default-features = false } trng = { path = "../trng" } -xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git" } +xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branch="main" } embedded-time = "0.12.1" # required by the keyboard interface packed_struct = { version = "0.10", default-features = false } # used by the xous-usb-hid crate num_enum = { version = "0.5", default-features = false } # used by the xous-usb-hid crate