saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-04 04:27:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

harmonize around a single xous-usb-hid spec

Browse source 
otherwise we get weird conflicts on builds
This commit is contained in:
bunnie 2024-02-01 13:41:49 +08:00
parent 24f68fe2ac
commit 92e501ec01
3 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Cargo.lock generated
View file

@ -5354,7 +5354,7 @@ dependencies = [
"xous-api-ticktimer",
"xous-ipc 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)",
"xous-semver",
"xous-usb-hid 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git?branch=main)",
"xous-usb-hid",
]
[[package]]
@ -5377,7 +5377,7 @@ dependencies = [
"xous-api-names",
"xous-api-susres",
"xous-api-ticktimer",
"xous-usb-hid 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git)",
"xous-usb-hid",
]
[[package]]
@ -5560,7 +5560,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 0.4.3 (git+https://github.com/betrusted-io/xous-usb-hid.git)",
"xous-usb-hid",
]
[[package]]
@ -6351,20 +6351,6 @@ dependencies = [
"usb-device",
]
[[package]]
name = "xous-usb-hid"
version = "0.4.3"
source = "git+https://github.com/betrusted-io/xous-usb-hid.git#eba35e886d08e504cf10026221aec0fbfc63e201"
dependencies = [
"frunk",
"fugit",
"heapless 0.7.16",
"num_enum 0.6.1",
"option-block",
"packed_struct",
"usb-device",
]
[[package]]
name = "xtask"
version = "0.1.0"

2
apps/vault/Cargo.toml
View file

@ -19,7 +19,7 @@ graphics-server = { path = "../../services/graphics-server" }
locales = { path = "../../locales" }
tts-frontend = { path = "../../services/tts" }
usb-device-xous = { path = "../../services/usb-device-xous" }
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" }
pddb = { path = "../../services/pddb" }
modals = { path = "../../services/modals" }
trng = { path = "../../services/trng" }

4
services/usb-test/Cargo.toml
View file

@ -20,8 +20,8 @@ bitfield = "0.13.2"
vcell = "0.1.3"
utralib = { version = "0.1.24", optional = true, default-features = false }
xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git" }
embedded-time = "0.12.1" # required by the keyboard interface
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
[dependencies.usb-device]
# see top level Cargo.toml for patch.crates-io directive to help with dev work