max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use types to strengthen the buffer dimensioning

Browse Source
This commit is contained in:
huntc 2021-10-17 07:51:53 +11:00
parent 0c317a64f6
commit 785030df96
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
embassy-nrf/src/saadc.rs
View File

@ -249,25 +249,21 @@ impl<'d, const N: usize> Saadc<'d, N> {
/// should continue or stop.
pub async fn run_task_sampler<S, const N0: usize>(
&mut self,
bufs: &mut [[i16; N0]; 2],
bufs: &mut [[[i16; N]; N0]; 2],
sampler: S,
) where
S: FnMut(&[i16]) -> SamplerState,
S: FnMut(&[[i16; N]]) -> SamplerState,
{
assert!(
N0 % N == 0,
"The buffer size must be a multiple of the number of channels"
);
self.run_sampler(bufs, None, sampler).await;
}
async fn run_sampler<S, const N0: usize>(
&mut self,
bufs: &mut [[i16; N0]; 2],
bufs: &mut [[[i16; N]; N0]; 2],
sample_rate: Option<u16>,
mut sampler: S,
) where
S: FnMut(&[i16]) -> SamplerState,
S: FnMut(&[[i16; N]]) -> SamplerState,
{
let r = Self::regs();
@ -294,7 +290,7 @@ impl<'d, const N: usize> Saadc<'d, N> {
.write(|w| unsafe { w.ptr().bits(bufs[0].as_mut_ptr() as u32) });
r.result
.maxcnt
.write(|w| unsafe { w.maxcnt().bits(N0 as _) });
.write(|w| unsafe { w.maxcnt().bits((N0 * N) as _) });
// Reset and enable the events
r.events_end.reset();
@ -323,7 +319,7 @@ impl<'d, const N: usize> Saadc<'d, N> {
r.events_end.reset();
r.intenset.write(|w| w.end().set());
if sampler(&bufs[current_buffer][0..r.result.amount.read().bits() as usize])
if sampler(&bufs[current_buffer][0..r.result.amount.read().bits() as usize / N])
== SamplerState::Sampled
{
let next_buffer = 1 - current_buffer;
@ -358,7 +354,7 @@ impl<'d, const N: usize> Saadc<'d, N> {
}
impl<'d> Saadc<'d, 1> {
/// Continuous sampling on a single channel with double buffers. The sample
/// Continuous sampling on a single channel with double buffers. The sample
/// buffers generally should be a multiple of the number of channels configured.
///
/// The internal clock is to be used with a sample rate expressed as a divisor of
@ -371,11 +367,11 @@ impl<'d> Saadc<'d, 1> {
/// should continue or stop.
pub async fn run_timer_sampler<S, const N0: usize>(
&mut self,
bufs: &mut [[i16; N0]; 2],
bufs: &mut [[[i16; 1]; N0]; 2],
sample_rate: u16,
sampler: S,
) where
S: FnMut(&[i16]) -> SamplerState,
S: FnMut(&[[i16; 1]]) -> SamplerState,
{
self.run_sampler(bufs, Some(sample_rate), sampler).await;
}

10
examples/nrf/src/bin/saadc_continuous.rs
View File

@ -39,19 +39,17 @@ async fn main(_spawner: Spawner, mut p: Peripherals) {
timer.start();
let mut bufs = [[0; 3 * 50]; 2]; // Each buffer of the double buffer has to be large enough for all channels.
let mut bufs = [[[0; 3]; 50]; 2];
let mut c = 0;
let mut a: i32 = 0;
saadc
.run_task_sampler(&mut bufs, move |buf| {
for (i, b) in buf.iter().enumerate() {
if i % 3 == 0 {
a += *b as i32;
c += 1;
}
for b in buf {
a += b[0] as i32;
}
c += buf.len();
if c > 10000 {
a = a / c as i32;
info!("channel 1: {=i32}", a);