Update doc projects deps, don't use patch.crates-io

embassy-rs · Jan 15, 2025 · 2fab8d0 · 2fab8d0
1 parent 4d9b279
commit 2fab8d0
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 48 deletions.
diff --git a/docs/examples/layer-by-layer/Cargo.toml b/docs/examples/layer-by-layer/Cargo.toml
@@ -7,10 +7,6 @@ members = [
     "blinky-async",
 ]
 
-[patch.crates-io]
-embassy-executor = { path = "../../../embassy-executor" }
-embassy-stm32 = { path = "../../../embassy-stm32" }
-
 [profile.release]
 codegen-units = 1
 debug = 2

diff --git a/docs/examples/layer-by-layer/blinky-async/Cargo.toml b/docs/examples/layer-by-layer/blinky-async/Cargo.toml
@@ -7,9 +7,9 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7"
 cortex-m-rt = "0.7"
-embassy-stm32 = { version = "0.2.0", features = ["stm32l475vg", "memory-x", "exti"]  }
-embassy-executor = { version = "0.6.3", features = ["arch-cortex-m", "executor-thread"] }
+embassy-stm32 = { version = "0.2.0", path = "../../../../embassy-stm32", features = ["stm32l475vg", "memory-x", "exti"]  }
+embassy-executor = { version = "0.7.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread"] }
 
-defmt = "0.3.0"
-defmt-rtt = "0.3.0"
+defmt = "0.3"
+defmt-rtt = "0.4"
 panic-probe = { version = "0.3.0", features = ["print-defmt"] }
diff --git a/docs/examples/layer-by-layer/blinky-hal/Cargo.toml b/docs/examples/layer-by-layer/blinky-hal/Cargo.toml
@@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7"
 cortex-m-rt = "0.7"
-embassy-stm32 = { version = "0.2.0", features = ["stm32l475vg", "memory-x"] }
+embassy-stm32 = { version = "0.2.0", path = "../../../../embassy-stm32", features = ["stm32l475vg", "memory-x"] }
 
-defmt = "0.3.0"
-defmt-rtt = "0.3.0"
+defmt = "0.3"
+defmt-rtt = "0.4"
 panic-probe = { version = "0.3.0", features = ["print-defmt"] }
diff --git a/docs/examples/layer-by-layer/blinky-irq/Cargo.toml b/docs/examples/layer-by-layer/blinky-irq/Cargo.toml
@@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7"
 cortex-m-rt = { version = "0.7" }
-embassy-stm32 = { version = "0.2.0", features = ["stm32l475vg", "memory-x", "unstable-pac"] }
+embassy-stm32 = { version = "0.2.0", path = "../../../../embassy-stm32", features = ["stm32l475vg", "memory-x", "unstable-pac"] }
 
-defmt = "0.3.0"
-defmt-rtt = "0.3.0"
+defmt = "0.3"
+defmt-rtt = "0.4"
 panic-probe = { version = "0.3.0", features = ["print-defmt"] }
diff --git a/docs/examples/layer-by-layer/blinky-pac/Cargo.toml b/docs/examples/layer-by-layer/blinky-pac/Cargo.toml
@@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 cortex-m = "0.7"
 cortex-m-rt = "0.7"
-stm32-metapac = { version = "1", features = ["stm32l475vg", "memory-x"] }
+stm32-metapac = { version = "16", features = ["stm32l475vg"] }
 
-defmt = "0.3.0"
-defmt-rtt = "0.3.0"
+defmt = "0.3"
+defmt-rtt = "0.4"
 panic-probe = { version = "0.3.0", features = ["print-defmt"] }
