Merge branch 'ICSHWI-22046' into 'master'

Overwrite default initial values

See merge request epics-modules/adorca!30

ADOrcaApp/Db/orca.template

@@ -109,6 +109,14 @@ record("*", "$(P)$(R)AcquirePeriod_RBV") {
     field(FLNK, "$(P)$(R)#EVRAcquireTime-S.PROC PP MS")
 }
 
+record("*", "$(P)$(R)AcquireTime") {
+    field(VAL, "0.9")
+}
+
+record("*", "$(P)$(R)AcquirePeriod") {
+    field(VAL, "1")
+}
+
 record(calcout, "$(P)$(R)#EVRAcquireTime-S") {
     field(DESC, "Set EVR acquire time in seconds")
     field(CALC, "A=0?B:A*B")

ADOrcaApp/src/orca.cpp

@@ -834,6 +834,7 @@ void Orca::imageTask() {
   uint64_t prevAcquisitionCount = 0;
   DCAMCAP_TRANSFERINFO captransferinfo;
   epicsTimeStamp prevAcqTime, currentAcqTime;
+  epicsTimeStamp acqTimestamp;
   epicsTimeStamp prev_trigger_time, current_trigger_time;
   double elapsedTime;
   int evr_counts = 0;
@@ -841,6 +842,7 @@ void Orca::imageTask() {
   double maxAcqusitionTime, acqusitionRate;
   int triggerMode = DCAMPROP_TRIGGERSOURCE__INTERNAL;
   int triggerActive;
+  char buf[256];
 
   lock();
   while (1) {
@@ -875,7 +877,7 @@ void Orca::imageTask() {
 
     // get image transfer status.
     unlock();
-    imageTransferStatus(m_hdcam, captransferinfo);
+    imageTransferStatus(m_hdcam, captransferinfo, buf);
     lock();
 
     if (prevAcquisitionCount < (uint64_t)captransferinfo.nFrameCount) {
@@ -926,18 +928,19 @@ void Orca::imageTask() {
         // Update asyn parameters
         setIntegerParam(evrCountsSinceAcqStart, evr_counts_since_last_start);
         setIntegerParam(evrTriggerDropped, evr_trigger_dropped);
-        char buf[256];
-        getStringParam(evrTimeStamp, 256, buf);
 
         // remember parsed timestamp values
-        sscanf(buf, "%u.%u", &mTimeStampSec, &mTimeStampNsec);
+        sscanf(buf, "%u.%u", &acqTimestamp.secPastEpoch, &acqTimestamp.nsec);
-        timestamp = mTimeStampSec + mTimeStampNsec / 1.e9;
+        acqTimestamp.secPastEpoch -= POSIX_TIME_AT_EPICS_EPOCH;
-        FLOW_ARGS("mTimeStampSec: %u - mTimeStampNsec: %u\n", mTimeStampSec,
+
-                  mTimeStampNsec);
+        timestamp = acqTimestamp.secPastEpoch + acqTimestamp.nsec / 1.e9;
+        FLOW_ARGS("acqTimestamp.secPastEpoch: %u - acqTimestamp.nsec: %u\n", acqTimestamp.secPastEpoch,
+                  acqTimestamp.nsec);
         FLOW_ARGS("Timestamp from evr: %f\n", timestamp);
 
 
       } else {
+        updateTimeStamp(&acqTimestamp);
         timestamp =
             (ts_sec + ts_microsec / 1.0e6) - (exposure_time + readout_time);
         FLOW_ARGS("Timestamp from camera: %f\n", timestamp);
@@ -967,7 +970,7 @@ void Orca::imageTask() {
         if (pImage) {
           pImage->uniqueId = count;
           pImage->timeStamp = timestamp;
-          updateTimeStamp(&pImage->epicsTS);
+          pImage->epicsTS = acqTimestamp;
 
           memcpy(pImage->pData, (epicsUInt16*)image, pImage->dataSize);
 
@@ -1742,7 +1745,7 @@ void Orca::getImageInformation(HDCAM hdcam, int32& pixeltype, int32& width,
 }
 
 asynStatus Orca::imageTransferStatus(HDCAM hdcam,
-                                     DCAMCAP_TRANSFERINFO& captransferinfo) {
+                                     DCAMCAP_TRANSFERINFO& captransferinfo, char *buf) {
   DCAMERR err;
   const char* functionName = "imageTransferStatus";
   memset(&captransferinfo, 0, sizeof(captransferinfo));
@@ -1750,6 +1753,7 @@ asynStatus Orca::imageTransferStatus(HDCAM hdcam,
 
   // get number of captured image
   err = dcamcap_transferinfo(m_hdcam, &captransferinfo);
+  getStringParam(evrTimeStamp, 256, buf);
   if (failed(err)) {
     ERR_ARGS("DCAMERR: 0x%08X [%s]", m_err, "dcamcap_transferinfo");
     return asynError;

ADOrcaApp/src/orca.h

@@ -189,9 +189,6 @@ class epicsShareClass Orca : public ADDriver {
   int readParameter(int propertyID, bool processPV = true);
   int readParameterStr(int paramIndex);
 
-  epicsUInt32 mTimeStampSec;
-  epicsUInt32 mTimeStampNsec;
-
   void imageTask();
   void temperatureTask();
 
@@ -333,7 +330,7 @@ class epicsShareClass Orca : public ADDriver {
                                  int32 rowbytes, int32 cx, int32 cy,
                                  epicsUInt32& ts_sec, epicsUInt32& ts_microsec);
   asynStatus imageTransferStatus(HDCAM hdcam,
-                                 DCAMCAP_TRANSFERINFO& captransferinfo);
+                                 DCAMCAP_TRANSFERINFO& captransferinfo, char *buf);
 
   // wrapper functions for dcamapi
   int allocateBuffers(unsigned int);

cmds/st.cmd

@@ -1,4 +1,5 @@
 require adorca
+require ndpluginschemas
 require adpluginkafka
 
 epicsEnvSet("PREFIX", "YMIR-Det1:")
@@ -34,6 +35,9 @@ NDPvaConfigure("PVA1", $(QSIZE), 0, "$(PORT)", 0, "$(PREFIX)Pva1:Image", 0, 0, 0
 dbLoadRecords("$(adcore_DIR)/db/NDPva.template",  "P=$(PREFIX),R=Pva1:, PORT=PVA1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT)")
 #
 
+NDSchemasConfigure("Schemas1", "$(QSIZE)", 0, "$(PORT)", 0, 0, 0, "test-orca-lab", 0)
+dbLoadRecords("$(ndpluginschemas_DB)/NDPluginSchemas.template", "P=$(PREFIX), R=schemas:, PORT=Schemas1, ADDR=0, TIMEOUT=1, NDARRAY_PORT=$(PORT)")
+
 # Create a standard arrays plugin, set it to get data from orca driver.
 NDStdArraysConfigure("Image1", "$(QSIZE)", 0, "$(PORT)", 0, 0)
 dbLoadRecords("NDStdArrays.template", "P=$(PREFIX),R=image1:,PORT=Image1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT),TYPE=Int32,FTVL=LONG,NELEMENTS=$(NELEMENTS)")
@@ -44,8 +48,8 @@ epicsEnvSet("KFK_TOPIC", "ymir_camera")
 # Kafka plugin
 #epicsEnvSet("KFK_CONFIG_FILE_PATH", "/etc/kafka/kafka.conf")
 
-#KafkaPluginConfigure("KFK1", 3, 1, "$(PORT)", 0, -1, "$(KFK_TOPIC)", "hama_kfk1","$(KFK_CONFIG_FILE_PATH)")
+KafkaPluginConfigure("Kafka1", 3, 1, "Schemas1", 0, -1, "$(KFK_TOPIC)","$(KFK_CONFIG_FILE_PATH)")
-#dbLoadRecords("$(adpluginkafka_DIR)db/adpluginkafka.db", "P=$(PREFIX), R=Kfk1:, PORT=KFK1, ADDR=0, TIMEOUT=1, NDARRAY_PORT=$(PORT)")
+dbLoadRecords("$(adpluginkafka_DB)/adpluginkafka.db", "P=$(PREFIX), R=Kfk1:, PORT=Kafka1, ADDR=0, TIMEOUT=1, NDARRAY_PORT=Schemas1")
 
 # startPVAServer
 iocInit()