Update crate versions so this can be built off my machine.

Still have to patch in specific git refs, but at least those are
universal.

Left my paths commented for local development.

2 files changed, 28 insertions, 16 deletions

diff --git a/Cargo.lock b/Cargo.lock
index fdcca59..c881d30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -49,8 +49,9 @@ dependencies = [
 [[package]]
 name = "atsamd-hal"
 version = "0.6.0"
+source = "git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a#53f8d846e40715c8592d171d9a57b66ee303207a"
 dependencies = [
- "atsamd21e18a 0.5.0",
+ "atsamd21e18a 0.5.0 (git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a)",
  "bitfield 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -63,12 +64,13 @@ dependencies = [
 [[package]]
 name = "atsamd-usb-host"
 version = "0.1.0"
+source = "git+https://github.com/bjc/atsamd-usb-host.git?rev=385efdf53fa3fe38591f22d01edf75d3087c2326#385efdf53fa3fe38591f22d01edf75d3087c2326"
 dependencies = [
  "atsamd-hal 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "starb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "usb-host 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "usb-host 0.1.0 (git+https://github.com/bjc/usb-host.git?rev=b0be48424e81384de3280b5a5ac521d694b82e15)",
 ]
 
 [[package]]
@@ -84,6 +86,7 @@ dependencies = [
 [[package]]
 name = "atsamd21e18a"
 version = "0.5.0"
+source = "git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a#53f8d846e40715c8592d171d9a57b66ee303207a"
 dependencies = [
  "bare-metal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -109,8 +112,8 @@ name = "bleusb"
 version = "0.1.0"
 dependencies = [
  "apa102-spi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atsamd-usb-host 0.1.0",
- "bootkbd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atsamd-usb-host 0.1.0 (git+https://github.com/bjc/atsamd-usb-host.git?rev=385efdf53fa3fe38591f22d01edf75d3087c2326)",
+ "bootkbd 0.1.0 (git+https://github.com/bjc/bootkbd.git?rev=49827fce5adbaf636b893919f31c0dbd97bb3eb4)",
  "clint 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -120,17 +123,17 @@ dependencies = [
  "smart-leds 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smart-leds-trait 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "starb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "trinket_m0 0.4.0",
- "usb-host 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trinket_m0 0.4.0 (git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a)",
+ "usb-host 0.1.0 (git+https://github.com/bjc/usb-host.git?rev=b0be48424e81384de3280b5a5ac521d694b82e15)",
 ]
 
 [[package]]
 name = "bootkbd"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/bjc/bootkbd.git?rev=49827fce5adbaf636b893919f31c0dbd97bb3eb4#49827fce5adbaf636b893919f31c0dbd97bb3eb4"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "usb-host 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "usb-host 0.1.0 (git+https://github.com/bjc/usb-host.git?rev=b0be48424e81384de3280b5a5ac521d694b82e15)",
 ]
 
 [[package]]
@@ -354,8 +357,9 @@ dependencies = [
 [[package]]
 name = "trinket_m0"
 version = "0.4.0"
+source = "git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a#53f8d846e40715c8592d171d9a57b66ee303207a"
 dependencies = [
- "atsamd-hal 0.6.0",
+ "atsamd-hal 0.6.0 (git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a)",
  "cortex-m 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m-rt 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -375,7 +379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "usb-host"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/bjc/usb-host.git?rev=b0be48424e81384de3280b5a5ac521d694b82e15#b0be48424e81384de3280b5a5ac521d694b82e15"
 
 [[package]]
 name = "vcell"
@@ -401,10 +405,13 @@ dependencies = [
 "checksum apa102-spi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "244c305e53cabeadfce23409fe24bfcedaa20166aa3f16f6c4ab256302158fd5"
 "checksum as-slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "293dac66b274fab06f95e7efb05ec439a6b70136081ea522d270bc351ae5bb27"
 "checksum atsamd-hal 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9affce3b8d443195536c0b398a55a152cc962366c24824ea833bb22afd49b3d6"
+"checksum atsamd-hal 0.6.0 (git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a)" = "<none>"
+"checksum atsamd-usb-host 0.1.0 (git+https://github.com/bjc/atsamd-usb-host.git?rev=385efdf53fa3fe38591f22d01edf75d3087c2326)" = "<none>"
 "checksum atsamd21e18a 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "139787a30d118dd09a2e9570f5404cf582b70afe9b53dd1194239f9be382b897"
+"checksum atsamd21e18a 0.5.0 (git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a)" = "<none>"
 "checksum bare-metal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a3caf393d93b2d453e80638d0674597020cef3382ada454faacd43d1a55a735a"
 "checksum bitfield 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
-"checksum bootkbd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c25e23fc8d9fa858f4f8fe7d7483cdcb74d5ed5a9ccfe46120184f9cf7c4559"
+"checksum bootkbd 0.1.0 (git+https://github.com/bjc/bootkbd.git?rev=49827fce5adbaf636b893919f31c0dbd97bb3eb4)" = "<none>"
 "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
 "checksum clint 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "200296af81a4cbe7da52afd9e5c35b7782eca865678caf2280251b777c9c37aa"
 "checksum cortex-m 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0b159a1e8306949579de3698c841dba58058197b65c60807194e4fa1e7a554"
@@ -433,9 +440,10 @@ dependencies = [
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum starb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "36de9f301031f2a692afe144c8a757950d2b60b7fbf447055b8e19a9c232fb2c"
 "checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e"
+"checksum trinket_m0 0.4.0 (git+https://github.com/atsamd-rs/atsamd.git?rev=53f8d846e40715c8592d171d9a57b66ee303207a)" = "<none>"
 "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum usb-host 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b28da4134d769440fac400a8c871e5c4407ff5e99d1136e616c8b571e73144d1"
+"checksum usb-host 0.1.0 (git+https://github.com/bjc/usb-host.git?rev=b0be48424e81384de3280b5a5ac521d694b82e15)" = "<none>"
 "checksum vcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45c297f0afb6928cd08ab1ff9d95e99392595ea25ae1b5ecf822ff8764e57a0d"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"
diff --git a/Cargo.toml b/Cargo.toml
index 8bd6439..d5535a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,6 @@ repository = "https://github.com/bjc/bleusb.git"
 
 [dependencies]
 embedded-hal = "0.2"
-#atsamd-hal = "0.6"
 trinket_m0 = "0.4"
 log = "0.4"
 starb = "0.1"
@@ -22,11 +21,16 @@ smart-leds = "0.2"
 apa102-spi = "0.2"
 usb-host = "0.1"
 bootkbd = "0.1"
-atsamd-usb-host = { path = "../usbh/atsamd-usb-host" }
+atsamd-usb-host = { git = "https://github.com/bjc/atsamd-usb-host.git", rev = "385efdf53fa3fe38591f22d01edf75d3087c2326" }
+# atsamd-usb-host = { path = "../usbh/atsamd-usb-host" }
 
 [patch.crates-io]
-#atsamd-hal = { path = "../usbh/atsamd/hal" }
-trinket_m0 = { path = "../usbh/atsamd/boards/trinket_m0" }
+bootkbd = { git = "https://github.com/bjc/bootkbd.git", rev = "49827fce5adbaf636b893919f31c0dbd97bb3eb4" }
+usb-host = { git = "https://github.com/bjc/usb-host.git", rev = "b0be48424e81384de3280b5a5ac521d694b82e15" }
+trinket_m0 = { git = "https://github.com/atsamd-rs/atsamd.git", rev = "53f8d846e40715c8592d171d9a57b66ee303207a" }
+# trinket_m0 = { path = "../usbh/atsamd/boards/trinket_m0" }
+# bootkbd = { path = "../usbh/bootkbd" }
+# usb-host = { path = "../usbh/usb-host" }
 
 [features]
 default = ["atsamd-usb-host/samd21e18a"]