stv0g/comedilib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed 6035 dac1 offset caldac, added inactive 6071e calibration guess

Browse source 
for an ad8804 style caldac
This commit is contained in:
Frank Mori Hess 2003-05-03 01:11:01 +00:00
parent 04269a12c3
commit 9860fabdf2
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
comedi_calibrate/ni.c
View file

@ -764,7 +764,7 @@ static int cal_ni_pci_6035e(calibration_setup_t *setup)
layout.dac_offset[ 0 ] = 6;
layout.dac_gain[ 0 ] = 11;
layout.dac_linearity[ 0 ] = 10;
layout.dac_offset[ 1 ] = 0;
layout.dac_offset[ 1 ] = 9;
layout.dac_gain[ 1 ] = 5;
layout.dac_linearity[ 1 ] = 1;
@ -776,18 +776,30 @@ static int cal_ni_pci_6071e(calibration_setup_t *setup)
ni_caldac_layout_t layout;
init_ni_caldac_layout( &layout );
#if 1
/* this is as good as can be done with driver set to mb88341 caldac */
layout.adc_pregain_offset = 0;
layout.adc_postgain_offset = 1;
layout.adc_gain = 3;
layout.dac_offset[ 0 ] = 5;
/* caldac 6 should most likely be AO0 reference, but it
* isn't. */
/* layout.dac_gain[ 0 ] = 6; */
/* layout.dac_gain[ 0 ] = ; */
layout.dac_linearity[ 0 ] = 4;
layout.dac_offset[ 1 ] = 8;
layout.dac_gain[ 1 ] = 9;
/* layout.dac_gain[ 1 ] = ; */
layout.dac_linearity[ 1 ] = 7;
#else
/* converted working caldacs to ad8804 addressing */
layout.adc_pregain_offset = 0; /* guess due to similarity to 6035 */
layout.adc_pregain_offset_fine = 8; /* corresponds to pregain_offset for mb88341 style above*/
layout.adc_postgain_offset = 4;
layout.adc_gain = 2;
layout.dac_offset[ 0 ] = 6;
layout.dac_gain[ 0 ] = 11; /* guess due to similarity to 6035 */
layout.dac_linearity[ 0 ] = 10;
layout.dac_offset[ 1 ] = 9;
layout.dac_gain[ 1 ] = 5; /* guess due to similarity to 6035 */
layout.dac_linearity[ 1 ] = 1;
#endif
return cal_ni_generic( setup, &layout );
}