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

Apply suggestions from code review 

Co-authored-by: Robert Jördens <rj@quartiq.de>
master
Ryan Summers 2021-07-19 14:12:48 +02:00 committed by GitHub
parent 1c605623c2
commit e2d2ce0752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/dac.rs
View File

@ -89,7 +89,7 @@ impl TryFrom<f32> for DacCode {
Err(()) Err(())
} else { } else {
Ok(DacCode::from( Ok(DacCode::from(
(voltage / dac_range * i16::MAX as f32) as i16, (voltage * (i16::MAX as f32 / dac_range)) as i16,
)) ))
} }
} }

29
src/hardware/signal_generator.rs
View File

@ -27,8 +27,9 @@ pub struct BasicConfig {
/// The frequency of the generated signal in Hertz. /// The frequency of the generated signal in Hertz.
pub frequency: f32, pub frequency: f32,
/// The normalized symmetry of the signal. At 0% symmetry, the first half phase does not exist. /// The normalized symmetry of the signal. At 0% symmetry, the duration of the first half oscillation is minimal.
/// At 25% symmetry, the first half-phase lasts for 25% of the signal period. /// At 25% symmetry, the first half oscillation lasts for 25% of the signal period. For square wave output this
//// symmetry is the duty cycle.
pub symmetry: f32, pub symmetry: f32,
/// The amplitude of the output signal in volts. /// The amplitude of the output signal in volts.
@ -59,25 +60,17 @@ impl TryFrom<BasicConfig> for Config {
fn try_from(config: BasicConfig) -> Result<Config, Error> { fn try_from(config: BasicConfig) -> Result<Config, Error> {
// Calculate the frequency tuning words // Calculate the frequency tuning words
let frequency_tuning_word: [u32; 2] = { let frequency_tuning_word: [u32; 2] = {
let conversion_factor = const LSB_PER_HERTZ: f32 = ((1u64 + ADC_SAMPLE_TICKS_LOG2) << 32) as f32 / 100.0e6;
ADC_SAMPLE_TICKS as f32 / 100.0e6 * (1u64 << 32) as f32; let ftw = config.frequency * LSB_PER_HERTZ;
if config.symmetry <= 0.0 { if config.symmetry <= 0.0 {
[ [1u32 << 31, ftw as u32]
i32::MAX as u32,
(config.frequency * conversion_factor) as u32,
]
} else if config.symmetry >= 1.0 { } else if config.symmetry >= 1.0 {
[ [ftw as u32, 1u32 << 31]
(config.frequency * conversion_factor) as u32,
i32::MAX as u32,
]
} else { } else {
[ [
(config.frequency * conversion_factor / config.symmetry) (ftw / config.symmetry) as u32,
as u32, (ftw / (1.0 - config.symmetry)) as u32,
(config.frequency * conversion_factor
/ (1.0 - config.symmetry)) as u32,
] ]
} }
}; };
@ -161,7 +154,7 @@ impl core::iter::Iterator for SignalGenerator {
if phase.is_negative() { if phase.is_negative() {
i16::MAX i16::MAX
} else { } else {
i16::MIN -i16::MAX
} }
} }
Signal::Triangle => i16::MAX - (phase.abs() >> 15) as i16, Signal::Triangle => i16::MAX - (phase.abs() >> 15) as i16,
@ -171,6 +164,6 @@ impl core::iter::Iterator for SignalGenerator {
let result = amplitude as i32 * self.config.amplitude as i32; let result = amplitude as i32 * self.config.amplitude as i32;
// Note: We downshift by 15-bits to preserve only one of the sign bits. // Note: We downshift by 15-bits to preserve only one of the sign bits.
Some((result >> 15) as i16) Some(((result + (1 << 14)) >> 15) as i16)
} }
} }