Update 6024e status to STATUS_DONE, and update results for same.

diff --git a/comedi_calibrate/ni.c b/comedi_calibrate/ni.c
index 44e7732afc9a691eda3aa088bf7ea9fd820e13ce..45c3d5691cc637f2333c3272f3298c6b3ba9a687 100644 (file)
--- a/comedi_calibrate/ni.c
+++ b/comedi_calibrate/ni.c
@@ -100,7 +100,7 @@ static struct board_struct boards[]={
        { "pci-mio-16xe-50", STATUS_SOME, cal_ni_pci_mio_16xe_50, ni_setup_observables, 0x1b5, 0x1b6 },
        { "pci-6014", STATUS_DONE, cal_ni_pci_6014, ni_setup_observables, 0x1ab, 0x1ac },
        { "pci-6023e", STATUS_DONE, cal_ni_pci_6023e, ni_setup_observables, 0x1bb, 0x1bc },
-       { "pci-6024e", STATUS_SOME, cal_ni_pci_6024e, ni_setup_observables, 0x1af, 0x1b0 },
+       { "pci-6024e", STATUS_DONE, cal_ni_pci_6024e, ni_setup_observables, 0x1af, 0x1b0 },
        { "pci-6025e", STATUS_SOME, cal_ni_pci_6025e, ni_setup_observables, 0x1af, 0x1b0 },
        { "pci-6031e", STATUS_DONE, cal_ni_pci_mio_16xe_10, ni_setup_observables, 0x1ae, 0x1af },
        { "pci-6032e", STATUS_DONE, cal_ni_pci_6032e, ni_setup_observables, 0x1ae, 0x1af },

diff --git a/comedi_calibrate/results/pci-6024e b/comedi_calibrate/results/pci-6024e
index 076d328686f3f3646ebfcd6bb4fbbe33a4d42d3e..2584ef2084092fa1857530ae699c45fc43dd0dbf 100644 (file)
--- a/comedi_calibrate/results/pci-6024e
+++ b/comedi_calibrate/results/pci-6024e
@@ -1,64 +1,170 @@
-Warning: device not fully calibrated due to insufficient information
-Please send this output to <ds@schleef.org>
-$Id$
+eeprom reference lsb=244 msb=255
+resulting reference voltage: 4.99999
+Warning: device may not be not fully calibrated due to insufficient information.
+Please file a bug report at https://bugs.comedi.org/ and attach this output.
+This output will also allow comedi_calibrate to execute more
+quickly in the future.
+Forcing option: --verbose
+Forcing options: --reset --dump --calibrate --results
+Id: comedi_calibrate.c,v 1.92 2004/03/29 01:34:15 fmhess Exp 
 Driver name: ni_pcimio
 Device name: pci-6024e
-Comedi version: 0.7.64
+Id: ni.c,v 1.136 2005/09/09 01:06:25 fmhess Exp 
+Comedi version: 0.7.70
 ai, bipolar zero offset, low gain
-offset -10.00(24)e-3, target 0
-caldac[0] gain=-1.1800(21)e-4 V/bit S_min=280.958 dof=254
-caldac[2] gain=1.87(21)e-6 V/bit S_min=193.749 dof=254
-caldac[4] gain=-7.6715(21)e-4 V/bit S_min=499.281 dof=254
-caldac[8] gain=-1.81(21)e-6 V/bit S_min=220.858 dof=254
+reading 0.029232(87), target 0
+caldac[0] gain=-1.176(12)e-4 V/bit S_min=1.56105 dof=14
+caldac[4] gain=-7.746(12)e-4 V/bit S_min=9.60921 dof=14
 ai, bipolar zero offset, high gain
-offset -7.135(17)e-4, target 0
-caldac[0] gain=-1.186664(24)e-4 V/bit S_min=14002 dof=254
-caldac[2] gain=8.33(15)e-8 V/bit S_min=247.089 dof=254
-caldac[4] gain=-3.8200(16)e-6 V/bit S_min=228.502 dof=254
-caldac[8] gain=-2.0558(16)e-6 V/bit S_min=237.984 dof=254
+reading 2.6042(64)e-4, target 0
+caldac[0] gain=-1.182947(87)e-4 V/bit S_min=519.555 dof=14
+caldac[4] gain=-3.8679(87)e-6 V/bit S_min=2.66936 dof=14
+caldac[8] gain=-2.0382(88)e-6 V/bit S_min=1.1106 dof=14
 ai, bipolar voltage reference, low gain
-offset 4.98417(25), target 5
-caldac[0] gain=-1.1866(21)e-4 V/bit S_min=263.842 dof=254
-caldac[2] gain=-5.5445(21)e-4 V/bit S_min=367.47 dof=254
-caldac[4] gain=-7.5714(21)e-4 V/bit S_min=670.065 dof=254
-caldac[8] gain=-2.30(21)e-6 V/bit S_min=229.331 dof=254
-(null)
-offset -3.3(16)e-3, target 0
-caldac[0] gain=-1.1843(21)e-4 V/bit S_min=1418.02 dof=254
-caldac[2] gain=2.00(21)e-6 V/bit S_min=1295.96 dof=254
-caldac[4] gain=-7.6565(21)e-4 V/bit S_min=1377.87 dof=254
-caldac[8] gain=-2.87(21)e-6 V/bit S_min=1348.43 dof=254
+reading 5.026595(86), target 4.99999
+caldac[0] gain=-1.133(12)e-4 V/bit S_min=6.12079 dof=14
+caldac[2] gain=-5.753(12)e-4 V/bit S_min=23.6343 dof=14
+caldac[4] gain=-7.701(12)e-4 V/bit S_min=7.8218 dof=14
 ao 0, zero offset, low gain
-offset -6.37(27)e-3, target 0.002442
-caldac[0] gain=-1.1821(21)e-4 V/bit S_min=255.921 dof=254
-caldac[2] gain=1.28(21)e-6 V/bit S_min=275.428 dof=254
-caldac[4] gain=-7.6712(21)e-4 V/bit S_min=638.13 dof=254
-caldac[6] gain=-7.7412(21)e-4 V/bit S_min=446.921 dof=254
-caldac[8] gain=-2.15(21)e-6 V/bit S_min=281.027 dof=254
-caldac[10] gain=-1.1488(21)e-4 V/bit S_min=298.687 dof=254
+reading 0.022865(84), target 0.002442
+caldac[0] gain=-1.168(12)e-4 V/bit S_min=1.88818 dof=14
+caldac[4] gain=-7.752(12)e-4 V/bit S_min=7.0134 dof=14
+caldac[6] gain=-7.809(12)e-4 V/bit S_min=4.66646 dof=14
+caldac[10] gain=-1.158(12)e-4 V/bit S_min=1.64498 dof=14
 ao 0, reference voltage, low gain
-offset -6.68(23)e-3, target -0.001221
-caldac[0] gain=-1.1941(21)e-4 V/bit S_min=237.893 dof=254
-caldac[2] gain=1.12(21)e-6 V/bit S_min=266.743 dof=254
-caldac[4] gain=-7.6685(21)e-4 V/bit S_min=607.853 dof=254
-caldac[6] gain=-7.7408(21)e-4 V/bit S_min=411.917 dof=254
-caldac[8] gain=-1.99(21)e-6 V/bit S_min=222.252 dof=254
-caldac[10] gain=-1.4022(21)e-4 V/bit S_min=298.546 dof=254
-caldac[11] gain=-1.6214(21)e-4 V/bit S_min=266.605 dof=254
+reading 8.029337(86), target 8.00244
+caldac[0] gain=-1.177(12)e-4 V/bit S_min=0.85016 dof=14
+caldac[2] gain=-9.273(12)e-4 V/bit S_min=39.3068 dof=14
+caldac[4] gain=-7.742(12)e-4 V/bit S_min=2.03086 dof=14
+caldac[6] gain=-7.795(12)e-4 V/bit S_min=3.40193 dof=14
+caldac[10] gain=-1.771(12)e-4 V/bit S_min=1.47652 dof=14
+caldac[11] gain=-2.597(12)e-4 V/bit S_min=1.1089 dof=14
+ao 0, linearity (mid), low gain
+reading 4.025956(87), target 4.00244
+caldac[0] gain=-1.184(12)e-4 V/bit S_min=0.96322 dof=14
+caldac[2] gain=-4.623(12)e-4 V/bit S_min=13.4655 dof=14
+caldac[4] gain=-7.712(12)e-4 V/bit S_min=1.8761 dof=14
+caldac[6] gain=-7.760(12)e-4 V/bit S_min=1.2733 dof=14
+caldac[10] gain=-1.613(12)e-4 V/bit S_min=0.40564 dof=14
+caldac[11] gain=-1.299(12)e-4 V/bit S_min=1.28949 dof=14
 ao 1, zero offset, low gain
-offset -9.62(26)e-3, target 0.002442
-caldac[0] gain=-1.1795(21)e-4 V/bit S_min=242.998 dof=254
-caldac[1] gain=-1.1381(21)e-4 V/bit S_min=282.347 dof=254
-caldac[2] gain=1.61(21)e-6 V/bit S_min=206.395 dof=254
-caldac[4] gain=-7.6722(21)e-4 V/bit S_min=589.502 dof=254
-caldac[8] gain=-1.99(21)e-6 V/bit S_min=216.263 dof=254
-caldac[9] gain=-7.7213(21)e-4 V/bit S_min=522.46 dof=254
+reading 0.047505(87), target 0.002442
+caldac[0] gain=-1.180(12)e-4 V/bit S_min=1.59769 dof=14
+caldac[1] gain=-1.155(12)e-4 V/bit S_min=0.958024 dof=14
+caldac[4] gain=-7.751(12)e-4 V/bit S_min=6.40186 dof=14
+caldac[9] gain=-7.782(12)e-4 V/bit S_min=13.1514 dof=14
 ao 1, reference voltage, low gain
-offset -0.01156(24), target -0.001221
-caldac[0] gain=-1.1918(21)e-4 V/bit S_min=279.931 dof=254
-caldac[1] gain=-1.3938(21)e-4 V/bit S_min=270.765 dof=254
-caldac[2] gain=1.81(21)e-6 V/bit S_min=241.594 dof=254
-caldac[4] gain=-7.6720(21)e-4 V/bit S_min=535.125 dof=254
-caldac[5] gain=-1.6260(21)e-4 V/bit S_min=272.498 dof=254
-caldac[8] gain=-2.05(21)e-6 V/bit S_min=218.817 dof=254
-caldac[9] gain=-7.7226(21)e-4 V/bit S_min=568.444 dof=254
+reading 8.055436(86), target 8.00244
+caldac[0] gain=-1.175(12)e-4 V/bit S_min=0.786708 dof=14
+caldac[1] gain=-1.769(12)e-4 V/bit S_min=1.16282 dof=14
+caldac[2] gain=-9.299(12)e-4 V/bit S_min=40.0402 dof=14
+caldac[4] gain=-7.737(12)e-4 V/bit S_min=3.53267 dof=14
+caldac[5] gain=-2.596(12)e-4 V/bit S_min=0.914595 dof=14
+caldac[9] gain=-7.776(12)e-4 V/bit S_min=5.69436 dof=14
+ao 1, linearity (mid), low gain
+reading 4.051516(85), target 4.00244
+caldac[0] gain=-1.183(12)e-4 V/bit S_min=1.09631 dof=14
+caldac[1] gain=-1.614(12)e-4 V/bit S_min=1.67152 dof=14
+caldac[2] gain=-4.640(12)e-4 V/bit S_min=9.11251 dof=14
+caldac[4] gain=-7.709(12)e-4 V/bit S_min=2.18383 dof=14
+caldac[5] gain=-1.307(12)e-4 V/bit S_min=0.651125 dof=14
+caldac[9] gain=-7.738(12)e-4 V/bit S_min=6.27676 dof=14
+relative binary: ai, bipolar zero offset, low gain, ai, bipolar voltage reference, low gain
+caldac[2] set to 123
+relative binary: ai, bipolar zero offset, low gain, ai, bipolar zero offset, high gain
+caldac[4] set to 164
+binary: ai, bipolar zero offset, high gain
+caldac[0] set to 127
+binary: ai, bipolar zero offset, high gain
+caldac[8] set to 183
+linearity binary: ao 0, zero offset, low gain,
+ao 0, linearity (mid), low gain,
+ao 0, reference voltage, low gain
+caldac[10] set to 138
+binary: ao 0, zero offset, low gain
+caldac[6] set to 114
+binary: ao 0, reference voltage, low gain
+caldac[11] set to 165
+linearity binary: ao 1, zero offset, low gain,
+ao 1, linearity (mid), low gain,
+ao 1, reference voltage, low gain
+caldac[1] set to 127
+binary: ao 1, zero offset, low gain
+caldac[9] set to 147
+binary: ao 1, reference voltage, low gain
+caldac[5] set to 175
+writing calibration to /usr/local/var/lib/comedi/calibrations/ni_pcimio_pci-6024e_comedi0
+ai, bipolar zero offset, low gain
+applied calibration for subdev 0, channel 0, range 0, aref 3
+reading 1.57(89)e-4, target 0
+caldac[0] gain=-1.238(12)e-4 V/bit S_min=8.92001 dof=14
+caldac[4] gain=-7.759(12)e-4 V/bit S_min=12.673 dof=14
+ai, bipolar zero offset, high gain
+applied calibration for subdev 0, channel 0, range 3, aref 3
+reading 7.2(67)e-7, target 0
+caldac[0] gain=-1.183379(87)e-4 V/bit S_min=497.471 dof=14
+caldac[4] gain=-3.8764(88)e-6 V/bit S_min=2.59514 dof=14
+caldac[8] gain=-2.0601(88)e-6 V/bit S_min=2.85619 dof=14
+ai, bipolar voltage reference, low gain
+applied calibration for subdev 0, channel 5, range 0, aref 3
+reading 5.000486(83), target 4.99999
+caldac[0] gain=-1.209(12)e-4 V/bit S_min=5.95325 dof=14
+caldac[2] gain=-5.724(11)e-4 V/bit S_min=9.53658 dof=14
+caldac[4] gain=-7.707(12)e-4 V/bit S_min=8.39882 dof=14
+ao 0, zero offset, low gain
+applied calibration for subdev 1, channel 0, range 0, aref 0
+applied calibration for subdev 0, channel 2, range 0, aref 3
+reading 3.129(93)e-3, target 0.002442
+caldac[0] gain=-1.233(12)e-4 V/bit S_min=6.87263 dof=14
+caldac[4] gain=-7.755(12)e-4 V/bit S_min=10.4787 dof=14
+caldac[6] gain=-7.812(12)e-4 V/bit S_min=7.71422 dof=14
+caldac[10] gain=-1.220(12)e-4 V/bit S_min=8.50866 dof=14
+ao 0, reference voltage, low gain
+applied calibration for subdev 1, channel 0, range 0, aref 0
+applied calibration for subdev 0, channel 2, range 0, aref 3
+reading 8.002528(86), target 8.00244
+caldac[0] gain=-1.187(12)e-4 V/bit S_min=1.59891 dof=14
+caldac[2] gain=-9.236(12)e-4 V/bit S_min=38.2312 dof=14
+caldac[4] gain=-7.749(12)e-4 V/bit S_min=2.6078 dof=14
+caldac[6] gain=-7.795(12)e-4 V/bit S_min=1.67777 dof=14
+caldac[10] gain=-1.786(12)e-4 V/bit S_min=1.84272 dof=14
+caldac[11] gain=-2.603(12)e-4 V/bit S_min=2.76891 dof=14
+ao 0, linearity (mid), low gain
+applied calibration for subdev 1, channel 0, range 0, aref 0
+applied calibration for subdev 0, channel 2, range 0, aref 3
+reading 4.002719(85), target 4.00244
+caldac[0] gain=-1.190(12)e-4 V/bit S_min=0.920085 dof=14
+caldac[2] gain=-4.588(12)e-4 V/bit S_min=10.1437 dof=14
+caldac[4] gain=-7.713(12)e-4 V/bit S_min=3.95375 dof=14
+caldac[6] gain=-7.778(12)e-4 V/bit S_min=3.75289 dof=14
+caldac[10] gain=-1.611(12)e-4 V/bit S_min=0.720738 dof=14
+caldac[11] gain=-1.295(12)e-4 V/bit S_min=0.763158 dof=14
+ao 1, zero offset, low gain
+applied calibration for subdev 1, channel 1, range 0, aref 0
+applied calibration for subdev 0, channel 3, range 0, aref 3
+reading 3.448(89)e-3, target 0.002442
+caldac[0] gain=-1.232(12)e-4 V/bit S_min=5.6879 dof=14
+caldac[1] gain=-1.224(12)e-4 V/bit S_min=6.75919 dof=14
+caldac[4] gain=-7.754(12)e-4 V/bit S_min=8.34611 dof=14
+caldac[9] gain=-7.793(12)e-4 V/bit S_min=12.611 dof=14
+ao 1, reference voltage, low gain
+applied calibration for subdev 1, channel 1, range 0, aref 0
+applied calibration for subdev 0, channel 3, range 0, aref 3
+reading 8.002399(88), target 8.00244
+caldac[0] gain=-1.179(12)e-4 V/bit S_min=1.52721 dof=14
+caldac[1] gain=-1.774(12)e-4 V/bit S_min=0.777603 dof=14
+caldac[2] gain=-9.237(12)e-4 V/bit S_min=39.6389 dof=14
+caldac[4] gain=-7.744(12)e-4 V/bit S_min=2.67727 dof=14
+caldac[5] gain=-2.605(12)e-4 V/bit S_min=1.53475 dof=14
+caldac[9] gain=-7.777(12)e-4 V/bit S_min=8.5348 dof=14
+ao 1, linearity (mid), low gain
+applied calibration for subdev 1, channel 1, range 0, aref 0
+applied calibration for subdev 0, channel 3, range 0, aref 3
+reading 4.002862(87), target 4.00244
+caldac[0] gain=-1.177(12)e-4 V/bit S_min=0.832675 dof=14
+caldac[1] gain=-1.609(12)e-4 V/bit S_min=0.821793 dof=14
+caldac[2] gain=-4.590(12)e-4 V/bit S_min=13.6751 dof=14
+caldac[4] gain=-7.713(12)e-4 V/bit S_min=4.8925 dof=14
+caldac[5] gain=-1.306(12)e-4 V/bit S_min=1.46232 dof=14
+caldac[9] gain=-7.751(12)e-4 V/bit S_min=5.65103 dof=14
+Applied calibration for subdevice 0, channel 0, range 0, aref 0