Print Id without $. Additional info on 6071e.

diff --git a/comedi_calibrate/comedi_calibrate.c b/comedi_calibrate/comedi_calibrate.c
index 384983a62ec5bd265a73b732f7125fea4c453580..3079a01832aa3b1677c85c17973543d944416c22 100644 (file)
--- a/comedi_calibrate/comedi_calibrate.c
+++ b/comedi_calibrate/comedi_calibrate.c
@@ -185,7 +185,9 @@ ok:
                }
        }
        if(verbose>=0){
-               printf("$Id$\n");
+               char *s = "$Id$";
+
+               printf("%*s\n",strlen(s)-2,s+1);
                printf("Driver name: %s\n",drivername);
                printf("Device name: %s\n",devicename);
                printf("Comedi version: %d.%d.%d\n",

diff --git a/comedi_calibrate/ni.c b/comedi_calibrate/ni.c
index d5047a53a5f2ec6d439e20d19645498bce7077a1..1286ad7717e047f9572e6f65000c883c002f7c6d 100644 (file)
--- a/comedi_calibrate/ni.c
+++ b/comedi_calibrate/ni.c
@@ -67,7 +67,7 @@ struct board_struct boards[]={
        { "pci-mio-16e-1",      STATUS_DONE,    cal_ni_pci_mio_16e_1 },
        { "pci-6025e",          STATUS_GUESS,   cal_ni_pci_6025e },
        { "pci-6035e",          STATUS_GUESS,   cal_ni_pci_6035e },
-       { "pci-6071e",          STATUS_GUESS,   cal_ni_pci_6071e },
+       { "pci-6071e",          STATUS_SOME,    cal_ni_pci_6071e },
        { "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_GUESS,   cal_ni_pci_mio_16xe_50 },
@@ -85,7 +85,6 @@ struct board_struct boards[]={
 //     { "pci-6031e",          cal_ni_unknown },
 //     { "pci-6032e",          cal_ni_unknown },
 //     { "pci-6033e",          cal_ni_unknown },
-//     { "pci-6071e",          cal_ni_unknown },
        { "pci-6024e",          cal_ni_6023e }, // guess
        { "pxi-6025e",          cal_ni_6023e }, // guess
        { "pci-6034e",          cal_ni_6023e }, // guess
@@ -375,12 +374,17 @@ void cal_ni_pci_6035e(void)
 
 void cal_ni_pci_6071e(void)
 {
-       // 6071e (old)
        postgain_cal(ni_zero_offset_low,ni_zero_offset_high,1);
        cal1(ni_zero_offset_high,0);
        cal1(ni_reference_low,3);
+       cal1_fine(ni_reference_low,3);
        if(do_output){
-               // unknown
+               cal1(ni_ao0_zero_offset,5);
+               //cal1(ni_ao0_zero_offset,4); /* linearity? */
+               cal1(ni_ao0_reference,6); /* guess.  Doesn't show up correctly in dump */
+               cal1(ni_ao1_zero_offset,8);
+               //cal1(ni_ao1_zero_offset,7); /* linearity? */
+               cal1(ni_ao1_reference,9);
        }
 }