Add DAQCard-6024E
This commit is contained in:
parent
9923c8133c
commit
8d84736def
1 changed files with 22 additions and 2 deletions
|
@ -74,6 +74,7 @@ static int cal_ni_daqcard_ai_16e_4(calibration_setup_t *setup);
|
|||
static int cal_ni_pci_611x(calibration_setup_t *setup);
|
||||
static int cal_ni_pci_mio_16e_4(calibration_setup_t *setup);
|
||||
static int cal_ni_daqcard_6062e(calibration_setup_t *setup);
|
||||
static int cal_ni_daqcard_6024e(calibration_setup_t *setup);
|
||||
|
||||
static double ni_get_reference( calibration_setup_t *setup, int lsb_loc,int msb_loc);
|
||||
|
||||
|
@ -99,7 +100,7 @@ static struct board_struct boards[]={
|
|||
{ "pci-6110", STATUS_DONE, cal_ni_pci_611x, ni_setup_observables_611x, 0x1d4, 0x1d5 },
|
||||
{ "pci-6111", STATUS_DONE, cal_ni_pci_611x, ni_setup_observables_611x, 0x1d4, 0x1d5 },
|
||||
{ "DAQCard-6062E", STATUS_DONE, cal_ni_daqcard_6062e, ni_setup_observables, 0x1a9, 0x1aa },
|
||||
{ "DAQCard-6024E", STATUS_UNKNOWN, NULL, ni_setup_observables, -1, -1 },
|
||||
{ "DAQCard-6024E", STATUS_UNKNOWN, cal_ni_daqcard_6024e, ni_setup_observables, -1, -1 },
|
||||
{ "at-mio-16de-10", STATUS_UNKNOWN, NULL, ni_setup_observables, 0x1a7, 0x1a8 },
|
||||
{ "at-mio-16xe-10", STATUS_UNKNOWN, NULL, ni_setup_observables, 0x1b7, 0x1b8 },
|
||||
{ "at-ai-16xe-10", STATUS_UNKNOWN, NULL, ni_setup_observables, 0x1b7, 0x1b8 },
|
||||
|
@ -1051,6 +1052,26 @@ static int cal_ni_daqcard_6062e( calibration_setup_t *setup )
|
|||
return cal_ni_generic( setup, &layout );
|
||||
}
|
||||
|
||||
static int cal_ni_daqcard_6024e( calibration_setup_t *setup )
|
||||
{
|
||||
ni_caldac_layout_t layout;
|
||||
|
||||
init_ni_caldac_layout( &layout );
|
||||
|
||||
layout.adc_pregain_offset = 0;
|
||||
layout.adc_postgain_offset = 4;
|
||||
layout.adc_gain = 2;
|
||||
//layout.adc_unip_offset = 7;
|
||||
layout.dac_offset[ 0 ] = 6;
|
||||
layout.dac_gain[ 0 ] = 3;
|
||||
//layout.dac_linearity[ 0 ] = 10;
|
||||
layout.dac_offset[ 1 ] = 1;
|
||||
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 )
|
||||
{
|
||||
|
@ -1313,4 +1334,3 @@ static void ni_mio_ai_postgain_cal_2(int chan,int dac,int range_lo,int range_hi,
|
|||
update_caldac(dac);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue