From 92071f023e71f8bbf917ba2cc961a4adf2716b7b Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Tue, 2 Apr 2024 15:40:44 +0200 Subject: [PATCH] feat: Expanded timestamp error with the EVR model. --- evrMrmApp/src/drvem.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evrMrmApp/src/drvem.cpp b/evrMrmApp/src/drvem.cpp index 2f44e7c3..faa0dd70 100644 --- a/evrMrmApp/src/drvem.cpp +++ b/evrMrmApp/src/drvem.cpp @@ -595,7 +595,7 @@ void EVRMRM::clockSet(double freq) eventClock = (clk == 0.0) ? clk_soft : clk; } - printf("Set EVR %s clock %f newfrac %d (oldfrac %d)\n", model().c_str(), eventClock, newfrac, oldfrac); + printf("Set EVR %s %s clock %f newfrac %d (oldfrac %d)\n", model().c_str(), name().c_str(), eventClock, newfrac, oldfrac); // USecDiv is accessed as a 32 bit register, but // only 16 are used. @@ -867,8 +867,8 @@ EVRMRM::convertTS(epicsTimeStamp* ts) */ if(ts->secPastEpoch > lastValidTimestamp+1) { - errlogPrintf("EVR ignoring invalid TS %08x %08x (expect %08x)\n", - ts->secPastEpoch, ts->nsec, lastValidTimestamp); + errlogPrintf("EVR %s %s ignoring invalid TS %08x %08x (expect %08x)\n", + model().c_str(), name().c_str(), ts->secPastEpoch, ts->nsec, lastValidTimestamp); timestampValid=0; scanIoRequest(timestampValidChange); return false;