diff --git a/Cargo.toml b/Cargo.toml index 2fba6274875d234a56dca28ddeb30fe3bcabe8a4..06a629b66385319581c9fd694b2d984edbe4f54d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,10 +79,8 @@ serde_json = "1.0" # embassy is not released yet [patch.crates-io] -# embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -# embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -# embassy-rp = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-sync = { path = "/home/matt/3rd/rs/embassy/embassy-sync" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +# embassy-sync = { path = "/home/matt/3rd/rs/embassy/embassy-sync" } diff --git a/embassy/demos/picow/Cargo.lock b/embassy/demos/picow/Cargo.lock index 4932431d93ced97a82b7383b3dba454130e682f1..3613524862307e6560e2dcc051b803d7f6b45c64 100644 --- a/embassy/demos/picow/Cargo.lock +++ b/embassy/demos/picow/Cargo.lock @@ -290,6 +290,7 @@ dependencies = [ [[package]] name = "cyw43" version = "0.1.0" +source = "git+https://github.com/embassy-rs/cyw43/#8a81114baf4ffe12ec54e80e342f098c596177d1" dependencies = [ "atomic-polyfill 0.1.10", "cortex-m", @@ -297,7 +298,7 @@ dependencies = [ "defmt", "embassy-futures", "embassy-net", - "embassy-sync 0.1.0", + "embassy-sync", "embassy-time", "embedded-hal 1.0.0-alpha.9", "embedded-hal-async", @@ -438,7 +439,7 @@ dependencies = [ [[package]] name = "embassy-cortex-m" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "atomic-polyfill 1.0.1", "cfg-if", @@ -447,15 +448,15 @@ dependencies = [ "embassy-executor", "embassy-hal-common", "embassy-macros", - "embassy-sync 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107)", + "embassy-sync", ] [[package]] name = "embassy-embedded-hal" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ - "embassy-sync 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107)", + "embassy-sync", "embedded-hal 0.2.7", "embedded-hal 1.0.0-alpha.9", "embedded-hal-async", @@ -467,7 +468,7 @@ dependencies = [ [[package]] name = "embassy-executor" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "atomic-polyfill 1.0.1", "cfg-if", @@ -482,12 +483,12 @@ dependencies = [ [[package]] name = "embassy-futures" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" [[package]] name = "embassy-hal-common" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "num-traits", ] @@ -495,7 +496,7 @@ dependencies = [ [[package]] name = "embassy-macros" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "darling", "proc-macro2", @@ -506,13 +507,13 @@ dependencies = [ [[package]] name = "embassy-net" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "as-slice 0.2.1", "atomic-polyfill 1.0.1", "atomic-pool", "defmt", - "embassy-sync 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107)", + "embassy-sync", "embassy-time", "futures", "generic-array 0.14.6", @@ -525,7 +526,7 @@ dependencies = [ [[package]] name = "embassy-rp" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "atomic-polyfill 1.0.1", "cfg-if", @@ -538,7 +539,7 @@ dependencies = [ "embassy-executor", "embassy-futures", "embassy-hal-common", - "embassy-sync 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107)", + "embassy-sync", "embassy-time", "embassy-usb-driver", "embedded-hal 0.2.7", @@ -555,19 +556,7 @@ dependencies = [ [[package]] name = "embassy-sync" version = "0.1.0" -dependencies = [ - "atomic-polyfill 1.0.1", - "cfg-if", - "critical-section 1.1.1", - "embedded-io", - "futures-util", - "heapless", -] - -[[package]] -name = "embassy-sync" -version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "atomic-polyfill 1.0.1", "cfg-if", @@ -580,13 +569,13 @@ dependencies = [ [[package]] name = "embassy-time" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "atomic-polyfill 1.0.1", "cfg-if", "critical-section 1.1.1", "defmt", - "embassy-sync 0.1.0 (git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107)", + "embassy-sync", "embedded-hal 0.2.7", "futures-util", "heapless", @@ -595,7 +584,7 @@ dependencies = [ [[package]] name = "embassy-usb-driver" version = "0.1.0" -source = "git+https://github.com/embassy-rs/embassy?rev=e7fdd500d8354a03fcd105c8298cf7b4798a4107#e7fdd500d8354a03fcd105c8298cf7b4798a4107" +source = "git+https://github.com/embassy-rs/embassy?rev=61be0e75c83961a42fc1d844159f1fed7d8afbea#61be0e75c83961a42fc1d844159f1fed7d8afbea" dependencies = [ "defmt", ] @@ -1339,7 +1328,7 @@ dependencies = [ "embassy-futures", "embassy-net", "embassy-rp", - "embassy-sync 0.1.0", + "embassy-sync", "embassy-time", "embedded-hal 1.0.0-alpha.9", "embedded-hal-async", @@ -1363,7 +1352,7 @@ version = "0.2.0-alpha" dependencies = [ "embassy-futures", "embassy-net", - "embassy-sync 0.1.0", + "embassy-sync", "log", "pin-utils", "sunset", diff --git a/embassy/demos/picow/Cargo.toml b/embassy/demos/picow/Cargo.toml index 9dcb997f7192d5aab6da1916442db37e73408168..db3149403ba9a3a3fcb62632f4038399435d9296 100644 --- a/embassy/demos/picow/Cargo.toml +++ b/embassy/demos/picow/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" # blank [dependencies] -# cyw43 = { git = "https://github.com/embassy-rs/cyw43/", features = ["defmt"]} -cyw43 = { path = "/home/matt/3rd/rs/cyw43", features = ["defmt"]} +cyw43 = { git = "https://github.com/embassy-rs/cyw43/", features = ["defmt"]} +# cyw43 = { path = "/home/matt/3rd/rs/cyw43", features = ["defmt"]} embassy-executor = { version = "0.1.0", features = ["defmt", "integrated-timers"] } embassy-time = { version = "0.1.0", features = ["defmt", "defmt-timestamp-uptime"] } embassy-rp = { version = "0.1.0", features = ["defmt", "unstable-traits", "nightly", "unstable-pac"] } @@ -49,13 +49,13 @@ default = ["defmt"] defmt = [] [patch.crates-io] -embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -# embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-rp = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-sync = { path = "/home/matt/3rd/rs/embassy/embassy-sync" } +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-rp = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +# embassy-sync = { path = "/home/matt/3rd/rs/embassy/embassy-sync" } [profile.dev] debug = 2 diff --git a/embassy/demos/std/Cargo.toml b/embassy/demos/std/Cargo.toml index c7a133999d0b520d4355c292c43ea976c33d8f6e..a19a06cdba7463ce882393ca0b3cd6f07b37305f 100644 --- a/embassy/demos/std/Cargo.toml +++ b/embassy/demos/std/Cargo.toml @@ -38,12 +38,12 @@ rand = { version = "0.8", default-features = false, features = ["getrandom"] } sha2 = { version = "0.10", default-features = false } [patch.crates-io] -embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -# embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "e7fdd500d8354a03fcd105c8298cf7b4798a4107" } -embassy-sync = { path = "/home/matt/3rd/rs/embassy/embassy-sync" } +embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-futures = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +embassy-net = { git = "https://github.com/embassy-rs/embassy", rev = "61be0e75c83961a42fc1d844159f1fed7d8afbea" } +# embassy-sync = { path = "/home/matt/3rd/rs/embassy/embassy-sync" } [profile.dev] debug = 2