From c5a39df7026775dc83de8e787e665e5f08a1c912 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Wed, 30 Apr 2003 20:30:04 +0000 Subject: [PATCH] made all cal_*binary() functions set oor behaviour to COMEDI_OOR_NUMBER --- comedi_calibrate/cb64.c | 6 ------ comedi_calibrate/comedi_calibrate.c | 6 ++++++ comedi_calibrate/ni.c | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/comedi_calibrate/cb64.c b/comedi_calibrate/cb64.c index 8d87121..e64f9d7 100644 --- a/comedi_calibrate/cb64.c +++ b/comedi_calibrate/cb64.c @@ -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; diff --git a/comedi_calibrate/comedi_calibrate.c b/comedi_calibrate/comedi_calibrate.c index a378b8e..4b62391 100644 --- a/comedi_calibrate/comedi_calibrate.c +++ b/comedi_calibrate/comedi_calibrate.c @@ -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); diff --git a/comedi_calibrate/ni.c b/comedi_calibrate/ni.c index 031b76a..6705dbe 100644 --- a/comedi_calibrate/ni.c +++ b/comedi_calibrate/ni.c @@ -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 ) );