From 09d52638b551a37c8b032ffb6daaa1abd2efa231 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sat, 27 May 2023 15:05:50 -0500
Subject: [PATCH] stm32/ipcc: refactor examples and tests
---
examples/stm32wb/src/bin/tl_mbox.rs | 14 ++++++++------
examples/stm32wb/src/bin/tl_mbox_tx_rx.rs | 10 +++++-----
tests/stm32/.cargo/config.toml | 6 ++++--
tests/stm32/Cargo.toml | 6 +++---
tests/stm32/build.rs | 13 +++++++++----
tests/stm32/src/bin/{ble.rs => tl_mbox.rs} | 7 +++----
6 files changed, 32 insertions(+), 24 deletions(-)
rename tests/stm32/src/bin/{ble.rs => tl_mbox.rs} (89%)
diff --git a/examples/stm32wb/src/bin/tl_mbox.rs b/examples/stm32wb/src/bin/tl_mbox.rs
index 18d93a279..8f4e70af0 100644
--- a/examples/stm32wb/src/bin/tl_mbox.rs
+++ b/examples/stm32wb/src/bin/tl_mbox.rs
@@ -4,8 +4,7 @@
use defmt::*;
use embassy_executor::Spawner;
-use embassy_stm32::ipcc::Config;
-use embassy_stm32::tl_mbox::TlMbox;
+use embassy_stm32::tl_mbox::{Config, TlMbox};
use embassy_stm32::{bind_interrupts, tl_mbox};
use embassy_time::{Duration, Timer};
use {defmt_rtt as _, panic_probe as _};
@@ -41,16 +40,16 @@ async fn main(_spawner: Spawner) {
Note: extended stack versions are not supported at this time. Do not attempt to install a stack with "extended" in the name.
*/
- let _p = embassy_stm32::init(Default::default());
+ let p = embassy_stm32::init(Default::default());
info!("Hello World!");
let config = Config::default();
- let mbox = TlMbox::init(Irqs, config);
+ let mbox = TlMbox::new(p.IPCC, Irqs, config);
loop {
let wireless_fw_info = mbox.wireless_fw_info();
match wireless_fw_info {
- None => error!("not yet initialized"),
+ None => info!("not yet initialized"),
Some(fw_info) => {
let version_major = fw_info.version_major();
let version_minor = fw_info.version_minor();
@@ -68,6 +67,9 @@ async fn main(_spawner: Spawner) {
}
}
- Timer::after(Duration::from_millis(500)).await;
+ Timer::after(Duration::from_millis(50)).await;
}
+
+ info!("Test OK");
+ cortex_m::asm::bkpt();
}
diff --git a/examples/stm32wb/src/bin/tl_mbox_tx_rx.rs b/examples/stm32wb/src/bin/tl_mbox_tx_rx.rs
index 41c450a53..1724d946f 100644
--- a/examples/stm32wb/src/bin/tl_mbox_tx_rx.rs
+++ b/examples/stm32wb/src/bin/tl_mbox_tx_rx.rs
@@ -4,8 +4,7 @@
use defmt::*;
use embassy_executor::Spawner;
-use embassy_stm32::ipcc::Config;
-use embassy_stm32::tl_mbox::TlMbox;
+use embassy_stm32::tl_mbox::{Config, TlMbox};
use embassy_stm32::{bind_interrupts, tl_mbox};
use {defmt_rtt as _, panic_probe as _};
@@ -40,11 +39,11 @@ async fn main(_spawner: Spawner) {
Note: extended stack versions are not supported at this time. Do not attempt to install a stack with "extended" in the name.
*/
- let _p = embassy_stm32::init(Default::default());
+ let p = embassy_stm32::init(Default::default());
info!("Hello World!");
let config = Config::default();
- let mbox = TlMbox::init(Irqs, config);
+ let mbox = TlMbox::new(p.IPCC, Irqs, config);
info!("waiting for coprocessor to boot");
let event_box = mbox.read().await;
@@ -94,5 +93,6 @@ async fn main(_spawner: Spawner) {
payload[3..]
);
- loop {}
+ info!("Test OK");
+ cortex_m::asm::bkpt();
}
diff --git a/tests/stm32/.cargo/config.toml b/tests/stm32/.cargo/config.toml
index 29c4799a1..48588f0b7 100644
--- a/tests/stm32/.cargo/config.toml
+++ b/tests/stm32/.cargo/config.toml
@@ -3,8 +3,10 @@ build-std = ["core"]
build-std-features = ["panic_immediate_abort"]
[target.'cfg(all(target_arch = "arm", target_os = "none"))']
-runner = "teleprobe client run --target bluepill-stm32f103c8 --elf"
+#runner = "teleprobe client run --target bluepill-stm32f103c8 --elf"
#runner = "teleprobe local run --chip STM32F103C8 --elf"
+#runner = "teleprobe local run --chip STM32WB55RG --elf"
+runner = "probe-run --chip STM32WB55RG"
rustflags = [
# Code-size optimizations.
@@ -14,7 +16,7 @@ rustflags = [
]
[build]
-target = "thumbv7m-none-eabi"
+target = "thumbv7em-none-eabi"
[env]
DEFMT_LOG = "trace"
diff --git a/tests/stm32/Cargo.toml b/tests/stm32/Cargo.toml
index bd8d90abe..23b5f9caa 100644
--- a/tests/stm32/Cargo.toml
+++ b/tests/stm32/Cargo.toml
@@ -12,7 +12,7 @@ stm32g071rb = ["embassy-stm32/stm32g071rb", "not-gpdma"] # Nucleo
stm32c031c6 = ["embassy-stm32/stm32c031c6", "not-gpdma"] # Nucleo
stm32g491re = ["embassy-stm32/stm32g491re", "not-gpdma"] # Nucleo
stm32h755zi = ["embassy-stm32/stm32h755zi-cm7", "not-gpdma"] # Nucleo
-stm32wb55rg = ["embassy-stm32/stm32wb55rg", "not-gpdma"] # Nucleo
+stm32wb55rg = ["embassy-stm32/stm32wb55rg", "not-gpdma", "ble"] # Nucleo
stm32h563zi = ["embassy-stm32/stm32h563zi"] # Nucleo
stm32u585ai = ["embassy-stm32/stm32u585ai"] # IoT board
@@ -45,8 +45,8 @@ chrono = { version = "^0.4", default-features = false, optional = true}
# BEGIN TESTS
# Generated by gen_test.py. DO NOT EDIT.
[[bin]]
-name = "ble"
-path = "src/bin/ble.rs"
+name = "tl_mbox"
+path = "src/bin/tl_mbox.rs"
required-features = [ "ble",]
[[bin]]
diff --git a/tests/stm32/build.rs b/tests/stm32/build.rs
index ca76b70bb..b4583147e 100644
--- a/tests/stm32/build.rs
+++ b/tests/stm32/build.rs
@@ -9,17 +9,22 @@ fn main() -> Result<(), Box<dyn Error>> {
println!("cargo:rustc-link-arg-bins=--nmagic");
// too little RAM to run from RAM.
- if cfg!(any(feature = "stm32f103c8", feature = "stm32c031c6")) {
+ if cfg!(any(
+ feature = "stm32f103c8",
+ feature = "stm32c031c6",
+ feature = "stm32wb55rg"
+ )) {
println!("cargo:rustc-link-arg-bins=-Tlink.x");
println!("cargo:rerun-if-changed=link.x");
- } else if cfg!(feature = "stm32wb55rg") {
- println!("cargo:rustc-link-arg-bins=-Tlink.x");
- fs::write(out.join("memory.x"), include_bytes!("memory_ble.x")).unwrap();
} else {
println!("cargo:rustc-link-arg-bins=-Tlink_ram.x");
println!("cargo:rerun-if-changed=link_ram.x");
}
+ if cfg!(feature = "stm32wb55rg") {
+ println!("cargo:rustc-link-arg-bins=-Ttl_mbox.x");
+ }
+
println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
Ok(())
diff --git a/tests/stm32/src/bin/ble.rs b/tests/stm32/src/bin/tl_mbox.rs
similarity index 89%
rename from tests/stm32/src/bin/ble.rs
rename to tests/stm32/src/bin/tl_mbox.rs
index db5cc611d..626e7ac6f 100644
--- a/tests/stm32/src/bin/ble.rs
+++ b/tests/stm32/src/bin/tl_mbox.rs
@@ -7,8 +7,7 @@
#[path = "../example_common.rs"]
mod example_common;
use embassy_executor::Spawner;
-use embassy_stm32::ipcc::Config;
-use embassy_stm32::tl_mbox::TlMbox;
+use embassy_stm32::tl_mbox::{Config, TlMbox};
use embassy_stm32::{bind_interrupts, tl_mbox};
use embassy_time::{Duration, Timer};
use example_common::*;
@@ -20,11 +19,11 @@ bind_interrupts!(struct Irqs{
#[embassy_executor::main]
async fn main(_spawner: Spawner) {
- let _p = embassy_stm32::init(config());
+ let p = embassy_stm32::init(config());
info!("Hello World!");
let config = Config::default();
- let mbox = TlMbox::init(Irqs, config);
+ let mbox = TlMbox::new(p.IPCC, Irqs, config);
loop {
let wireless_fw_info = mbox.wireless_fw_info();