diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc index c7b78220634d91b7f02ab0319e864e7658b0edbb..c296fa1993ff07ed9384981a0a8dcf36c0f03555 100644 --- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc +++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc @@ -375,6 +375,24 @@ GCFEvent::TResult ObservationControl::active_state(GCFEvent& event, GCFPortInter itsStopTimer = itsTimerPort->setTimer(0.0); // expire immediately break; } + // ----- The next events from parent control are implemented for ControllerMenu ---- + case CONTROL_CLAIM: + itsTimerPort->cancelTimer(itsClaimTimer); + itsClaimTimer = itsTimerPort->setTimer(0.0); + break; + case CONTROL_PREPARE: + itsTimerPort->cancelTimer(itsPrepareTimer); + itsPrepareTimer = itsTimerPort->setTimer(0.0); + break; + case CONTROL_RESUME: + itsTimerPort->cancelTimer(itsStartTimer); + itsStartTimer = itsTimerPort->setTimer(0.0); + break; + case CONTROL_SUSPEND: // Note: SUSPEND, RELEASE and QUIT will result in QUIT. + case CONTROL_RELEASE: + itsTimerPort->cancelTimer(itsStopTimer); + itsStopTimer = itsTimerPort->setTimer(0.0); + break; // -------------------- EVENT RECEIVED FROM CHILD CONTROL -------------------- case CONTROL_STARTED: { diff --git a/MAC/MACIO/src/GCF_Event.cc b/MAC/MACIO/src/GCF_Event.cc index 5c953c8013f7d99e7609eac23aeefa26c824235f..6d69cf537285693c97497021f6ef33c965b9892a 100644 --- a/MAC/MACIO/src/GCF_Event.cc +++ b/MAC/MACIO/src/GCF_Event.cc @@ -37,7 +37,7 @@ namespace LOFAR { // GCFEvent::~GCFEvent() { - LOG_TRACE_CALC(formatString("~GCFEvent: length=%d, _buffer=%08X", length, _buffer)); + LOG_TRACE_CALC(formatString("~GCFEvent: signal=%04X, length=%d, _buffer=%08X", signal, length, _buffer)); if (_buffer) { delete [] _buffer;