Skip to content
Snippets Groups Projects
Commit d8295dca authored by Rolf Bork's avatar Rolf Bork
Browse files

Fixed bug in RFM own-data checking introduced when I changed to driver code.

git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@3175 6dcd42c9-f523-4c6d-aada-af552506706e
parent e62e6c4c
No related branches found
No related tags found
No related merge requests found
......@@ -956,6 +956,12 @@ udelay(1000);
// adcData is the integer representation of the ADC data
adcData[jj][ii] = (*packedData & mask);
adcData[jj][ii] -= offset;
#ifdef DEC_TEST
if(ii==0)
{
adcData[jj][ii] = dspPtr[0]->data[0].exciteInput;
}
#endif
// dWord is the double representation of the ADC data
// This is the value used by the rest of the code calculations.
dWord[jj][ii] = adcData[jj][ii];
......@@ -1689,7 +1695,8 @@ udelay(1000);
if (cdsPciModules.rfmCount > 0) {
if (cycleNum >= HKP_RFM_CHK_CYCLE && cycleNum < (HKP_RFM_CHK_CYCLE + cdsPciModules.rfmCount)) {
int mod = cycleNum - HKP_RFM_CHK_CYCLE;
vmic5565CheckOwnDataRcv(mod);
status = vmic5565CheckOwnDataRcv(mod);
if(!status) ipcErrBits |= 4 + (mod * 4);
}
if (cycleNum >= (HKP_RFM_CHK_CYCLE + cdsPciModules.rfmCount) && cycleNum < (HKP_RFM_CHK_CYCLE + cdsPciModules.rfmCount*2)) {
int mod = cycleNum - HKP_RFM_CHK_CYCLE - cdsPciModules.rfmCount;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment