stv0g/comedilib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cleanup some redundant initialization of sv stuff

Browse source
This commit is contained in:
Frank Mori Hess 2003-05-22 16:12:07 +00:00
parent 93cb91df25
commit 78c5a7e9bd
1 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
comedi_calibrate/comedi_calibrate.c
View file

@ -648,13 +648,9 @@ void cal_relative_binary( calibration_setup_t *setup, int obs1, int obs2, int da
update_caldac( setup, dac, x1 );
usleep(100000);
preobserve( setup, obs1);
new_sv_init(&sv1, setup->dev, setup->ad_subdev,chanspec1);
sv1.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv1);
preobserve( setup, obs2);
new_sv_init(&sv2, setup->dev, setup->ad_subdev,chanspec2);
sv2.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv2);
y1 = y2 = sv1.average - sv2.average;
@ -672,13 +668,9 @@ void cal_relative_binary( calibration_setup_t *setup, int obs1, int obs2, int da
usleep(100000);
preobserve( setup, obs1);
new_sv_init(&sv1, setup->dev, setup->ad_subdev,chanspec1);
sv1.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv1);
preobserve( setup, obs2);
new_sv_init(&sv2, setup->dev, setup->ad_subdev,chanspec2);
sv2.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv2);
y2 = sv1.average - sv2.average;
@ -756,18 +748,12 @@ void cal_linearity_binary( calibration_setup_t *setup, int obs1, int obs2, int o
usleep(100000);
preobserve( setup, obs1);
new_sv_init(&sv1, setup->dev, setup->ad_subdev,chanspec1);
sv1.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv1);
preobserve( setup, obs2);
new_sv_init(&sv2, setup->dev, setup->ad_subdev,chanspec2);
sv2.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv2);
preobserve( setup, obs3);
new_sv_init(&sv3, setup->dev, setup->ad_subdev,chanspec3);
sv3.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv3);
y1 = y2 = ( sv3.average - sv2.average ) / ( sv2.average - sv1.average );
@ -786,18 +772,12 @@ void cal_linearity_binary( calibration_setup_t *setup, int obs1, int obs2, int o
usleep(100000);
preobserve( setup, obs1);
new_sv_init(&sv1, setup->dev, setup->ad_subdev,chanspec1);
sv1.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv1);
preobserve( setup, obs2);
new_sv_init(&sv2, setup->dev, setup->ad_subdev,chanspec2);
sv2.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv2);
preobserve( setup, obs3);
new_sv_init(&sv3, setup->dev, setup->ad_subdev,chanspec3);
sv3.settling_time_ns = setup->settling_time_ns;
new_sv_measure( setup->dev, &sv3);
y2 = ( sv3.average - sv2.average ) / ( sv2.average - sv1.average );