kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing lockin-external changes

This commit is contained in:
Ryan Summers 2021-02-17 17:22:43 +01:00
parent e8711d8f4f
commit 3c8cd58d6f
1 changed files with 22 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
src/bin/lockin-external.rs
View File

@ -4,84 +4,23 @@
use stm32h7xx_hal as hal;
use miniconf::{
embedded_nal::{IpAddr, Ipv4Addr},
minimq, MqttInterface, StringSet,
};
use serde::Deserialize;
use stabilizer::{hardware, hardware::design_parameters};
use dsp::{lockin::Lockin, rpll::RPLL, Accu};
use hardware::{
Adc0Input, Adc1Input, AfeGain, Dac0Output, Dac1Output, InputStamper, AFE0,
AFE1,
Adc0Input, Adc1Input, Dac0Output, Dac1Output, InputStamper, AFE0, AFE1,
};
#[derive(Debug, Clone, Copy, Deserialize, StringSet)]
pub struct DspData {
// frequency settling time (log2 counter cycles)
frequency_settling_time: u8,
// phase settling time
phase_settling_time: u8,
// Harmonic index of the LO: -1 to _de_modulate the fundamental (complex conjugate)
harmonic: i32,
// Demodulation LO phase offset
phase_offset: i32,
// Log2 lowpass time constant
time_constant: u8,
}
impl Default for DspData {
fn default() -> Self {
Self {
frequency_settling_time: 21,
phase_settling_time: 21,
harmonic: -1,
phase_offset: 0,
time_constant: 6,
}
}
}
#[derive(Debug, Deserialize, StringSet)]
pub struct Settings {
afe: [AfeGain; 2],
dsp: DspData,
}
impl Default for Settings {
fn default() -> Self {
Self {
afe: [AfeGain::G1, AfeGain::G1],
dsp: DspData::default(),
}
}
}
#[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
const APP: () = {
struct Resources {
afes: (AFE0, AFE1),
adcs: (Adc0Input, Adc1Input),
dacs: (Dac0Output, Dac1Output),
clock: hardware::CycleCounter,
mqtt_interface: MqttInterface<
Settings,
hardware::NetworkStack,
minimq::consts::U256,
>,
timestamper: InputStamper,
pll: RPLL,
lockin: Lockin,
parameters: DspData,
}
#[init]
@ -89,21 +28,6 @@ const APP: () = {
// Configure the microcontroller
let (mut stabilizer, _pounder) = hardware::setup(c.core, c.device);
let mqtt_interface = {
let mqtt_client = {
let broker = IpAddr::V4(Ipv4Addr::new(10, 34, 16, 1));
minimq::MqttClient::new(
broker,
"stabilizer",
stabilizer.net.stack,
)
.unwrap()
};
MqttInterface::new(mqtt_client, "stabilizer", Settings::default())
.unwrap()
};
let pll = RPLL::new(
design_parameters::ADC_SAMPLE_TICKS_LOG2
+ design_parameters::SAMPLE_BUFFER_SIZE_LOG2,
@ -125,15 +49,13 @@ const APP: () = {
stabilizer.timestamper.start();
init::LateResources {
mqtt_interface,
afes: stabilizer.afes,
adcs: stabilizer.adcs,
dacs: stabilizer.dacs,
timestamper: stabilizer.timestamper,
clock: stabilizer.cycle_counter,
pll,
lockin: Lockin::default(),
parameters: DspData::default(),
}
}
@ -144,7 +66,7 @@ const APP: () = {
/// This is an implementation of a externally (DI0) referenced PLL lockin on the ADC0 signal.
/// It outputs either I/Q or power/phase on DAC0/DAC1. Data is normalized to full scale.
/// PLL bandwidth, filter bandwidth, slope, and x/y or power/phase post-filters are available.
#[task(binds=DMA1_STR4, resources=[adcs, dacs, lockin, timestamper, pll, parameters], priority=2)]
#[task(binds=DMA1_STR4, resources=[adcs, dacs, lockin, timestamper, pll], priority=2)]
fn process(c: process::Context) {
let adc_samples = [
c.resources.adcs.0.acquire_buffer(),
@ -157,7 +79,6 @@ const APP: () = {
];
let lockin = c.resources.lockin;
let params = c.resources.parameters;
let timestamp = c
.resources
@ -167,27 +88,34 @@ const APP: () = {
.map(|t| t as i32);
let (pll_phase, pll_frequency) = c.resources.pll.update(
timestamp,
params.frequency_settling_time,
params.phase_settling_time,
21, // frequency settling time (log2 counter cycles), TODO: expose
21, // phase settling time, TODO: expose
);
// Harmonic index of the LO: -1 to _de_modulate the fundamental (complex conjugate)
let harmonic: i32 = -1; // TODO: expose
// Demodulation LO phase offset
let phase_offset: i32 = 0; // TODO: expose
// Log2 lowpass time constant
let time_constant: u8 = 6; // TODO: expose
let sample_frequency = ((pll_frequency
// half-up rounding bias
// .wrapping_add(1 << design_parameters::SAMPLE_BUFFER_SIZE_LOG2 - 1)
>> design_parameters::SAMPLE_BUFFER_SIZE_LOG2)
as i32)
// Harmonic index of the LO: -1 to _de_modulate the fundamental (complex conjugate)
.wrapping_mul(params.harmonic);
let sample_phase = params
.phase_offset
.wrapping_add(pll_phase.wrapping_mul(params.harmonic));
.wrapping_mul(harmonic);
let sample_phase =
phase_offset.wrapping_add(pll_phase.wrapping_mul(harmonic));
let output = adc_samples[0]
.iter()
.zip(Accu::new(sample_phase, sample_frequency))
// Convert to signed, MSB align the ADC sample.
.map(|(&sample, phase)| {
lockin.update(sample as i16, phase, params.time_constant)
lockin.update(sample as i16, phase, time_constant)
})
.last()
.unwrap();
@ -207,43 +135,14 @@ const APP: () = {
}
}
#[idle(resources=[mqtt_interface, clock], spawn=[settings_update])]
fn idle(mut c: idle::Context) -> ! {
let clock = c.resources.clock;
#[idle(resources=[afes])]
fn idle(_: idle::Context) -> ! {
loop {
let sleep = c.resources.mqtt_interface.lock(|interface| {
!interface.network_stack().poll(clock.current_ms())
});
match c
.resources
.mqtt_interface
.lock(|interface| interface.update().unwrap())
{
miniconf::Action::Continue => {
if sleep {
cortex_m::asm::wfi();
}
}
miniconf::Action::CommitSettings => {
c.spawn.settings_update().unwrap()
}
}
// TODO: Implement network interface.
cortex_m::asm::wfi();
}
}
#[task(priority = 1, resources=[mqtt_interface, afes, parameters])]
fn settings_update(mut c: settings_update::Context) {
let settings = &c.resources.mqtt_interface.settings;
// Update AFEs
c.resources.afes.0.set_gain(settings.afe[0]);
c.resources.afes.1.set_gain(settings.afe[1]);
// Update DSP parameters.
c.resources.parameters.lock(|params| *params = settings.dsp);
}
#[task(binds = ETH, priority = 1)]
fn eth(_: eth::Context) {
unsafe { hal::ethernet::interrupt_handler() }