aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-11-02 18:10:01 +0000
committerGitHub <[email protected]>2021-11-02 18:10:01 +0000
commit11b0a89b6a46a0d50a8b16d0607a672f9399e01a (patch)
tree3ccdbb8192f55a09750163fb2a3c9697303bdf59
parent3dcf899babff5b735b1f1a5a99a9005ce06f517f (diff)
parent205a223af32bb33507efa729b66143027be47eb6 (diff)
Merge #466
466: Update versions of critical-section and atomic-polyfill r=lulf a=lulf Co-authored-by: Ulf Lilleengen <[email protected]>
-rw-r--r--embassy-nrf/Cargo.toml2
-rw-r--r--embassy-rp/Cargo.toml4
-rw-r--r--embassy-stm32/Cargo.toml4
-rw-r--r--embassy/Cargo.toml4
-rw-r--r--examples/rp/Cargo.toml2
-rw-r--r--examples/stm32h7/Cargo.toml2
-rw-r--r--examples/wasm/Cargo.toml2
7 files changed, 10 insertions, 10 deletions
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml
index 479e2f912..17c3e29d5 100644
--- a/embassy-nrf/Cargo.toml
+++ b/embassy-nrf/Cargo.toml
@@ -51,7 +51,7 @@ cortex-m = "0.7.3"
51embedded-hal = "0.2.6" 51embedded-hal = "0.2.6"
52embedded-dma = "0.1.2" 52embedded-dma = "0.1.2"
53futures = { version = "0.3.17", default-features = false } 53futures = { version = "0.3.17", default-features = false }
54critical-section = "0.2.3" 54critical-section = "0.2.5"
55rand_core = "0.6.3" 55rand_core = "0.6.3"
56fixed = "1.10.0" 56fixed = "1.10.0"
57embedded-storage = "0.2.0" 57embedded-storage = "0.2.0"
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index d98ff2d51..21a19a632 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -22,12 +22,12 @@ defmt-error = [ ]
22embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] } 22embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] }
23embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" } 23embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
24embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]} 24embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]}
25atomic-polyfill = "0.1.3" 25atomic-polyfill = "0.1.5"
26defmt = { version = "0.2.3", optional = true } 26defmt = { version = "0.2.3", optional = true }
27log = { version = "0.4.14", optional = true } 27log = { version = "0.4.14", optional = true }
28cortex-m-rt = ">=0.6.15,<0.8" 28cortex-m-rt = ">=0.6.15,<0.8"
29cortex-m = "0.7.3" 29cortex-m = "0.7.3"
30critical-section = "0.2.3" 30critical-section = "0.2.5"
31 31
32rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="9ad7223a48a065e612bc7dc7be5bf5bd0b41cfc4", features = ["rt"] } 32rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="9ad7223a48a065e612bc7dc7be5bf5bd0b41cfc4", features = ["rt"] }
33#rp2040-pac2 = { path = "../../rp/rp2040-pac2", features = ["rt"] } 33#rp2040-pac2 = { path = "../../rp/rp2040-pac2", features = ["rt"] }
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index ecad19751..dafb8ef77 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -21,9 +21,9 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa
21rand_core = "0.6.3" 21rand_core = "0.6.3"
22sdio-host = "0.5.0" 22sdio-host = "0.5.0"
23embedded-sdmmc = { git = "https://github.com/thalesfragoso/embedded-sdmmc-rs", branch = "async", optional = true } 23embedded-sdmmc = { git = "https://github.com/thalesfragoso/embedded-sdmmc-rs", branch = "async", optional = true }
24critical-section = "0.2.3" 24critical-section = "0.2.5"
25bare-metal = "1.0.0" 25bare-metal = "1.0.0"
26atomic-polyfill = "0.1.3" 26atomic-polyfill = "0.1.5"
27stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] } 27stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] }
28vcell = { version = "0.1.3", optional = true } 28vcell = { version = "0.1.3", optional = true }
29bxcan = "0.5.1" 29bxcan = "0.5.1"
diff --git a/embassy/Cargo.toml b/embassy/Cargo.toml
index 30eb07716..d531ce3f9 100644
--- a/embassy/Cargo.toml
+++ b/embassy/Cargo.toml
@@ -40,8 +40,8 @@ futures = { version = "0.3.17", default-features = false, features = [ "cfg-
40pin-project = { version = "1.0.8", default-features = false } 40pin-project = { version = "1.0.8", default-features = false }
41embassy-macros = { version = "0.1.0", path = "../embassy-macros"} 41embassy-macros = { version = "0.1.0", path = "../embassy-macros"}
42embassy-traits = { version = "0.1.0", path = "../embassy-traits"} 42embassy-traits = { version = "0.1.0", path = "../embassy-traits"}
43atomic-polyfill = "0.1.3" 43atomic-polyfill = "0.1.5"
44critical-section = "0.2.3" 44critical-section = "0.2.5"
45embedded-hal = "0.2.6" 45embedded-hal = "0.2.6"
46heapless = "0.7.5" 46heapless = "0.7.5"
47 47
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml
index d168c39fa..9caa37179 100644
--- a/examples/rp/Cargo.toml
+++ b/examples/rp/Cargo.toml
@@ -19,7 +19,7 @@ defmt-error = []
19[dependencies] 19[dependencies]
20embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] } 20embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
21embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "defmt-trace"] } 21embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "defmt-trace"] }
22atomic-polyfill = "0.1.3" 22atomic-polyfill = "0.1.5"
23 23
24defmt = "0.2.3" 24defmt = "0.2.3"
25defmt-rtt = "0.2.0" 25defmt-rtt = "0.2.0"
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index 747d9a120..eed4882c9 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -35,7 +35,7 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa
35rtt-target = { version = "0.3.1", features = ["cortex-m"] } 35rtt-target = { version = "0.3.1", features = ["cortex-m"] }
36heapless = { version = "0.7.5", default-features = false } 36heapless = { version = "0.7.5", default-features = false }
37rand_core = "0.6.3" 37rand_core = "0.6.3"
38critical-section = "0.2.3" 38critical-section = "0.2.5"
39 39
40micromath = "2.0.0" 40micromath = "2.0.0"
41 41
diff --git a/examples/wasm/Cargo.toml b/examples/wasm/Cargo.toml
index d8417852b..c6218a805 100644
--- a/examples/wasm/Cargo.toml
+++ b/examples/wasm/Cargo.toml
@@ -14,4 +14,4 @@ wasm-logger = "0.2.0"
14wasm-bindgen = "0.2" 14wasm-bindgen = "0.2"
15web-sys = { version = "0.3", features = ["Document", "Element", "HtmlElement", "Node", "Window" ] } 15web-sys = { version = "0.3", features = ["Document", "Element", "HtmlElement", "Node", "Window" ] }
16log = "0.4.11" 16log = "0.4.11"
17critical-section = "0.2.3" 17critical-section = "0.2.5"