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

made all cal_*binary() functions set oor behaviour to COMEDI_OOR_NUMBER

Browse source
This commit is contained in:
Frank Mori Hess 2003-04-30 20:30:04 +00:00
parent da11030346
commit c5a39df702
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
comedi_calibrate/cb64.c
View file

@ -787,8 +787,6 @@ static int cal_cb_pci_64xx( calibration_setup_t *setup )
int adc_offset_for_ao = -1, adc_gain_for_ao = -1;
int ai_range_for_ao;
comedi_set_global_oor_behavior( COMEDI_OOR_NUMBER );
num_ai_ranges = comedi_get_n_ranges( setup->dev, setup->ad_subdev, 0 );
if( num_ai_ranges < 1 ) return -1;
if( setup->da_subdev >= 0 )
@ -946,8 +944,6 @@ static int cal_cb_pci_60xx( calibration_setup_t *setup )
adc_gain_fine_for_ao = -1, adc_gain_coarse_for_ao = -1;
static const int ai_range_for_ao = 0;
comedi_set_global_oor_behavior( COMEDI_OOR_NUMBER );
num_ai_ranges = comedi_get_n_ranges( setup->dev, setup->ad_subdev, 0 );
if( num_ai_ranges < 1 ) return -1;
if( setup->da_subdev >= 0 )
@ -1063,8 +1059,6 @@ static int cal_cb_pci_4020( calibration_setup_t *setup )
num_calibrations, i;
saved_calibration_t *saved_cals, *current_cal;
comedi_set_global_oor_behavior( COMEDI_OOR_NUMBER );
num_ranges = comedi_get_n_ranges( setup->dev, setup->ad_subdev, 0 );
if( num_ranges < 0 ) return -1;

6
comedi_calibrate/comedi_calibrate.c
View file

@ -477,6 +477,8 @@ void cal_binary( calibration_setup_t *setup, int obs, int dac)
DPRINT(0,"binary: %s\n", setup->observables[obs].name);
preobserve( setup, obs);
comedi_set_global_oor_behavior( COMEDI_OOR_NUMBER );
new_sv_init(&sv, setup->dev, setup->ad_subdev, chanspec);
sv.settling_time_ns = setup->settling_time_ns;
@ -541,6 +543,8 @@ void cal_relative_binary( calibration_setup_t *setup, int obs1, int obs2, int da
DPRINT(0,"relative binary: %s, %s\n", setup->observables[obs1].name,
setup->observables[obs2].name);
comedi_set_global_oor_behavior( COMEDI_OOR_NUMBER );
x0 = x1 = x2 = 0;
update_caldac( setup, dac, x0 );
usleep(100000);
@ -623,6 +627,8 @@ void cal_linearity_binary( calibration_setup_t *setup, int obs1, int obs2, int o
DPRINT(0,"postgain linearity: %s,\n%s,\n%s\n", setup->observables[obs1].name,
setup->observables[obs2].name,setup->observables[obs3].name);
comedi_set_global_oor_behavior( COMEDI_OOR_NUMBER );
x0 = x1 = x2 = 0;
update_caldac( setup, dac, x0 );
usleep(100000);

2
comedi_calibrate/ni.c
View file

@ -959,8 +959,6 @@ static int cal_ni_daqcard_6062e( calibration_setup_t *setup )
static const int num_calibrations = sizeof( saved_cals ) / sizeof( saved_cals[0] );
int i, retval;
comedi_set_global_oor_behavior( COMEDI_OOR_NUMBER );
current_cal = saved_cals;
memset( saved_cals, 0, sizeof( saved_cals ) );