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

added some warning messages when binary calibrations set caldacs to

Browse source 
max/min values
This commit is contained in:
Frank Mori Hess 2003-05-21 17:52:41 +00:00
parent de2714e5fe
commit d2a9fc95d6
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
comedi_calibrate/comedi_calibrate.c
View file

@ -603,6 +603,8 @@ void cal_binary( calibration_setup_t *setup, int obs, int dac)
update_caldac( setup, dac, x );
DPRINT(0,"caldac[%d] set to %d\n",dac,x);
if( x >= setup->caldacs[dac].maxdata || x <= 0 )
DPRINT(0,"WARNING: caldac[%d] pegged!\n", dac );
if(verbose>=3){
measure_observable( setup, obs);
}
@ -701,6 +703,8 @@ void cal_relative_binary( calibration_setup_t *setup, int obs1, int obs2, int da
x = x2;
update_caldac( setup, dac, x );
DPRINT(0,"caldac[%d] set to %d\n",dac,x);
if( x >= setup->caldacs[dac].maxdata || x <= 0 )
DPRINT(0,"WARNING: caldac[%d] pegged!\n", dac );
if(verbose>=3){
preobserve( setup, obs1);
measure_observable( setup, obs1);
@ -821,6 +825,8 @@ void cal_linearity_binary( calibration_setup_t *setup, int obs1, int obs2, int o
x = x2;
update_caldac( setup, dac, x );
DPRINT(0,"caldac[%d] set to %d\n",dac,x);
if( x >= setup->caldacs[dac].maxdata || x <= 0 )
DPRINT(0,"WARNING: caldac[%d] pegged!\n", dac );
if(verbose>=3){
preobserve( setup, obs1);
measure_observable( setup, obs1);
@ -843,7 +849,7 @@ void chan_cal(int adc,int cdac,int range,double target)
check_gain_chan_x(&l,CR_PACK(adc,range,AREF_OTHER),cdac);
offset=linear_fit_func_y(&l,caldacs[cdac].current);
gain=l.slope;
a=caldacs[cdac].current+(target-offset)/gain;
update_caldac( setup, cdac, rint(a));

1
comedi_calibrate/save_cal.c
View file

@ -130,6 +130,7 @@ int write_calibration_file( calibration_setup_t *setup )
return -1;
}
DPRINT( 0, "writing calibration to %s\n", setup->cal_save_file_path );
retval = write_calibration_perl_hash( file, setup->new_calibration );
fclose( file );