fixes for DAQCard-6036E

diff --git a/comedi_calibrate/ni.c b/comedi_calibrate/ni.c
index 3913dc55691fc1ed592fbfaa24960577d3dfa66a..2eb3d75b7cf7372dae67055252381ce3c27d3445 100644 (file)
--- a/comedi_calibrate/ni.c
+++ b/comedi_calibrate/ni.c
@@ -87,7 +87,7 @@ static struct board_struct boards[]={
        { "DAQCard-ai-16e-4", STATUS_DONE, cal_ni_daqcard_ai_16e_4, ni_setup_observables, 0x1b5, 0x1b6 },
        { "DAQCard-ai-16xe-50", STATUS_DONE, cal_ni_daqcard_ai_16xe_50, ni_setup_observables, 0x1be, 0x1bf },
        { "DAQCard-6024E", STATUS_SOME, cal_ni_daqcard_6024e, ni_setup_observables, -1, -1 },
-       { "DAQCard-6036E", STATUS_SOME, cal_ni_daqcard_6036e, ni_setup_observables, -1, -1 },
+       { "DAQCard-6036E", STATUS_SOME, cal_ni_daqcard_6036e, ni_setup_observables, 0x1ab, 0x1ac },
        { "DAQCard-6062E", STATUS_DONE, cal_ni_daqcard_6062e, ni_setup_observables, 0x1a9, 0x1aa },
        { "pci-mio-16e-1", STATUS_DONE, cal_ni_pci_mio_16e_1, ni_setup_observables, 0x1a9, 0x1aa },
        { "pci-mio-16e-4", STATUS_SOME, cal_ni_pci_mio_16e_4, ni_setup_observables, 0x1a9, 0x1aa },
@@ -1145,16 +1145,19 @@ static int cal_ni_daqcard_6036e( calibration_setup_t *setup )
        init_ni_caldac_layout( &layout );
 
        layout.adc_pregain_offset = 0;
+       layout.adc_pregain_offset_fine = 8;
        layout.adc_postgain_offset = 4;
        layout.adc_gain = 2;
 
-       layout.dac_offset[ 0 ] = 6;
-       layout.dac_gain[ 0 ] = 7;
-//     layout.dac_gain_fine[ 0 ] = XXX;
+       layout.dac_offset[0] = 6;
+       layout.dac_gain[0] = 7;
+       layout.dac_gain_fine[ 0 ] = 11;
+       layout.dac_linearity[0] = 10;
 
-       layout.dac_offset[ 1 ] = 1;
+       layout.dac_offset[ 1 ] = 9;
        layout.dac_gain[ 1 ] = 3;
        layout.dac_gain_fine[ 1 ] = 5;
+       layout.dac_linearity[1] = 1;
 
        return cal_ni_generic( setup, &layout );
 }