aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorxoviat <[email protected]>2023-06-19 15:52:33 -0500
committerxoviat <[email protected]>2023-06-19 15:52:33 -0500
commitaaad9068156305e5f6f41ee4013e025083bd0668 (patch)
tree67a08c8a512e8791433891a3b6deec813fc4c578 /tests
parent35083b262b364387713f4273649b62180123182c (diff)
parent3c70f799a28f5f28d84fa8ee8b4b232f5e9aad82 (diff)
Merge branch 'main' of https://github.com/embassy-rs/embassy into can
Diffstat (limited to 'tests')
-rw-r--r--tests/perf-server/Cargo.toml8
-rwxr-xr-xtests/perf-server/deploy.sh11
-rw-r--r--tests/perf-server/perf-server.service16
-rw-r--r--tests/perf-server/src/main.rs90
-rw-r--r--tests/rp/Cargo.toml10
-rw-r--r--tests/rp/src/bin/cyw43-perf.rs267
-rw-r--r--tests/rp/src/bin/float.rs10
-rw-r--r--tests/stm32/Cargo.toml7
-rw-r--r--tests/stm32/src/bin/rtc.rs6
-rw-r--r--tests/stm32/src/bin/tl_mbox.rs71
10 files changed, 455 insertions, 41 deletions
diff --git a/tests/perf-server/Cargo.toml b/tests/perf-server/Cargo.toml
new file mode 100644
index 000000000..532039050
--- /dev/null
+++ b/tests/perf-server/Cargo.toml
@@ -0,0 +1,8 @@
1[package]
2name = "perf-server"
3version = "0.1.0"
4edition = "2021"
5
6[dependencies]
7log = "0.4.17"
8pretty_env_logger = "0.4.0"
diff --git a/tests/perf-server/deploy.sh b/tests/perf-server/deploy.sh
new file mode 100755
index 000000000..032e99c30
--- /dev/null
+++ b/tests/perf-server/deploy.sh
@@ -0,0 +1,11 @@
1#!/bin/bash
2
3set -euxo pipefail
4
5[email protected]
6
7cargo build --release
8ssh $HOST -- systemctl stop perf-server
9scp target/release/perf-server $HOST:/root
10scp perf-server.service $HOST:/etc/systemd/system/
11ssh $HOST -- 'systemctl daemon-reload; systemctl restart perf-server' \ No newline at end of file
diff --git a/tests/perf-server/perf-server.service b/tests/perf-server/perf-server.service
new file mode 100644
index 000000000..c14c5d16f
--- /dev/null
+++ b/tests/perf-server/perf-server.service
@@ -0,0 +1,16 @@
1[Unit]
2Description=perf-server
3After=network.target
4StartLimitIntervalSec=0
5
6[Service]
7Type=simple
8Restart=always
9RestartSec=1
10User=root
11ExecStart=/root/perf-server
12Environment=RUST_BACKTRACE=1
13Environment=RUST_LOG=info
14
15[Install]
16WantedBy=multi-user.target
diff --git a/tests/perf-server/src/main.rs b/tests/perf-server/src/main.rs
new file mode 100644
index 000000000..f6e7efc59
--- /dev/null
+++ b/tests/perf-server/src/main.rs
@@ -0,0 +1,90 @@
1use std::io::{Read, Write};
2use std::net::{TcpListener, TcpStream};
3use std::thread::spawn;
4use std::time::Duration;
5
6use log::info;
7
8fn main() {
9 pretty_env_logger::init();
10 spawn(|| rx_listen());
11 spawn(|| rxtx_listen());
12 tx_listen();
13}
14
15fn tx_listen() {
16 info!("tx: listening on 0.0.0.0:4321");
17 let listener = TcpListener::bind("0.0.0.0:4321").unwrap();
18 loop {
19 let (socket, addr) = listener.accept().unwrap();
20 info!("tx: received connection from: {}", addr);
21 spawn(|| tx_conn(socket));
22 }
23}
24
25fn tx_conn(mut socket: TcpStream) {
26 socket.set_read_timeout(Some(Duration::from_secs(30))).unwrap();
27 socket.set_write_timeout(Some(Duration::from_secs(30))).unwrap();
28
29 let buf = [0; 1024];
30 loop {
31 if let Err(e) = socket.write_all(&buf) {
32 info!("tx: failed to write to socket; err = {:?}", e);
33 return;
34 }
35 }
36}
37
38fn rx_listen() {
39 info!("rx: listening on 0.0.0.0:4322");
40 let listener = TcpListener::bind("0.0.0.0:4322").unwrap();
41 loop {
42 let (socket, addr) = listener.accept().unwrap();
43 info!("rx: received connection from: {}", addr);
44 spawn(|| rx_conn(socket));
45 }
46}
47
48fn rx_conn(mut socket: TcpStream) {
49 socket.set_read_timeout(Some(Duration::from_secs(30))).unwrap();
50 socket.set_write_timeout(Some(Duration::from_secs(30))).unwrap();
51
52 let mut buf = [0; 1024];
53 loop {
54 if let Err(e) = socket.read_exact(&mut buf) {
55 info!("rx: failed to read from socket; err = {:?}", e);
56 return;
57 }
58 }
59}
60
61fn rxtx_listen() {
62 info!("rxtx: listening on 0.0.0.0:4323");
63 let listener = TcpListener::bind("0.0.0.0:4323").unwrap();
64 loop {
65 let (socket, addr) = listener.accept().unwrap();
66 info!("rxtx: received connection from: {}", addr);
67 spawn(|| rxtx_conn(socket));
68 }
69}
70
71fn rxtx_conn(mut socket: TcpStream) {
72 socket.set_read_timeout(Some(Duration::from_secs(30))).unwrap();
73 socket.set_write_timeout(Some(Duration::from_secs(30))).unwrap();
74
75 let mut buf = [0; 1024];
76 loop {
77 match socket.read(&mut buf) {
78 Ok(n) => {
79 if let Err(e) = socket.write_all(&buf[..n]) {
80 info!("rxtx: failed to write to socket; err = {:?}", e);
81 return;
82 }
83 }
84 Err(e) => {
85 info!("rxtx: failed to read from socket; err = {:?}", e);
86 return;
87 }
88 }
89 }
90}
diff --git a/tests/rp/Cargo.toml b/tests/rp/Cargo.toml
index 1786baee3..180d0ebbe 100644
--- a/tests/rp/Cargo.toml
+++ b/tests/rp/Cargo.toml
@@ -5,13 +5,16 @@ version = "0.1.0"
5license = "MIT OR Apache-2.0" 5license = "MIT OR Apache-2.0"
6 6
7[dependencies] 7[dependencies]
8teleprobe-meta = "1" 8teleprobe-meta = "1.1"
9 9
10embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } 10embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] }
11embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } 11embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] }
12embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt"] } 12embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt"] }
13embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["nightly", "defmt", "unstable-pac", "unstable-traits", "time-driver", "critical-section-impl", "intrinsics", "rom-v2-intrinsics"] } 13embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["nightly", "defmt", "unstable-pac", "unstable-traits", "time-driver", "critical-section-impl", "intrinsics", "rom-v2-intrinsics", "run-from-ram"] }
14embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } 14embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
15embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "udp", "dhcpv4", "medium-ethernet"] }
16cyw43 = { path = "../../cyw43", features = ["defmt", "firmware-logs"] }
17cyw43-pio = { path = "../../cyw43-pio", features = ["defmt", "overclock"] }
15 18
16defmt = "0.3.0" 19defmt = "0.3.0"
17defmt-rtt = "0.4" 20defmt-rtt = "0.4"
@@ -25,6 +28,7 @@ panic-probe = { version = "0.3.0", features = ["print-defmt"] }
25futures = { version = "0.3.17", default-features = false, features = ["async-await"] } 28futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
26embedded-io = { version = "0.4.0", features = ["async"] } 29embedded-io = { version = "0.4.0", features = ["async"] }
27embedded-storage = { version = "0.3" } 30embedded-storage = { version = "0.3" }
31static_cell = { version = "1.1", features = ["nightly"]}
28 32
29[profile.dev] 33[profile.dev]
30debug = 2 34debug = 2
diff --git a/tests/rp/src/bin/cyw43-perf.rs b/tests/rp/src/bin/cyw43-perf.rs
new file mode 100644
index 000000000..7a94ea191
--- /dev/null
+++ b/tests/rp/src/bin/cyw43-perf.rs
@@ -0,0 +1,267 @@
1#![no_std]
2#![no_main]
3#![feature(type_alias_impl_trait)]
4#[path = "../common.rs"]
5mod common;
6
7use cyw43_pio::PioSpi;
8use defmt::{assert, panic, *};
9use embassy_executor::Spawner;
10use embassy_futures::join::join;
11use embassy_net::tcp::TcpSocket;
12use embassy_net::{Config, Ipv4Address, Stack, StackResources};
13use embassy_rp::gpio::{Level, Output};
14use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0};
15use embassy_rp::pio::Pio;
16use embassy_rp::rom_data;
17use embassy_time::{with_timeout, Duration, Timer};
18use static_cell::make_static;
19use {defmt_rtt as _, panic_probe as _};
20
21teleprobe_meta::timeout!(120);
22
23#[embassy_executor::task]
24async fn wifi_task(
25 runner: cyw43::Runner<'static, Output<'static, PIN_23>, PioSpi<'static, PIN_25, PIO0, 0, DMA_CH0>>,
26) -> ! {
27 runner.run().await
28}
29
30#[embassy_executor::task]
31async fn net_task(stack: &'static Stack<cyw43::NetDriver<'static>>) -> ! {
32 stack.run().await
33}
34
35#[embassy_executor::main]
36async fn main(spawner: Spawner) {
37 info!("Hello World!");
38 let p = embassy_rp::init(Default::default());
39
40 // needed for reading the firmware from flash via XIP.
41 unsafe {
42 rom_data::flash_exit_xip();
43 rom_data::flash_enter_cmd_xip();
44 }
45
46 // cyw43 firmware needs to be flashed manually:
47 // probe-rs-cli download 43439A0.bin --format bin --chip RP2040 --base-address 0x101c0000
48 // probe-rs-cli download 43439A0_clm.bin --format bin --chip RP2040 --base-address 0x101f8000
49 let fw = unsafe { core::slice::from_raw_parts(0x101c0000 as *const u8, 224190) };
50 let clm = unsafe { core::slice::from_raw_parts(0x101f8000 as *const u8, 4752) };
51
52 let pwr = Output::new(p.PIN_23, Level::Low);
53 let cs = Output::new(p.PIN_25, Level::High);
54 let mut pio = Pio::new(p.PIO0);
55 let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p.PIN_24, p.PIN_29, p.DMA_CH0);
56
57 let state = make_static!(cyw43::State::new());
58 let (net_device, mut control, runner) = cyw43::new(state, pwr, spi, fw).await;
59 unwrap!(spawner.spawn(wifi_task(runner)));
60
61 control.init(clm).await;
62 control
63 .set_power_management(cyw43::PowerManagementMode::PowerSave)
64 .await;
65
66 let config = Config::dhcpv4(Default::default());
67 //let config = embassy_net::Config::Static(embassy_net::Config {
68 // address: Ipv4Cidr::new(Ipv4Address::new(192, 168, 69, 2), 24),
69 // dns_servers: Vec::new(),
70 // gateway: Some(Ipv4Address::new(192, 168, 69, 1)),
71 //});
72
73 // Generate random seed
74 let seed = 0x0123_4567_89ab_cdef; // chosen by fair dice roll. guarenteed to be random.
75
76 // Init network stack
77 let stack = &*make_static!(Stack::new(
78 net_device,
79 config,
80 make_static!(StackResources::<2>::new()),
81 seed
82 ));
83
84 unwrap!(spawner.spawn(net_task(stack)));
85
86 loop {
87 match control.join_wpa2(WIFI_NETWORK, WIFI_PASSWORD).await {
88 Ok(_) => break,
89 Err(err) => {
90 panic!("join failed with status={}", err.status);
91 }
92 }
93 }
94
95 info!("Waiting for DHCP up...");
96 while stack.config_v4().is_none() {
97 Timer::after(Duration::from_millis(100)).await;
98 }
99 info!("IP addressing up!");
100
101 let down = test_download(stack).await;
102 let up = test_upload(stack).await;
103 let updown = test_upload_download(stack).await;
104
105 assert!(down > TEST_EXPECTED_DOWNLOAD_KBPS);
106 assert!(up > TEST_EXPECTED_UPLOAD_KBPS);
107 assert!(updown > TEST_EXPECTED_UPLOAD_DOWNLOAD_KBPS);
108
109 info!("Test OK");
110 cortex_m::asm::bkpt();
111}
112
113// Test-only wifi network, no internet access!
114const WIFI_NETWORK: &str = "EmbassyTest";
115const WIFI_PASSWORD: &str = "V8YxhKt5CdIAJFud";
116
117const TEST_DURATION: usize = 10;
118const TEST_EXPECTED_DOWNLOAD_KBPS: usize = 300;
119const TEST_EXPECTED_UPLOAD_KBPS: usize = 300;
120const TEST_EXPECTED_UPLOAD_DOWNLOAD_KBPS: usize = 300;
121const RX_BUFFER_SIZE: usize = 4096;
122const TX_BUFFER_SIZE: usize = 4096;
123const SERVER_ADDRESS: Ipv4Address = Ipv4Address::new(192, 168, 2, 2);
124const DOWNLOAD_PORT: u16 = 4321;
125const UPLOAD_PORT: u16 = 4322;
126const UPLOAD_DOWNLOAD_PORT: u16 = 4323;
127
128async fn test_download(stack: &'static Stack<cyw43::NetDriver<'static>>) -> usize {
129 info!("Testing download...");
130
131 let mut rx_buffer = [0; RX_BUFFER_SIZE];
132 let mut tx_buffer = [0; TX_BUFFER_SIZE];
133 let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer);
134 socket.set_timeout(Some(Duration::from_secs(10)));
135
136 info!("connecting to {:?}:{}...", SERVER_ADDRESS, DOWNLOAD_PORT);
137 if let Err(e) = socket.connect((SERVER_ADDRESS, DOWNLOAD_PORT)).await {
138 error!("connect error: {:?}", e);
139 return 0;
140 }
141 info!("connected, testing...");
142
143 let mut rx_buf = [0; 4096];
144 let mut total: usize = 0;
145 with_timeout(Duration::from_secs(TEST_DURATION as _), async {
146 loop {
147 match socket.read(&mut rx_buf).await {
148 Ok(0) => {
149 error!("read EOF");
150 return 0;
151 }
152 Ok(n) => total += n,
153 Err(e) => {
154 error!("read error: {:?}", e);
155 return 0;
156 }
157 }
158 }
159 })
160 .await
161 .ok();
162
163 let kbps = (total + 512) / 1024 / TEST_DURATION;
164 info!("download: {} kB/s", kbps);
165 kbps
166}
167
168async fn test_upload(stack: &'static Stack<cyw43::NetDriver<'static>>) -> usize {
169 info!("Testing upload...");
170
171 let mut rx_buffer = [0; RX_BUFFER_SIZE];
172 let mut tx_buffer = [0; TX_BUFFER_SIZE];
173 let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer);
174 socket.set_timeout(Some(Duration::from_secs(10)));
175
176 info!("connecting to {:?}:{}...", SERVER_ADDRESS, UPLOAD_PORT);
177 if let Err(e) = socket.connect((SERVER_ADDRESS, UPLOAD_PORT)).await {
178 error!("connect error: {:?}", e);
179 return 0;
180 }
181 info!("connected, testing...");
182
183 let buf = [0; 4096];
184 let mut total: usize = 0;
185 with_timeout(Duration::from_secs(TEST_DURATION as _), async {
186 loop {
187 match socket.write(&buf).await {
188 Ok(0) => {
189 error!("write zero?!??!?!");
190 return 0;
191 }
192 Ok(n) => total += n,
193 Err(e) => {
194 error!("write error: {:?}", e);
195 return 0;
196 }
197 }
198 }
199 })
200 .await
201 .ok();
202
203 let kbps = (total + 512) / 1024 / TEST_DURATION;
204 info!("upload: {} kB/s", kbps);
205 kbps
206}
207
208async fn test_upload_download(stack: &'static Stack<cyw43::NetDriver<'static>>) -> usize {
209 info!("Testing upload+download...");
210
211 let mut rx_buffer = [0; RX_BUFFER_SIZE];
212 let mut tx_buffer = [0; TX_BUFFER_SIZE];
213 let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer);
214 socket.set_timeout(Some(Duration::from_secs(10)));
215
216 info!("connecting to {:?}:{}...", SERVER_ADDRESS, UPLOAD_DOWNLOAD_PORT);
217 if let Err(e) = socket.connect((SERVER_ADDRESS, UPLOAD_DOWNLOAD_PORT)).await {
218 error!("connect error: {:?}", e);
219 return 0;
220 }
221 info!("connected, testing...");
222
223 let (mut reader, mut writer) = socket.split();
224
225 let tx_buf = [0; 4096];
226 let mut rx_buf = [0; 4096];
227 let mut total: usize = 0;
228 let tx_fut = async {
229 loop {
230 match writer.write(&tx_buf).await {
231 Ok(0) => {
232 error!("write zero?!??!?!");
233 return 0;
234 }
235 Ok(_) => {}
236 Err(e) => {
237 error!("write error: {:?}", e);
238 return 0;
239 }
240 }
241 }
242 };
243
244 let rx_fut = async {
245 loop {
246 match reader.read(&mut rx_buf).await {
247 Ok(0) => {
248 error!("read EOF");
249 return 0;
250 }
251 Ok(n) => total += n,
252 Err(e) => {
253 error!("read error: {:?}", e);
254 return 0;
255 }
256 }
257 }
258 };
259
260 with_timeout(Duration::from_secs(TEST_DURATION as _), join(tx_fut, rx_fut))
261 .await
262 .ok();
263
264 let kbps = (total + 512) / 1024 / TEST_DURATION;
265 info!("upload+download: {} kB/s", kbps);
266 kbps
267}
diff --git a/tests/rp/src/bin/float.rs b/tests/rp/src/bin/float.rs
index 6a982507a..0e0de85fa 100644
--- a/tests/rp/src/bin/float.rs
+++ b/tests/rp/src/bin/float.rs
@@ -18,11 +18,9 @@ async fn main(_spawner: Spawner) {
18 const PI_F: f32 = 3.1415926535f32; 18 const PI_F: f32 = 3.1415926535f32;
19 const PI_D: f64 = 3.14159265358979323846f64; 19 const PI_D: f64 = 3.14159265358979323846f64;
20 20
21 unsafe { 21 pac::BUSCTRL
22 pac::BUSCTRL 22 .perfsel(0)
23 .perfsel(0) 23 .write(|r| r.set_perfsel(pac::busctrl::vals::Perfsel::ROM));
24 .write(|r| r.set_perfsel(pac::busctrl::vals::Perfsel::ROM));
25 }
26 24
27 for i in 0..=360 { 25 for i in 0..=360 {
28 let rad_f = (i as f32) * PI_F / 180.0; 26 let rad_f = (i as f32) * PI_F / 180.0;
@@ -46,7 +44,7 @@ async fn main(_spawner: Spawner) {
46 Timer::after(Duration::from_millis(10)).await; 44 Timer::after(Duration::from_millis(10)).await;
47 } 45 }
48 46
49 let rom_accesses = unsafe { pac::BUSCTRL.perfctr(0).read().perfctr() }; 47 let rom_accesses = pac::BUSCTRL.perfctr(0).read().perfctr();
50 // every float operation used here uses at least 10 cycles 48 // every float operation used here uses at least 10 cycles
51 defmt::assert!(rom_accesses >= 360 * 12 * 10); 49 defmt::assert!(rom_accesses >= 360 * 12 * 10);
52 50
diff --git a/tests/stm32/Cargo.toml b/tests/stm32/Cargo.toml
index 0f96c4ca3..365f631b7 100644
--- a/tests/stm32/Cargo.toml
+++ b/tests/stm32/Cargo.toml
@@ -12,24 +12,25 @@ stm32g071rb = ["embassy-stm32/stm32g071rb", "not-gpdma"] # Nucleo
12stm32c031c6 = ["embassy-stm32/stm32c031c6", "not-gpdma"] # Nucleo 12stm32c031c6 = ["embassy-stm32/stm32c031c6", "not-gpdma"] # Nucleo
13stm32g491re = ["embassy-stm32/stm32g491re", "not-gpdma"] # Nucleo 13stm32g491re = ["embassy-stm32/stm32g491re", "not-gpdma"] # Nucleo
14stm32h755zi = ["embassy-stm32/stm32h755zi-cm7", "not-gpdma"] # Nucleo 14stm32h755zi = ["embassy-stm32/stm32h755zi-cm7", "not-gpdma"] # Nucleo
15stm32wb55rg = ["embassy-stm32/stm32wb55rg", "not-gpdma", "ble"] # Nucleo 15stm32wb55rg = ["embassy-stm32/stm32wb55rg", "not-gpdma", "ble" ] # Nucleo
16stm32h563zi = ["embassy-stm32/stm32h563zi"] # Nucleo 16stm32h563zi = ["embassy-stm32/stm32h563zi"] # Nucleo
17stm32u585ai = ["embassy-stm32/stm32u585ai"] # IoT board 17stm32u585ai = ["embassy-stm32/stm32u585ai"] # IoT board
18 18
19sdmmc = [] 19sdmmc = []
20chrono = ["embassy-stm32/chrono", "dep:chrono"] 20chrono = ["embassy-stm32/chrono", "dep:chrono"]
21ble = []
22can = [] 21can = []
22ble = ["dep:embassy-stm32-wpan"]
23not-gpdma = [] 23not-gpdma = []
24 24
25[dependencies] 25[dependencies]
26teleprobe-meta = "1" 26teleprobe-meta = "1"
27 27
28embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } 28embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] }
29embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } 29embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] }
30embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "tick-hz-32_768", "defmt-timestamp-uptime"] } 30embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "tick-hz-32_768", "defmt-timestamp-uptime"] }
31embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "memory-x", "time-driver-any"] } 31embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "memory-x", "time-driver-any"] }
32embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } 32embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
33embassy-stm32-wpan = { version = "0.1.0", path = "../../embassy-stm32-wpan", optional = true, features = ["defmt", "stm32wb55rg"] }
33 34
34defmt = "0.3.0" 35defmt = "0.3.0"
35defmt-rtt = "0.4" 36defmt-rtt = "0.4"
diff --git a/tests/stm32/src/bin/rtc.rs b/tests/stm32/src/bin/rtc.rs
index 32d35c42c..582df5753 100644
--- a/tests/stm32/src/bin/rtc.rs
+++ b/tests/stm32/src/bin/rtc.rs
@@ -24,10 +24,8 @@ async fn main(_spawner: Spawner) {
24 24
25 info!("Starting LSI"); 25 info!("Starting LSI");
26 26
27 unsafe { 27 pac::RCC.csr().modify(|w| w.set_lsion(true));
28 pac::RCC.csr().modify(|w| w.set_lsion(true)); 28 while !pac::RCC.csr().read().lsirdy() {}
29 while !pac::RCC.csr().read().lsirdy() {}
30 }
31 29
32 info!("Started LSI"); 30 info!("Started LSI");
33 31
diff --git a/tests/stm32/src/bin/tl_mbox.rs b/tests/stm32/src/bin/tl_mbox.rs
index fab9f0e1b..f6641ae31 100644
--- a/tests/stm32/src/bin/tl_mbox.rs
+++ b/tests/stm32/src/bin/tl_mbox.rs
@@ -6,49 +6,70 @@
6#[path = "../common.rs"] 6#[path = "../common.rs"]
7mod common; 7mod common;
8 8
9use core::mem;
10
9use common::*; 11use common::*;
10use embassy_executor::Spawner; 12use embassy_executor::Spawner;
11use embassy_stm32::tl_mbox::{Config, TlMbox}; 13use embassy_futures::poll_once;
12use embassy_stm32::{bind_interrupts, tl_mbox}; 14use embassy_stm32::bind_interrupts;
15use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler};
16use embassy_stm32_wpan::{mm, TlMbox};
13use embassy_time::{Duration, Timer}; 17use embassy_time::{Duration, Timer};
14 18
15bind_interrupts!(struct Irqs{ 19bind_interrupts!(struct Irqs{
16 IPCC_C1_RX => tl_mbox::ReceiveInterruptHandler; 20 IPCC_C1_RX => ReceiveInterruptHandler;
17 IPCC_C1_TX => tl_mbox::TransmitInterruptHandler; 21 IPCC_C1_TX => TransmitInterruptHandler;
18}); 22});
19 23
24#[embassy_executor::task]
25async fn run_mm_queue(memory_manager: mm::MemoryManager) {
26 memory_manager.run_queue().await;
27}
28
20#[embassy_executor::main] 29#[embassy_executor::main]
21async fn main(_spawner: Spawner) { 30async fn main(spawner: Spawner) {
22 let p = embassy_stm32::init(config()); 31 let p = embassy_stm32::init(config());
23 info!("Hello World!"); 32 info!("Hello World!");
24 33
25 let config = Config::default(); 34 let config = Config::default();
26 let mbox = TlMbox::new(p.IPCC, Irqs, config); 35 let mbox = TlMbox::init(p.IPCC, Irqs, config);
36
37 spawner.spawn(run_mm_queue(mbox.mm_subsystem)).unwrap();
38
39 let ready_event = mbox.sys_subsystem.read().await;
40 let _ = poll_once(mbox.sys_subsystem.read()); // clear rx not
41
42 info!("coprocessor ready {}", ready_event.payload());
43
44 // test memory manager
45 mem::drop(ready_event);
46
47 let fw_info = mbox.sys_subsystem.wireless_fw_info().unwrap();
48 let version_major = fw_info.version_major();
49 let version_minor = fw_info.version_minor();
50 let subversion = fw_info.subversion();
51
52 let sram2a_size = fw_info.sram2a_size();
53 let sram2b_size = fw_info.sram2b_size();
54
55 info!(
56 "version {}.{}.{} - SRAM2a {} - SRAM2b {}",
57 version_major, version_minor, subversion, sram2a_size, sram2b_size
58 );
27 59
28 loop { 60 Timer::after(Duration::from_millis(50)).await;
29 let wireless_fw_info = mbox.wireless_fw_info();
30 match wireless_fw_info {
31 None => {}
32 Some(fw_info) => {
33 let version_major = fw_info.version_major();
34 let version_minor = fw_info.version_minor();
35 let subversion = fw_info.subversion();
36 61
37 let sram2a_size = fw_info.sram2a_size(); 62 mbox.sys_subsystem.shci_c2_ble_init(Default::default()).await;
38 let sram2b_size = fw_info.sram2b_size();
39 63
40 info!( 64 info!("starting ble...");
41 "version {}.{}.{} - SRAM2a {} - SRAM2b {}", 65 mbox.ble_subsystem.write(0x0c, &[]).await;
42 version_major, version_minor, subversion, sram2a_size, sram2b_size
43 );
44 66
45 break; 67 info!("waiting for ble...");
46 } 68 let ble_event = mbox.ble_subsystem.read().await;
47 }
48 69
49 Timer::after(Duration::from_millis(50)).await; 70 info!("ble event: {}", ble_event.payload());
50 }
51 71
72 Timer::after(Duration::from_millis(150)).await;
52 info!("Test OK"); 73 info!("Test OK");
53 cortex_m::asm::bkpt(); 74 cortex_m::asm::bkpt();
54} 75}