611x calibration works now

diff --git a/comedi_calibrate/comedi_calibrate.c b/comedi_calibrate/comedi_calibrate.c
index 711ad86b0644918528cd24f7f804e73320f65c9a..3c220669a8427d9149c0905befa8e4158e64eba0 100644 (file)
--- a/comedi_calibrate/comedi_calibrate.c
+++ b/comedi_calibrate/comedi_calibrate.c
@@ -267,16 +267,15 @@ void observe( calibration_setup_t *setup )
                        observable_dependence( setup, i);
                }
        }
-
 }
 
 int preobserve( calibration_setup_t *setup, int obs)
 {
-       int retval = 0;
+       int retval;
        comedi_insn reference_source_config;
        lsampl_t ref_data[ 2 ];
-       // setup reference source
 
+       // setup reference source
        memset( &reference_source_config, 0, sizeof(reference_source_config) );
        reference_source_config.insn = INSN_CONFIG;
        reference_source_config.n = 2;
@@ -289,7 +288,6 @@ int preobserve( calibration_setup_t *setup, int obs)
        /* ignore errors for now since older ni driver doesn't
         * support reference config insn */
        if( retval < 0 )
-
                perror("preobserve() ignoring reference config error" );
        retval = 0;
 
@@ -553,14 +551,18 @@ void cal_postgain_binary( calibration_setup_t *setup, int obs1, int obs2, int da
                }
 
                if(verbose>=3){
+                       preobserve( setup, obs1);
                        measure_observable( setup, obs1);
+                       preobserve( setup, obs2);
                        measure_observable( setup, obs2);
                }
        }
 
        DPRINT(0,"caldac[%d] set to %d\n",dac,x);
        if(verbose>=3){
+               preobserve( setup, obs1);
                measure_observable( setup, obs1);
+               preobserve( setup, obs2);
                measure_observable( setup, obs2);
        }
 }
@@ -714,7 +716,7 @@ double check_gain_chan_x( calibration_setup_t *setup, linear_fit_t *l,unsigned i
        l->y_data=malloc(n*sizeof(double)/step);
        if(l->y_data == NULL)
        {
-               perror("comedi_calibrate");
+               perror("check_gain_chan_x");
                exit(1);
        }
 

diff --git a/comedi_calibrate/ni.c b/comedi_calibrate/ni.c
index 4db9f34c4f936c43157e212853a74f33159ccf72..a470d49ce955c5132dbf808c7dfaeca0f668042c 100644 (file)
--- a/comedi_calibrate/ni.c
+++ b/comedi_calibrate/ni.c
@@ -88,8 +88,8 @@ static struct board_struct boards[]={
        { "pci-mio-16e-4",      STATUS_SOME,    cal_ni_pci_mio_16e_4,   ni_setup_observables },
        { "pci-6032e",          STATUS_DONE,    cal_ni_pci_6032e,       ni_setup_observables },
        { "DAQCard-ai-16e-4",   STATUS_DONE,    cal_ni_daqcard_ai_16e_4,        ni_setup_observables },
-       { "pci-6110",   STATUS_SOME,    cal_ni_pci_611x,        ni_setup_observables_611x },
-       { "pci-6111",   STATUS_SOME,    cal_ni_pci_611x,        ni_setup_observables_611x },
+       { "pci-6110",   STATUS_DONE,    cal_ni_pci_611x,        ni_setup_observables_611x },
+       { "pci-6111",   STATUS_DONE,    cal_ni_pci_611x,        ni_setup_observables_611x },
 #if 0
 //     { "at-mio-16de-10",     cal_ni_unknown },
        { "at-mio-64e-3",       cal_ni_16e_1 },