Merge pull request #36 from iainmarcuson/t4u_triggered

T4u triggered

Author: MarkRivers

iocBoot/iocT4UDirect_EM/T4UDirect_EM.cmd

@@ -5,16 +5,14 @@ epicsEnvSet("TEMPLATE",  "T4U_EM")
 epicsEnvSet("QSIZE",     "20")
 epicsEnvSet("RING_SIZE", "10000")
 epicsEnvSet("TSPOINTS",  "5000")
-epicsEnvSet("QTHOST", "192.168.11.76")
-#epicsEnvSet("QTHOST", "192.168.11.67")
-#epicsEnvSet("QTHOST", "127.0.0.1")
-epicsEnvSet("QTBASEPORT", "15001")
+epicsEnvSet("T4U_ADDR", "192.168.11.90")
+epicsEnvSet("DATA_PORT", "10101")
 epicsEnvSet("CALFILE", "DBPM_Settings.ini");
 
 # Load asynRecord record
 dbLoadRecords("$(ASYN)/db/asynRecord.db", "P=$(PREFIX), R=asyn1,PORT=TCP_Command_$(PORT),ADDR=0,OMAX=256,IMAX=256")
 
-drvT4UDirect_EMConfigure("$(PORT)", "$(QTHOST)", $(RING_SIZE), $(QTBASEPORT), "$(CALFILE)")
+drvT4UDirect_EMConfigure("$(PORT)", "$(T4U_ADDR)", $(RING_SIZE), $(DATA_PORT), "$(CALFILE)")
 
 #asynSetTraceIOMask("UDP_$(PORT)", 0, 2)
 #asynSetTraceMask("UDP_$(PORT)", 0, 9)

iocBoot/iocT4UDirect_EM/st.cmd

@@ -1,4 +1,4 @@
-#!/home/iainm/src/epics/synAppsofficial/git/support/quadEM-R9-5/bin/linux-x86_64/quadEMTestApp
+#!/home/iainm/src/epics/synAppsofficial/git/support/quadEM/bin/linux-x86_64/quadEMTestApp
 
 errlogInit(5000)
 < envPaths

quadEMApp/Db/T4U_EM.template

@@ -391,6 +391,57 @@ record(longin, "$(P)$(R)SampleFreq_RBV")
     field(SCAN, "I/O Intr")
 }
 
+#------------------------------------
+# Wait State Modes and Trigger Modes
+#------------------------------------
+
+record(mbbo, "$(P)$(R)WaitStateMode")
+{
+    field(DESC, "Wait State Mode Selector")
+    field(DTYP, "asynInt32")
+    field(OUT, "@asyn($(PORT) 0)QE_WSMODE")
+    field(ZRST, "None")
+    field(ZRVL, "0")
+    field(ONST, "Inhibit")
+    field(ONVL, "1")
+    field(TWST, "Triggered")
+    field(TWVL, "2")
+    field(VAL, "0")
+    field(PINI, "YES")
+    field(FLNK, "$(P)$(R)Range.PROC")
+}
+
+record(mbbi, "$(P)$(R)WaitStateMode_RBV")
+{
+    field(DESC, "Wait State Mode Selector")
+    field(DTYP, "asynInt32")
+    field(INP, "@asyn($(PORT) 0)QE_WSMODE")
+    field(ZRST, "None")
+    field(ZRVL, "0")
+    field(ONST, "Inhibit")
+    field(ONVL, "1")
+    field(TWST, "Triggered")
+    field(TWVL, "2")
+    field(SCAN, "I/O Intr")
+}
+
+record(longout, "$(P)$(R)ReadsPerPacket")
+{
+    field(DRVL, "1")
+    field(DRVH, "50")
+    field(DTYP, "asynInt32")
+    field(OUT, "@asyn($(PORT) 0)QE_RPP")
+    field(PINI, "YES")
+    field(VAL, "50")
+}
+
+record(longin, "$(P)$(R)ReadsPerPacket_RBV")
+{
+    field(DTYP, "asynInt32")
+    field(INP, "@asyn($(PORT) 0)QE_RPP")
+    field(SCAN, "I/O Intr")
+}
+
 #--------------------------
 # Overrides
 #--------------------------