From d8295dcac2de30542e42a89576e49efdb4172a94 Mon Sep 17 00:00:00 2001
From: Rolf Bork <rolf.bork@ligo.org>
Date: Fri, 4 Jan 2013 22:57:43 +0000
Subject: [PATCH] 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
---
src/fe/controller.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/fe/controller.c b/src/fe/controller.c
index d24ca930a..df377398c 100644
--- a/src/fe/controller.c
+++ b/src/fe/controller.c
@@ -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;
--
GitLab