From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Tue, 31 Aug 2004 00:09:27 +0000 (+0000)
Subject: add support for at-mio-64e-3
X-Git-Tag: r0_7_22~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b956b0ceb49211046f07d721e939c8fedb452619;p=comedilib.git

add support for at-mio-64e-3
---

diff --git a/comedi_calibrate/ni.c b/comedi_calibrate/ni.c
index 2d61ab6..377b9a7 100644
--- a/comedi_calibrate/ni.c
+++ b/comedi_calibrate/ni.c
@@ -50,6 +50,7 @@ static void ni_setup_observables_611x( calibration_setup_t *setup );
 static void ni67xx_setup_observables( calibration_setup_t *setup );
 
 static int cal_ni_at_mio_16e_2(calibration_setup_t *setup);
+static int cal_ni_at_mio_64e_3(calibration_setup_t *setup);
 static int cal_ni_daqcard_ai_16xe_50(calibration_setup_t *setup);
 static int cal_ni_at_mio_16e_1(calibration_setup_t *setup);
 static int cal_ni_pci_mio_16e_1(calibration_setup_t *setup);
@@ -86,7 +87,7 @@ static struct board_struct boards[]={
 	{ "at-mio-16e-10", STATUS_DONE, cal_ni_at_mio_16e_10, ni_setup_observables, 0x1a7, 0x1a8 },
 	{ "at-mio-16xe-10", STATUS_UNKNOWN, NULL, ni_setup_observables, 0x1b7, 0x1b8 },
 	{ "at-mio-16xe-50", STATUS_SOME, cal_ni_at_mio_16xe_50, ni_setup_observables, 0x1b5, 0x1b6 },
-	{ "at-mio-64e-3", STATUS_UNKNOWN, NULL, ni_setup_observables, -1, -1},
+	{ "at-mio-64e-3", STATUS_SOME, cal_ni_at_mio_64e_3, ni_setup_observables, -1, -1},
 	{ "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 },
@@ -1201,6 +1202,33 @@ static int cal_ni_daqcard_6036e( calibration_setup_t *setup )
 	return cal_ni_generic( setup, &layout );
 }
 
+static int cal_ni_at_mio_64e_3( calibration_setup_t *setup )
+{
+	ni_caldac_layout_t layout;
+
+	if( comedi_get_version_code( setup->dev ) <= COMEDI_VERSION_CODE( 0, 7, 68 ) )
+	{
+		DPRINT(0, "WARNING: you need comedi driver version 0.7.69 or later\n"
+		 "for this calibration to work properly\n" );
+	}
+
+	init_ni_caldac_layout( &layout );
+	
+	layout.adc_pregain_offset = 8;
+	layout.adc_postgain_offset = 4;
+	layout.adc_gain = 2;
+
+	layout.dac_offset[0] = 6;
+	layout.dac_gain[0] = 14;
+	layout.dac_linearity[0] = 10;
+
+	layout.dac_offset[ 1 ] = 9;
+	layout.dac_gain[ 1 ] = 5;
+	layout.dac_linearity[1] = 1;
+
+	return cal_ni_generic( setup, &layout );
+}
+
 static void prep_adc_caldacs_generic( calibration_setup_t *setup,
 	const ni_caldac_layout_t *layout, unsigned int range )
 {