aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOlof <[email protected]>2024-12-27 00:35:49 +0100
committerGitHub <[email protected]>2024-12-27 00:35:49 +0100
commit0836392219f4c47c470267c7b51b51fa730784b8 (patch)
tree449214fa6f32e7f23a8f0fb0f446abd48ebc4e44 /docs
parent4f4740eeb25e0db607a7f700e29efd313dd1942d (diff)
parentb71696c8f54edba664e9bfe77a1d86d09d88f52c (diff)
Merge branch 'embassy-rs:main' into u5_adc
Diffstat (limited to 'docs')
-rw-r--r--docs/examples/basic/Cargo.toml4
-rw-r--r--docs/pages/faq.adoc6
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/examples/basic/Cargo.toml b/docs/examples/basic/Cargo.toml
index daf83873d..613fc2041 100644
--- a/docs/examples/basic/Cargo.toml
+++ b/docs/examples/basic/Cargo.toml
@@ -6,8 +6,8 @@ version = "0.1.0"
6license = "MIT OR Apache-2.0" 6license = "MIT OR Apache-2.0"
7 7
8[dependencies] 8[dependencies]
9embassy-executor = { version = "0.6.3", path = "../../../embassy-executor", features = ["defmt", "arch-cortex-m", "executor-thread"] } 9embassy-executor = { version = "0.7.0", path = "../../../embassy-executor", features = ["defmt", "arch-cortex-m", "executor-thread"] }
10embassy-time = { version = "0.3.2", path = "../../../embassy-time", features = ["defmt"] } 10embassy-time = { version = "0.4.0", path = "../../../embassy-time", features = ["defmt"] }
11embassy-nrf = { version = "0.2.0", path = "../../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote"] } 11embassy-nrf = { version = "0.2.0", path = "../../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote"] }
12 12
13defmt = "0.3" 13defmt = "0.3"
diff --git a/docs/pages/faq.adoc b/docs/pages/faq.adoc
index 3e32563cc..ed88515d0 100644
--- a/docs/pages/faq.adoc
+++ b/docs/pages/faq.adoc
@@ -140,9 +140,9 @@ Example:
140[source,toml] 140[source,toml]
141---- 141----
142[patch.crates-io] 142[patch.crates-io]
143embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" } 143embassy-time-queue-utils = { git = "https://github.com/embassy-rs/embassy.git", rev = "7f8af8a" }
144embassy-time-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" } 144embassy-time-driver = { git = "https://github.com/embassy-rs/embassy.git", rev = "7f8af8a" }
145# embassy-time = { git = "https://github.com/embassy-rs/embassy.git", rev = "e5fdd35" } 145# embassy-time = { git = "https://github.com/embassy-rs/embassy.git", rev = "7f8af8a" }
146---- 146----
147 147
148Note that the git revision should match any other embassy patches or git dependencies that you are using! 148Note that the git revision should match any other embassy patches or git dependencies that you are using!