sb10q/noptica-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wavemeter: do not crash in do_calibrate when MEAS signal is wrong

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2019-11-04 14:58:14 +08:00
parent 743e5278a3
commit 8209f77c1e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wavemeter.rs
View File

@ -46,7 +46,8 @@ fn read_config_from_file<P: AsRef<Path>>(path: P) -> Result<Config, Box<dyn Erro
fn do_calibrate(config: &Config) { fn do_calibrate(config: &Config) {
let mut sample_count = 0; let mut sample_count = 0;
let max_sample_count = (config.sample_rate/4.0) as u32; let avg_ref = (config.ref_min + config.ref_max)/2.0;
let max_sample_count = (avg_ref/4.0) as u32;
let mut position_min = i64::max_value(); let mut position_min = i64::max_value();
let mut position_max = i64::min_value(); let mut position_max = i64::min_value();
@ -68,9 +69,9 @@ fn do_calibrate(config: &Config) {
if position < position_min { if position < position_min {
position_min = position; position_min = position;
} }
sample_count += 1;
} }
sample_count += 1;
if sample_count == max_sample_count { if sample_count == max_sample_count {
let displacement = ((position_max-position_min) as f64)/(noptica::Dpll::TURN as f64)*config.ref_wavelength; let displacement = ((position_max-position_min) as f64)/(noptica::Dpll::TURN as f64)*config.ref_wavelength;
println!("{} um", 1.0e6*displacement); println!("{} um", 1.0e6*displacement);