Skip to content

Commit

Permalink
feat: Expanded timestamp error with the EVR model.
Browse files Browse the repository at this point in the history
  • Loading branch information
jerzyjamroz committed Apr 3, 2024
1 parent 46c7055 commit 4975537
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions evrMrmApp/src/drvem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4975537

Please sign in to comment.