Fixes for 6023.

diff --git a/comedi_calibrate/ni.c b/comedi_calibrate/ni.c
index 0f77339a0315df14f2e92d5cfe4b59dbf2d427a0..ce09c1f5cd49a61d6012e99cb3823e479b8904fe 100644 (file)
--- a/comedi_calibrate/ni.c
+++ b/comedi_calibrate/ni.c
@@ -78,7 +78,7 @@ static struct board_struct boards[]={
        { "pxi-6071e",          STATUS_GUESS,   cal_ni_pxi_6071e },
        { "at-mio-16e-10",      STATUS_GUESS,   cal_ni_at_mio_16e_10 },
        { "pci-mio-16xe-50",    STATUS_SOME,    cal_ni_pci_mio_16xe_50 },
-       { "pci-6023e",          STATUS_SOME,    cal_ni_pci_6023e },
+       { "pci-6023e",          STATUS_DONE,    cal_ni_pci_6023e },
        { "pci-mio-16xe-10",    STATUS_DONE,    cal_ni_pci_mio_16xe_10 },
        { "pci-6052e",          STATUS_DONE,    cal_ni_pci_6052e },
        { "pci-6024e",          STATUS_SOME,    cal_ni_pci_6024e },
@@ -495,9 +495,8 @@ int cal_ni_pci_6023e(calibration_setup_t *setup)
        /* for comedi-0.7.65 */
 
        postgain_cal( setup, ni_zero_offset_low,ni_zero_offset_high,4);
-       //postgain_cal( setup, ni_zero_offset_low,ni_zero_offset_high,8);
-
        cal1( setup, ni_zero_offset_high,0);
+       cal1( setup, ni_zero_offset_high,8); /* possibly wrong */
        cal1( setup, ni_reference_low,2);
 
        return 0;
@@ -522,17 +521,17 @@ int cal_ni_pci_6024e(calibration_setup_t *setup)
 
 int cal_ni_pci_6025e(calibration_setup_t *setup)
 {
-       postgain_cal( setup, ni_zero_offset_low,ni_zero_offset_high,4); // was 1
-       //cal1( setup, ni_zero_offset_high,XXX); // was 10
-       cal1( setup, ni_zero_offset_high,8); // was 0
-       cal1( setup, ni_reference_low,2); // was 3
+       postgain_cal( setup, ni_zero_offset_low,ni_zero_offset_high,4);
+       cal1( setup, ni_zero_offset_high,0);
+       cal1( setup, ni_zero_offset_high,8);
+       cal1( setup, ni_reference_low,2);
        if(do_output){
-               cal1( setup, ni_ao0_zero_offset,6); // was 5
-               //cal1( setup, ni_ao0_zero_offset,10); // nonlinearity was 4
-               //cal1( setup, ni_ao0_reference,XXX); // was 6
-               cal1( setup, ni_ao1_zero_offset,9); // was 8
-               //cal1( setup, ni_ao1_zero_offset,1); // nonlinearity was 7
-               cal1( setup, ni_ao1_reference,5); // was 9
+               cal1( setup, ni_ao0_zero_offset,6);
+               //cal1( setup, ni_ao0_zero_offset,10); /* nonlinearity */
+               cal1( setup, ni_ao0_reference,11);
+               cal1( setup, ni_ao1_zero_offset,9);
+               //cal1( setup, ni_ao1_zero_offset,1); /* nonlinearity */
+               cal1( setup, ni_ao1_reference,5);
        }
        return 0;
 }

diff --git a/comedi_calibrate/results/pci-6023e b/comedi_calibrate/results/pci-6023e
index 835d1eb988a48d799652be8002c143bfdc9fd5e7..e02e7cac165f7dd20e3bbe6db91f8668d424f31e 100644 (file)
--- a/comedi_calibrate/results/pci-6023e
+++ b/comedi_calibrate/results/pci-6023e
@@ -1,47 +1,67 @@
+Warning: device not fully calibrated due to insufficient information
 Please send this output to <ds@schleef.org>
-Id: comedi_calibrate.c,v 1.24 2002/01/22 09:32:28 ds Exp 
+Id: comedi_calibrate.c,v 1.36 2002/06/12 23:19:39 ds Exp 
 Driver name: ni_pcimio
 Device name: pci-6023e
-Comedi version: 0.7.63
+Id: ni.c,v 1.30 2002/06/12 23:19:39 ds Exp 
+Comedi version: 0.7.65
 ai, bipolar zero offset, low gain
-offset 0.01404(24), target 0
-caldac[0] gain=-2.20(20)e-6 V/bit S_min=273.387 dof=254
-caldac[1] gain=-7.8101(21)e-4 V/bit S_min=348.328 dof=254
-caldac[3] gain=-1.31(20)e-6 V/bit S_min=271.206 dof=254
+offset -0.012248(38), target 0
+caldac[0] gain=-1.20044(52)e-4 V/bit S_min=60353.2 dof=254
+caldac[1] gain= V/bit S_min=inf dof=254
+caldac[2] gain= V/bit S_min=inf dof=254
+caldac[3] gain= V/bit S_min=inf dof=254
+caldac[4] gain=-7.68330(56)e-4 V/bit S_min=57620.1 dof=254
+caldac[5] gain= V/bit S_min=inf dof=254
+caldac[6] gain= V/bit S_min=inf dof=254
+caldac[7] gain= V/bit S_min=inf dof=254
+caldac[8] gain= V/bit S_min=inf dof=254
+caldac[9] gain=-2.47(13)e-9 V/bit S_min=65407.1 dof=254
+caldac[10] gain= V/bit S_min=inf dof=254
+caldac[11] gain= V/bit S_min=inf dof=254
 ai, bipolar zero offset, high gain
-offset 8.5474(17)e-3, target 0
-caldac[0] gain=-2.0636(15)e-6 V/bit S_min=395.845 dof=254
-caldac[1] gain=-3.9031(15)e-6 V/bit S_min=489.346 dof=254
-caldac[3] gain=-1.0865(15)e-6 V/bit S_min=413.538 dof=254
+offset 3.3644(13)e-3, target 0
+caldac[0] gain=-1.187088(26)e-4 V/bit S_min=3096.05 dof=254
+caldac[2] gain=-4.007(12)e-7 V/bit S_min=323.641 dof=254
+caldac[4] gain=-3.8457(12)e-6 V/bit S_min=329.221 dof=254
+caldac[8] gain=-2.0504(12)e-6 V/bit S_min=287.303 dof=254
 ai, bipolar voltage reference, low gain
-offset 5.01725(25), target 5
-caldac[0] gain=-2.16(20)e-6 V/bit S_min=292.023 dof=254
-caldac[1] gain=-7.8602(20)e-4 V/bit S_min=757.244 dof=254
-caldac[3] gain=-6.4626(21)e-4 V/bit S_min=1419.06 dof=254
-postgain: ai, bipolar zero offset, low gain; ai, bipolar zero offset, high gain
-caldac[1] gain=-7.8136(20)e-4 V/bit S_min=363.103 dof=254
-caldac[1] gain=-3.9035(15)e-6 V/bit S_min=476.091 dof=254
-caldac[1] set to 134 (133.724)
+offset 4.998779( 0), target 5
+caldac[0] gain=-1.21374(54)e-4 V/bit S_min=58731.7 dof=254
+caldac[2] gain=-5.98461(60)e-4 V/bit S_min=48971.1 dof=254
+caldac[4] gain=-7.64458(58)e-4 V/bit S_min=54496.4 dof=254
+caldac[8] gain=-2.90(17)e-7 V/bit S_min=753.706 dof=254
+postgain: ai, bipolar zero offset, low gain; ai, bipolar zero offset, high
+gain
+caldac[4] gain=-7.68318(55)e-4 V/bit S_min=59349.6 dof=254
+caldac[4] gain=-3.8481(12)e-6 V/bit S_min=323.478 dof=254
+caldac[4] set to 106 (106.442)
 linear: ai, bipolar zero offset, high gain
-caldac[0] gain=-2.0637(15)e-6 V/bit S_min=364.149 dof=254
-caldac set out of range (4256>255)
-caldac[0] set to 4256 (4255.75)
+caldac[0] gain=-1.186974(26)e-4 V/bit S_min=2972.99 dof=254
+caldac[0] set to 157 (157.229)
 linear: ai, bipolar voltage reference, low gain
-caldac[3] gain=-6.4565(21)e-4 V/bit S_min=1768.65 dof=254
-caldac[3] set to 147 (146.65)
+caldac[2] gain=-5.99000(59)e-4 V/bit S_min=51115.6 dof=254
+caldac[2] set to 145 (145.074)
 ai, bipolar zero offset, low gain
-offset 8.05(24)e-3, target 0
-caldac[0] gain=-1.97(20)e-6 V/bit S_min=262.991 dof=254
-caldac[1] gain=-7.7935(20)e-4 V/bit S_min=332.437 dof=254
-caldac[3] gain=-8.7(20)e-7 V/bit S_min=236.789 dof=254
+offset 1.87(14)e-3, target 0
+caldac[0] gain=-1.23059(58)e-4 V/bit S_min=54266.7 dof=254
+caldac[2] gain=2.68(13)e-6 V/bit S_min=843.073 dof=254
+caldac[4] gain=-7.66774(56)e-4 V/bit S_min=58642.8 dof=254
+caldac[8] gain=-6.87(12)e-6 V/bit S_min=1365.67 dof=254
 ai, bipolar zero offset, high gain
-offset 8.2400(17)e-3, target 0
-caldac[0] gain=-2.0521(15)e-6 V/bit S_min=326.889 dof=254
-caldac[1] gain=-3.8819(15)e-6 V/bit S_min=359.993 dof=254
-caldac[3] gain=-1.0458(15)e-6 V/bit S_min=379.206 dof=254
+offset -1.114(13)e-4, target 0
+caldac[0] gain=-1.184377(26)e-4 V/bit S_min=2980.93 dof=254
+caldac[2] gain=1.80(12)e-8 V/bit S_min=273.599 dof=254
+caldac[4] gain=-3.8415(12)e-6 V/bit S_min=613.354 dof=254
+caldac[8] gain=-2.0597(12)e-6 V/bit S_min=543.625 dof=254
 ai, bipolar voltage reference, low gain
-offset 4.99874(23), target 5
-caldac[0] gain=-2.46(20)e-6 V/bit S_min=300.762 dof=254
-caldac[1] gain=-7.8401(20)e-4 V/bit S_min=896.191 dof=254
-caldac[3] gain=-6.4592(21)e-4 V/bit S_min=1738.99 dof=254
-
+offset 4.998779( 0), target 5
+caldac[0] gain=-1.22230(53)e-4 V/bit S_min=57428.6 dof=254
+caldac[1] gain=-3.21(13)e-9 V/bit S_min=65141.7 dof=254
+caldac[2] gain=-5.99181(58)e-4 V/bit S_min=52709.2 dof=254
+caldac[3] gain=1.61(25)e-9 V/bit S_min=32726.9 dof=254
+caldac[4] gain=-7.63735(56)e-4 V/bit S_min=60697.6 dof=254
+caldac[5] gain=-5.35(50)e-9 V/bit S_min=16141.6 dof=254
+caldac[7] gain=3.15(13)e-9 V/bit S_min=65163.8 dof=254
+caldac[8] gain=-3.40(13)e-9 V/bit S_min=65061.7 dof=254
+caldac[9] gain=-6.10(38)e-9 V/bit S_min=21497.1 dof=254