diff --git a/docs/examples/layer-by-layer/blinky-pac/src/main.rs b/docs/examples/layer-by-layer/blinky-pac/src/main.rs
@@ -8,46 +8,38 @@ use {defmt_rtt as _, panic_probe as _, stm32_metapac as pac};
 fn main() -> ! {
     // Enable GPIO clock
     let rcc = pac::RCC;
-    unsafe {
-        rcc.ahb2enr().modify(|w| {
-            w.set_gpioben(true);
-            w.set_gpiocen(true);
-        });
+    rcc.ahb2enr().modify(|w| {
+        w.set_gpioben(true);
+        w.set_gpiocen(true);
+    });
 
-        rcc.ahb2rstr().modify(|w| {
-            w.set_gpiobrst(true);
-            w.set_gpiocrst(true);
-            w.set_gpiobrst(false);
-            w.set_gpiocrst(false);
-        });
-    }
+    rcc.ahb2rstr().modify(|w| {
+        w.set_gpiobrst(true);
+        w.set_gpiocrst(true);
+        w.set_gpiobrst(false);
+        w.set_gpiocrst(false);
+    });
 
     // Setup button
     let gpioc = pac::GPIOC;
     const BUTTON_PIN: usize = 13;
-    unsafe {
-        gpioc.pupdr().modify(|w| w.set_pupdr(BUTTON_PIN, vals::Pupdr::PULLUP));
-        gpioc.otyper().modify(|w| w.set_ot(BUTTON_PIN, vals::Ot::PUSHPULL));
-        gpioc.moder().modify(|w| w.set_moder(BUTTON_PIN, vals::Moder::INPUT));
-    }
+    gpioc.pupdr().modify(|w| w.set_pupdr(BUTTON_PIN, vals::Pupdr::PULL_UP));
+    gpioc.otyper().modify(|w| w.set_ot(BUTTON_PIN, vals::Ot::PUSH_PULL));
+    gpioc.moder().modify(|w| w.set_moder(BUTTON_PIN, vals::Moder::INPUT));
 
     // Setup LED
     let gpiob = pac::GPIOB;
     const LED_PIN: usize = 14;
-    unsafe {
-        gpiob.pupdr().modify(|w| w.set_pupdr(LED_PIN, vals::Pupdr::FLOATING));
-        gpiob.otyper().modify(|w| w.set_ot(LED_PIN, vals::Ot::PUSHPULL));
-        gpiob.moder().modify(|w| w.set_moder(LED_PIN, vals::Moder::OUTPUT));
-    }
+    gpiob.pupdr().modify(|w| w.set_pupdr(LED_PIN, vals::Pupdr::FLOATING));
+    gpiob.otyper().modify(|w| w.set_ot(LED_PIN, vals::Ot::PUSH_PULL));
+    gpiob.moder().modify(|w| w.set_moder(LED_PIN, vals::Moder::OUTPUT));
 
     // Main loop
     loop {
-        unsafe {
-            if gpioc.idr().read().idr(BUTTON_PIN) == vals::Idr::LOW {
-                gpiob.bsrr().write(|w| w.set_bs(LED_PIN, true));
-            } else {
-                gpiob.bsrr().write(|w| w.set_br(LED_PIN, true));
-            }
+        if gpioc.idr().read().idr(BUTTON_PIN) == vals::Idr::LOW {
+            gpiob.bsrr().write(|w| w.set_bs(LED_PIN, true));
+        } else {
+            gpiob.bsrr().write(|w| w.set_br(LED_PIN, true));
         }
     }
 }
diff --git a/tests/perf-client/Cargo.toml b/tests/perf-client/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 embassy-net = { version = "0.6.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4"] }
 embassy-time = { version = "0.4.0", path = "../../embassy-time", features = ["defmt", ] }
 embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
-defmt = "0.3.0"
+defmt = "0.3"
diff --git a/tests/rp/Cargo.toml b/tests/rp/Cargo.toml
@@ -19,7 +19,7 @@ cyw43 = { path = "../../cyw43", features = ["defmt", "firmware-logs"] }
 cyw43-pio = { path = "../../cyw43-pio", features = ["defmt"] }
 perf-client = { path = "../perf-client" }
 
-defmt = "0.3.0"
+defmt = "0.3"
 defmt-rtt = "0.4"
 
 cortex-m = { version = "0.7.6" }

diff --git a/tests/stm32/Cargo.toml b/tests/stm32/Cargo.toml
@@ -68,7 +68,7 @@ embassy-stm32-wpan = { version = "0.1.0", path = "../../embassy-stm32-wpan", opt
 embassy-net = { version = "0.6.0", path = "../../embassy-net", features = ["defmt",  "tcp", "udp", "dhcpv4", "medium-ethernet"] }
 perf-client = { path = "../perf-client" }
 
-defmt = "0.3.0"
+defmt = "0.3"
 defmt-rtt = "0.4"
 
 cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }