lockin-external: simplify
This commit is contained in:
parent
47d8a74524
commit
deed11f110
|
|
@ -4,28 +4,13 @@
|
||||||
|
|
||||||
use stm32h7xx_hal as hal;
|
use stm32h7xx_hal as hal;
|
||||||
|
|
||||||
#[macro_use]
|
use stabilizer::{hardware, hardware::design_parameters};
|
||||||
extern crate log;
|
|
||||||
|
|
||||||
use rtic::cyccnt::{Instant, U32Ext};
|
use dsp::{iir_int, lockin::Lockin, rpll::RPLL, Accu};
|
||||||
|
|
||||||
use heapless::{consts::*, String};
|
|
||||||
|
|
||||||
use stabilizer::{hardware, hardware::design_parameters, server};
|
|
||||||
|
|
||||||
use dsp::{iir, iir_int, lockin::Lockin, rpll::RPLL, Accu};
|
|
||||||
use hardware::{
|
use hardware::{
|
||||||
Adc0Input, Adc1Input, Dac0Output, Dac1Output, InputStamper, AFE0, AFE1,
|
Adc0Input, Adc1Input, Dac0Output, Dac1Output, InputStamper, AFE0, AFE1,
|
||||||
};
|
};
|
||||||
|
|
||||||
const SCALE: f32 = i16::MAX as _;
|
|
||||||
|
|
||||||
const TCP_RX_BUFFER_SIZE: usize = 8192;
|
|
||||||
const TCP_TX_BUFFER_SIZE: usize = 8192;
|
|
||||||
|
|
||||||
// The number of cascaded IIR biquads per channel. Select 1 or 2!
|
|
||||||
const IIR_CASCADE_LENGTH: usize = 1;
|
|
||||||
|
|
||||||
#[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
|
#[rtic::app(device = stm32h7xx_hal::stm32, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
|
||||||
const APP: () = {
|
const APP: () = {
|
||||||
struct Resources {
|
struct Resources {
|
||||||
|
|
@ -34,12 +19,6 @@ const APP: () = {
|
||||||
dacs: (Dac0Output, Dac1Output),
|
dacs: (Dac0Output, Dac1Output),
|
||||||
net_interface: hardware::Ethernet,
|
net_interface: hardware::Ethernet,
|
||||||
|
|
||||||
// Format: iir_state[ch][cascade-no][coeff]
|
|
||||||
#[init([[iir::Vec5([0.; 5]); IIR_CASCADE_LENGTH]; 2])]
|
|
||||||
iir_state: [[iir::Vec5; IIR_CASCADE_LENGTH]; 2],
|
|
||||||
#[init([[iir::IIR::new(1./(1 << 16) as f32, -SCALE, SCALE); IIR_CASCADE_LENGTH]; 2])]
|
|
||||||
iir_ch: [[iir::IIR; IIR_CASCADE_LENGTH]; 2],
|
|
||||||
|
|
||||||
timestamper: InputStamper,
|
timestamper: InputStamper,
|
||||||
pll: RPLL,
|
pll: RPLL,
|
||||||
lockin: Lockin,
|
lockin: Lockin,
|
||||||
|
|
@ -93,7 +72,7 @@ const APP: () = {
|
||||||
/// This is an implementation of a externally (DI0) referenced PLL lockin on the ADC0 signal.
|
/// 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.
|
/// 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.
|
/// PLL bandwidth, filter bandwidth, slope, and x/y or power/phase post-filters are available.
|
||||||
#[task(binds=DMA1_STR4, resources=[adcs, dacs, iir_state, iir_ch, lockin, timestamper, pll], priority=2)]
|
#[task(binds=DMA1_STR4, resources=[adcs, dacs, lockin, timestamper, pll], priority=2)]
|
||||||
fn process(c: process::Context) {
|
fn process(c: process::Context) {
|
||||||
let adc_samples = [
|
let adc_samples = [
|
||||||
c.resources.adcs.0.acquire_buffer(),
|
c.resources.adcs.0.acquire_buffer(),
|
||||||
|
|
@ -105,8 +84,6 @@ const APP: () = {
|
||||||
c.resources.dacs.1.acquire_buffer(),
|
c.resources.dacs.1.acquire_buffer(),
|
||||||
];
|
];
|
||||||
|
|
||||||
let iir_ch = c.resources.iir_ch;
|
|
||||||
let iir_state = c.resources.iir_state;
|
|
||||||
let lockin = c.resources.lockin;
|
let lockin = c.resources.lockin;
|
||||||
|
|
||||||
let timestamp = c
|
let timestamp = c
|
||||||
|
|
@ -117,8 +94,8 @@ const APP: () = {
|
||||||
.map(|t| t as i32);
|
.map(|t| t as i32);
|
||||||
let (pll_phase, pll_frequency) = c.resources.pll.update(
|
let (pll_phase, pll_frequency) = c.resources.pll.update(
|
||||||
timestamp,
|
timestamp,
|
||||||
22, // frequency settling time (log2 counter cycles), TODO: expose
|
21, // frequency settling time (log2 counter cycles), TODO: expose
|
||||||
22, // phase settling time, TODO: expose
|
21, // phase settling time, TODO: expose
|
||||||
);
|
);
|
||||||
|
|
||||||
// Harmonic index of the LO: -1 to _de_modulate the fundamental (complex conjugate)
|
// Harmonic index of the LO: -1 to _de_modulate the fundamental (complex conjugate)
|
||||||
|
|
@ -144,187 +121,26 @@ const APP: () = {
|
||||||
.last()
|
.last()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
// convert i/q to power/phase,
|
let conf = "frequency_discriminator";
|
||||||
let power_phase = true; // TODO: expose
|
let output = match conf {
|
||||||
|
|
||||||
let mut output = if power_phase {
|
|
||||||
// Convert from IQ to power and phase.
|
// Convert from IQ to power and phase.
|
||||||
[output.abs_sqr() as _, output.arg() as _]
|
"power_phase" => [output.abs_sqr(), output.arg()],
|
||||||
} else {
|
"frequency_discriminator" => [pll_frequency as i32, output.arg()],
|
||||||
[output.0 as _, output.1 as _]
|
_ => [output.0, output.1],
|
||||||
};
|
};
|
||||||
|
|
||||||
// Filter power and phase through IIR filters.
|
|
||||||
// Note: Normalization to be done in filters. Phase will wrap happily.
|
|
||||||
for j in 0..iir_state[0].len() {
|
|
||||||
for k in 0..output.len() {
|
|
||||||
output[k] =
|
|
||||||
iir_ch[k][j].update(&mut iir_state[k][j], output[k]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note(unsafe): range clipping to i16 is ensured by IIR filters above.
|
|
||||||
// Convert to DAC data.
|
// Convert to DAC data.
|
||||||
for i in 0..dac_samples[0].len() {
|
for i in 0..dac_samples[0].len() {
|
||||||
unsafe {
|
dac_samples[0][i] = (output[0] >> 16) as u16 ^ 0x8000;
|
||||||
dac_samples[0][i] =
|
dac_samples[1][i] = (output[1] >> 16) as u16 ^ 0x8000;
|
||||||
output[0].to_int_unchecked::<i16>() as u16 ^ 0x8000;
|
|
||||||
dac_samples[1][i] =
|
|
||||||
output[1].to_int_unchecked::<i16>() as u16 ^ 0x8000;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[idle(resources=[net_interface, iir_state, iir_ch, afes])]
|
#[idle(resources=[afes])]
|
||||||
fn idle(mut c: idle::Context) -> ! {
|
fn idle(_: idle::Context) -> ! {
|
||||||
let mut socket_set_entries: [_; 8] = Default::default();
|
|
||||||
let mut sockets =
|
|
||||||
smoltcp::socket::SocketSet::new(&mut socket_set_entries[..]);
|
|
||||||
|
|
||||||
let mut rx_storage = [0; TCP_RX_BUFFER_SIZE];
|
|
||||||
let mut tx_storage = [0; TCP_TX_BUFFER_SIZE];
|
|
||||||
let tcp_handle = {
|
|
||||||
let tcp_rx_buffer =
|
|
||||||
smoltcp::socket::TcpSocketBuffer::new(&mut rx_storage[..]);
|
|
||||||
let tcp_tx_buffer =
|
|
||||||
smoltcp::socket::TcpSocketBuffer::new(&mut tx_storage[..]);
|
|
||||||
let tcp_socket =
|
|
||||||
smoltcp::socket::TcpSocket::new(tcp_rx_buffer, tcp_tx_buffer);
|
|
||||||
sockets.add(tcp_socket)
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut server = server::Server::new();
|
|
||||||
|
|
||||||
let mut time = 0u32;
|
|
||||||
let mut next_ms = Instant::now();
|
|
||||||
|
|
||||||
// TODO: Replace with reference to CPU clock from CCDR.
|
|
||||||
next_ms += 400_000.cycles();
|
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let tick = Instant::now() > next_ms;
|
// TODO: Implement network interface.
|
||||||
|
cortex_m::asm::wfi();
|
||||||
if tick {
|
|
||||||
next_ms += 400_000.cycles();
|
|
||||||
time += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
let socket =
|
|
||||||
&mut *sockets.get::<smoltcp::socket::TcpSocket>(tcp_handle);
|
|
||||||
if socket.state() == smoltcp::socket::TcpState::CloseWait {
|
|
||||||
socket.close();
|
|
||||||
} else if !(socket.is_open() || socket.is_listening()) {
|
|
||||||
socket
|
|
||||||
.listen(1235)
|
|
||||||
.unwrap_or_else(|e| warn!("TCP listen error: {:?}", e));
|
|
||||||
} else {
|
|
||||||
server.poll(socket, |req| {
|
|
||||||
info!("Got request: {:?}", req);
|
|
||||||
stabilizer::route_request!(req,
|
|
||||||
readable_attributes: [
|
|
||||||
"stabilizer/iir/state": (|| {
|
|
||||||
let state = c.resources.iir_state.lock(|iir_state|
|
|
||||||
server::Status {
|
|
||||||
t: time,
|
|
||||||
x0: iir_state[0][0].0[0],
|
|
||||||
y0: iir_state[0][0].0[2],
|
|
||||||
x1: iir_state[1][0].0[0],
|
|
||||||
y1: iir_state[1][0].0[2],
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok::<server::Status, ()>(state)
|
|
||||||
}),
|
|
||||||
// "_b" means cascades 2nd IIR
|
|
||||||
"stabilizer/iir_b/state": (|| { let state = c.resources.iir_state.lock(|iir_state|
|
|
||||||
server::Status {
|
|
||||||
t: time,
|
|
||||||
x0: iir_state[0][IIR_CASCADE_LENGTH-1].0[0],
|
|
||||||
y0: iir_state[0][IIR_CASCADE_LENGTH-1].0[2],
|
|
||||||
x1: iir_state[1][IIR_CASCADE_LENGTH-1].0[0],
|
|
||||||
y1: iir_state[1][IIR_CASCADE_LENGTH-1].0[2],
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok::<server::Status, ()>(state)
|
|
||||||
}),
|
|
||||||
"stabilizer/afe0/gain": (|| c.resources.afes.0.get_gain()),
|
|
||||||
"stabilizer/afe1/gain": (|| c.resources.afes.1.get_gain())
|
|
||||||
],
|
|
||||||
|
|
||||||
modifiable_attributes: [
|
|
||||||
"stabilizer/iir0/state": server::IirRequest, (|req: server::IirRequest| {
|
|
||||||
c.resources.iir_ch.lock(|iir_ch| {
|
|
||||||
if req.channel > 1 {
|
|
||||||
return Err(());
|
|
||||||
}
|
|
||||||
|
|
||||||
iir_ch[req.channel as usize][0] = req.iir;
|
|
||||||
|
|
||||||
Ok::<server::IirRequest, ()>(req)
|
|
||||||
})
|
|
||||||
}),
|
|
||||||
"stabilizer/iir1/state": server::IirRequest, (|req: server::IirRequest| {
|
|
||||||
c.resources.iir_ch.lock(|iir_ch| {
|
|
||||||
if req.channel > 1 {
|
|
||||||
return Err(());
|
|
||||||
}
|
|
||||||
|
|
||||||
iir_ch[req.channel as usize][0] = req.iir;
|
|
||||||
|
|
||||||
Ok::<server::IirRequest, ()>(req)
|
|
||||||
})
|
|
||||||
}),
|
|
||||||
"stabilizer/iir_b0/state": server::IirRequest, (|req: server::IirRequest| {
|
|
||||||
c.resources.iir_ch.lock(|iir_ch| {
|
|
||||||
if req.channel > 1 {
|
|
||||||
return Err(());
|
|
||||||
}
|
|
||||||
|
|
||||||
iir_ch[req.channel as usize][IIR_CASCADE_LENGTH-1] = req.iir;
|
|
||||||
|
|
||||||
Ok::<server::IirRequest, ()>(req)
|
|
||||||
})
|
|
||||||
}),
|
|
||||||
"stabilizer/iir_b1/state": server::IirRequest,(|req: server::IirRequest| {
|
|
||||||
c.resources.iir_ch.lock(|iir_ch| {
|
|
||||||
if req.channel > 1 {
|
|
||||||
return Err(());
|
|
||||||
}
|
|
||||||
|
|
||||||
iir_ch[req.channel as usize][IIR_CASCADE_LENGTH-1] = req.iir;
|
|
||||||
|
|
||||||
Ok::<server::IirRequest, ()>(req)
|
|
||||||
})
|
|
||||||
}),
|
|
||||||
"stabilizer/afe0/gain": hardware::AfeGain, (|gain| {
|
|
||||||
c.resources.afes.0.set_gain(gain);
|
|
||||||
Ok::<(), ()>(())
|
|
||||||
}),
|
|
||||||
"stabilizer/afe1/gain": hardware::AfeGain, (|gain| {
|
|
||||||
c.resources.afes.1.set_gain(gain);
|
|
||||||
Ok::<(), ()>(())
|
|
||||||
})
|
|
||||||
]
|
|
||||||
)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let sleep = match c.resources.net_interface.poll(
|
|
||||||
&mut sockets,
|
|
||||||
smoltcp::time::Instant::from_millis(time as i64),
|
|
||||||
) {
|
|
||||||
Ok(changed) => !changed,
|
|
||||||
Err(smoltcp::Error::Unrecognized) => true,
|
|
||||||
Err(e) => {
|
|
||||||
info!("iface poll error: {:?}", e);
|
|
||||||
true
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if sleep {
|
|
||||||
cortex_m::asm::wfi();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue