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

Revert "rpll: auto-align counter"

Browse Source 
This reverts commit dbacc5293e12f712fef7bd85848e1b0bd8fde823.
This commit is contained in:
Robert Jördens 2021-01-27 09:00:48 +01:00
parent 45e7d6de3c
commit 1749d48ca3
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dsp/src/rpll.rs
View File

@ -18,12 +18,14 @@ impl RPLL {
/// ///
/// Args: /// Args:
/// * dt2: inverse update() rate. 1 << dt2 is the counter rate to update() rate ratio. /// * dt2: inverse update() rate. 1 << dt2 is the counter rate to update() rate ratio.
/// * t: Counter time. Counter value at the first update() call. Typically 0.
/// ///
/// Returns: /// Returns:
/// Initialized RPLL instance. /// Initialized RPLL instance.
pub fn new(dt2: u8) -> RPLL { pub fn new(dt2: u8, t: i32) -> RPLL {
RPLL { RPLL {
dt2, dt2,
t,
..Default::default() ..Default::default()
} }
} }
@ -67,19 +69,7 @@ impl RPLL {
// Update frequency lock // Update frequency lock
self.ff = self.ff.wrapping_add(p_ref.wrapping_sub(p_sig)); self.ff = self.ff.wrapping_add(p_ref.wrapping_sub(p_sig));
// Time in counter cycles between timestamp and "now" // Time in counter cycles between timestamp and "now"
let mut dt = self.t.wrapping_sub(x); let dt = self.t.wrapping_sub(x);
if dt < 0 {
// Timestamp is in the future
// Advance phase and time until we are just past the most recent
// timestamp.
let mut dt_ceil = dt >> self.dt2;
self.y = self.y.wrapping_sub(self.f.wrapping_mul(dt_ceil));
dt_ceil <<= self.dt2;
self.t = self.t.wrapping_sub(dt_ceil);
dt = dt.wrapping_sub(dt_ceil);
}
// Reference phase estimate "now" // Reference phase estimate "now"
let y_ref = (self.f >> self.dt2).wrapping_mul(dt); let y_ref = (self.f >> self.dt2).wrapping_mul(dt);
// Phase error // Phase error

2
src/bin/lockin.rs
View File

@ -53,7 +53,7 @@ const APP: () = {
// Configure the microcontroller // Configure the microcontroller
let (mut stabilizer, _pounder) = hardware::setup(c.core, c.device); let (mut stabilizer, _pounder) = hardware::setup(c.core, c.device);
let pll = RPLL::new(ADC_SAMPLE_TICKS_LOG2 + SAMPLE_BUFFER_SIZE_LOG2); let pll = RPLL::new(ADC_SAMPLE_TICKS_LOG2 + SAMPLE_BUFFER_SIZE_LOG2, 0);
let lockin = Lockin::new( let lockin = Lockin::new(
&iir_int::IIRState::lowpass(1e-3, 0.707, 2.), // TODO: expose &iir_int::IIRState::lowpass(1e-3, 0.707, 2.), // TODO: expose