Finalizing names
This commit is contained in:
parent
19dd57c6a8
commit
0bb7c1fdb0
|
@ -30,10 +30,10 @@ enum Conf {
|
||||||
Power,
|
Power,
|
||||||
Phase,
|
Phase,
|
||||||
PllFrequency,
|
PllFrequency,
|
||||||
FrequencyDiscriminator,
|
LogPower,
|
||||||
QuadratureReal,
|
InPhase,
|
||||||
QuadratureImaginary,
|
Quadrature,
|
||||||
Reference,
|
Modulation,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Miniconf, Deserialize, PartialEq)]
|
#[derive(Copy, Clone, Debug, Miniconf, Deserialize, PartialEq)]
|
||||||
|
@ -69,7 +69,7 @@ impl Default for Settings {
|
||||||
lockin_harmonic: -1, // Harmonic index of the LO: -1 to _de_modulate the fundamental (complex conjugate)
|
lockin_harmonic: -1, // Harmonic index of the LO: -1 to _de_modulate the fundamental (complex conjugate)
|
||||||
lockin_phase: 0, // Demodulation LO phase offset
|
lockin_phase: 0, // Demodulation LO phase offset
|
||||||
|
|
||||||
output_conf: [Conf::QuadratureReal, Conf::QuadratureImaginary],
|
output_conf: [Conf::InPhase, Conf::Quadrature],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -229,13 +229,11 @@ const APP: () = {
|
||||||
let value = match settings.output_conf[channel] {
|
let value = match settings.output_conf[channel] {
|
||||||
Conf::Power => output.abs_sqr() as i32 >> 16,
|
Conf::Power => output.abs_sqr() as i32 >> 16,
|
||||||
Conf::Phase => output.arg() >> 16,
|
Conf::Phase => output.arg() >> 16,
|
||||||
Conf::FrequencyDiscriminator => {
|
Conf::LogPower => (output.log2() << 24) as i32 >> 16,
|
||||||
(output.log2() << 24) as i32 >> 16
|
|
||||||
}
|
|
||||||
Conf::PllFrequency => pll_frequency as i32 >> 16,
|
Conf::PllFrequency => pll_frequency as i32 >> 16,
|
||||||
Conf::QuadratureReal => output.re >> 16,
|
Conf::InPhase => output.re >> 16,
|
||||||
Conf::QuadratureImaginary => output.im >> 16,
|
Conf::Quadrature => output.im >> 16,
|
||||||
Conf::Reference => DAC_SEQUENCE[i] as i32,
|
Conf::Modulation => DAC_SEQUENCE[i] as i32,
|
||||||
};
|
};
|
||||||
|
|
||||||
*sample = value as u16 ^ 0x8000;
|
*sample = value as u16 ^ 0x8000;
|
||||||
|
|
Loading…
Reference in New Issue