From 636c984e3083faebb35f5be13e67de2a036e1e11 Mon Sep 17 00:00:00 2001
From: Stephen D <webmaster@scd31.com>
Date: Sun, 10 Sep 2023 10:48:25 -0300
Subject: [PATCH] interrupt -> polling
---
Cargo.lock | 2 +-
src/main.rs | 23 ++++++++---------------
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index f9b715a..45ce266 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -324,7 +324,7 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
[[package]]
name = "rf4463"
version = "0.1.0"
-source = "git+https://gitlab.scd31.com/stephen/rf4463-lib#a96d7e33a7bc6c9eb5d1cc2d0c47fd5c5776c366"
+source = "git+https://gitlab.scd31.com/stephen/rf4463-lib#e82e919b8c84127428391389dbfdbb0b5b81ed58"
dependencies = [
"embedded-hal 0.2.7",
]
diff --git a/src/main.rs b/src/main.rs
index 48a68a5..fead680 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,7 +33,7 @@ mod app {
// in bytes
// explicitly make this smaller than a packet so that we don't buffer things in the tx DMA for a while
- const PI_RX_BUFFER_LEN: usize = 256;
+ const PI_RX_BUFFER_LEN: usize = 2048;
// in bytes
const PI_TX_BUFFER_LEN: usize = spi_data::LEN;
@@ -216,11 +216,6 @@ mod app {
// start our radio temp loop
get_radio_temp::spawn_after(1u64.secs()).unwrap();
- // start our radio interrupt loop
- // TODO I kind of hate this. We need this because sometimes we miss the real interrupt
- // I don't know why
- run_radio_interrupt::spawn_after(500u64.micros()).unwrap();
-
(
Shared {
radio,
@@ -256,7 +251,7 @@ mod app {
// wait for radio to be idle again
loop {
- if ctx.shared.radio.lock(|r| r.is_idle()) {
+ if ctx.shared.radio.lock(|r| tick(r)) {
break;
}
}
@@ -267,7 +262,7 @@ mod app {
// wait for radio to be idle again
loop {
- if ctx.shared.radio.lock(|r| r.is_idle()) {
+ if ctx.shared.radio.lock(|r| tick(r)) {
break;
}
}
@@ -310,13 +305,6 @@ mod app {
get_radio_temp::spawn_after(1u64.secs()).unwrap();
}
- #[task(priority = 1, shared = [radio])]
- fn run_radio_interrupt(mut ctx: run_radio_interrupt::Context) {
- ctx.shared.radio.lock(|r| r.interrupt().unwrap());
-
- run_radio_interrupt::spawn_after(500u64.micros()).unwrap();
- }
-
#[task(binds = DMA1_STREAM3, priority = 2, local = [state, pi_rx, other_rx_buf], shared = [tx_buf, pi_tx, other_tx_buf, spi_data])]
fn pi_spi_recv(mut ctx: pi_spi_recv::Context) {
let rx = ctx.local.pi_rx;
@@ -433,4 +421,9 @@ mod app {
t.replace(tx);
});
}
+
+ fn tick(r: &mut Radio) -> bool {
+ r.interrupt().unwrap();
+ r.is_idle()
+ }
}
--
GitLab