diff --git a/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.cc b/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.cc index 27d50719eeee7915f12553f3209476465bc830cd..2c94ad5440f131d0153beded37bfdb109ef9b23c 100644 --- a/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.cc +++ b/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControl.cc @@ -72,7 +72,8 @@ DigitalBoardControl::DigitalBoardControl(const string& cntlrName) : // for now itsClock = globalParameterSet()->getUint32(itsTreePrefix + "sampleClock"); - LOG_INFO_STR("MACProcessScope: " << itsTreePrefix + cntlrName); + // TODO + LOG_INFO("MACProcessScope: LOFAR.PermSW.iDigBoardCtrl"); // need port for timers. itsTimerPort = new GCFTimerPort(*this, "TimerPort"); @@ -160,6 +161,14 @@ void DigitalBoardControl::handlePropertySetAnswer(GCFEvent& answer) case F_VCHANGEMSG: { // check which property changed GCFPropValueEvent* pPropAnswer=static_cast<GCFPropValueEvent*>(&answer); + + // don't watch state and error fields. + if ((strstr(pPropAnswer->pPropName, PVSSNAME_FSM_STATE) != 0) || + (strstr(pPropAnswer->pPropName, PVSSNAME_FSM_ERROR) != 0) || + (strstr(pPropAnswer->pPropName, PVSSNAME_FSM_LOGMSG) != 0)) { + return; + } + if (strstr(pPropAnswer->pPropName, PN_SC_CLOCK) != 0) { itsClock =(static_cast<const GCFPVInteger*>(pPropAnswer->pValue))->getValue(); LOG_DEBUG_STR("Received clock change from PVSS, clock is now " << itsClock); diff --git a/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControlDefines.h b/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControlDefines.h index ceee8c8f1fd2a2050ca7bd100c356d49c6c49d80..9e9f1f0e84bfd342083b977e5d3d8ac14d6f8669 100644 --- a/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControlDefines.h +++ b/MAC/APL/StationCU/src/DigitalBoardControl/DigitalBoardControlDefines.h @@ -39,6 +39,7 @@ namespace LOFAR { // next lines should be defined somewhere in Common. #define PVSSNAME_FSM_STATE "state" #define PVSSNAME_FSM_ERROR "error" +#define PVSSNAME_FSM_LOGMSG "logmsg" }; // StationCU