Set gain at runtime

This commit is contained in:
Quentin Smith 2022-08-20 17:08:29 -04:00
parent a46f33b214
commit 530f192acc
3 changed files with 41 additions and 10 deletions

View File

@ -88,6 +88,8 @@ impl<'d> Pdm<'d> {
w w
}); });
Self::_set_gain(r, gain_left, gain_right);
r.psel.din.write(|w| unsafe { w.bits(data.psel_bits()) }); r.psel.din.write(|w| unsafe { w.bits(data.psel_bits()) });
r.psel.clk.write(|w| unsafe { w.bits(clock.psel_bits()) }); r.psel.clk.write(|w| unsafe { w.bits(clock.psel_bits()) });
@ -115,6 +117,18 @@ impl<'d> Pdm<'d> {
} }
} }
fn _set_gain(r: &pdm::RegisterBlock, gain_left: I7F1, gain_right: I7F1) {
let gain_left = gain_left.saturating_add(I7F1::from_bits(40)).saturating_to_num::<u8>().clamp(0, 0x50);
let gain_right = gain_right.saturating_add(I7F1::from_bits(40)).saturating_to_num::<u8>().clamp(0, 0x50);
r.gainl.write(|w| unsafe { w.gainl().bits(gain_left) });
r.gainr.write(|w| unsafe { w.gainr().bits(gain_right) });
}
pub fn set_gain(&mut self, gain_left: I7F1, gain_right: I7F1) {
Self::_set_gain(Self::regs(), gain_left, gain_right)
}
fn regs() -> &'static pdm::RegisterBlock { fn regs() -> &'static pdm::RegisterBlock {
unsafe { &*PDM::ptr() } unsafe { &*PDM::ptr() }
} }
@ -154,6 +168,13 @@ impl<'d> Pdm<'d> {
} }
} }
impl<'d> Drop for Pdm<'d> {
fn drop(&mut self) {
let r = Self::regs();
r.enable.write(|w| w.enable().disabled());
}
}
#[derive(Clone, Copy, PartialEq)] #[derive(Clone, Copy, PartialEq)]
pub enum Edge { pub enum Edge {
FallingEdge, FallingEdge,

View File

@ -31,3 +31,4 @@ fixed = "1.10.0"
embedded-storage = "0.3.0" embedded-storage = "0.3.0"
usbd-hid = "0.5.2" usbd-hid = "0.5.2"
serde = { version = "1.0.136", default-features = false } serde = { version = "1.0.136", default-features = false }
num-integer = { version = "0.1.45", default-features = false }

View File

@ -8,6 +8,7 @@ use embassy_nrf::interrupt;
use embassy_nrf::pdm::{Config, Channels, Pdm}; use embassy_nrf::pdm::{Config, Channels, Pdm};
use embassy_time::{Duration, Timer}; use embassy_time::{Duration, Timer};
use fixed::types::I7F1; use fixed::types::I7F1;
use num_integer::Roots;
use {defmt_rtt as _, panic_probe as _}; use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main] #[embassy_executor::main]
@ -20,15 +21,23 @@ async fn main(_p: Spawner) {
let mut pdm = Pdm::new(p.PDM, interrupt::take!(PDM), &mut p.P0_00, &mut p.P0_01, config); let mut pdm = Pdm::new(p.PDM, interrupt::take!(PDM), &mut p.P0_00, &mut p.P0_01, config);
loop { loop {
for gain in [I7F1::from_num(-20), I7F1::from_num(0), I7F1::from_num(20)] {
pdm.set_gain(gain, gain);
info!("Gain = {} dB", defmt::Debug2Format(&gain));
for _ in 0..10 {
let mut buf = [0; 128]; let mut buf = [0; 128];
pdm.sample(&mut buf).await; pdm.sample(&mut buf).await;
info!( info!(
"{} samples, min {=i16}, max {=i16}, mean {=i16}", "{} samples, min {=i16}, max {=i16}, RMS {=i16}",
buf.len(), buf.len(),
buf.iter().min().unwrap(), buf.iter().min().unwrap(),
buf.iter().max().unwrap(), buf.iter().max().unwrap(),
(buf.iter().map(|v| i32::from(*v)).sum::<i32>() / buf.len() as i32) as i16, (
buf.iter().map(|v| i32::from(*v).pow(2)).fold(0i32, |a,b| a.saturating_add(b))
/ buf.len() as i32).sqrt() as i16,
); );
Timer::after(Duration::from_millis(100)).await; Timer::after(Duration::from_millis(100)).await;
} }
}
}
} }