diff --git a/iocs/mythenIOC/iocBoot/iocMythen/auto_settings.req b/iocs/mythenIOC/iocBoot/iocMythen/auto_settings.req index 9d4daa3..f643781 100644 --- a/iocs/mythenIOC/iocBoot/iocMythen/auto_settings.req +++ b/iocs/mythenIOC/iocBoot/iocMythen/auto_settings.req @@ -5,4 +5,3 @@ file "mythen_settings.req", P=$(P), R=cam1: file "NDPluginBase_settings.req", P=$(P), R=image1: file "NDStdArrays_settings.req", P=$(P), R=image1: file "commonPlugin_settings.req", P=$(P) - diff --git a/iocs/mythenIOC/iocBoot/iocMythen/st.cmd b/iocs/mythenIOC/iocBoot/iocMythen/st.cmd index e28ec88..f893eda 100644 --- a/iocs/mythenIOC/iocBoot/iocMythen/st.cmd +++ b/iocs/mythenIOC/iocBoot/iocMythen/st.cmd @@ -11,9 +11,9 @@ mythenApp_registerRecordDeviceDriver(pdbbase) #drvAsynIPPortConfigure("portName","hostInfo",priority,noAutoConnect, # noProcessEos) -drvAsynIPPortConfigure("IP_M1K", "192.168.0.90:1030 UDP", 0, 0, 1) +#drvAsynIPPortConfigure("IP_M1K", "192.168.0.90:1030 UDP", 0, 0, 1) #drvAsynIPPortConfigure("IP_M1K", "192.168.0.90:1031", 0, 0, 1) -#drvAsynIPPortConfigure("IP_M1K", "164.54.109.66:1031", 0, 0, 0) +drvAsynIPPortConfigure("IP_M1K", "164.54.109.66:1031", 0, 0, 0) #asynOctetSetInputEos("IP_M1K",0,"\r\n") asynOctetSetOutputEos("IP_M1K",0,"\r") @@ -58,4 +58,4 @@ set_requestfile_path("$(TOP)/mythenApp/Db") iocInit() # save things every thirty seconds -create_monitor_set("auto_settings.req", 30,"P=$(PREFIX),D=cam1:") +create_monitor_set("auto_settings.req", 30,"P=$(PREFIX)") diff --git a/mythenApp/Db/mythen.template b/mythenApp/Db/mythen.template index 7ca3abe..4b116b4 100644 --- a/mythenApp/Db/mythen.template +++ b/mythenApp/Db/mythen.template @@ -362,7 +362,9 @@ record (mbbo, "$(P)$(R)ReadMode") field (ZRVL, "0") field (ONST, "Corrected") field (ONVL, "1") - field (VAL, "0") + field (TWST, "Test Pattern") + field (TWVL, "2") + field (VAL, "1") field (PINI, "YES") } @@ -375,6 +377,8 @@ record (mbbi, "$(P)$(R)ReadMode_RBV") field (ZRVL, "0") field (ONST, "Corrected") field (ONVL, "1") + field (TWST, "Test Pattern") + field (TWVL, "2") field (SCAN, "I/O Intr") } diff --git a/mythenApp/src/mythen.cpp b/mythenApp/src/mythen.cpp index 5a0f052..bb5e9da 100755 --- a/mythenApp/src/mythen.cpp +++ b/mythenApp/src/mythen.cpp @@ -888,14 +888,16 @@ void mythen::acquisitionTask() nread=0; if (readmode_==0) strcpy(outString_, "-readoutraw"); - else + else if (readmode_==1) strcpy(outString_, "-readout"); + else + strcpy(outstring_, "-testpattern"); status = pasynOctetSyncIO->writeRead(pasynUserMeter_, outString_, strlen(outString_), (char *)detArray_, nread_expect, M1K_TIMEOUT+acquireTime, &nwrite, &nread, &eomReason); //Timeout is M1K_TIMEOUT + AcquireTime - //printf("nread_expected=%d, nread=%d, status=%d, timeout=%f, eomReason=%d\n", - // (int)nread_expect, (int)nread, status, M1K_TIMEOUT+acquireTime, eomReason); + asynPrint(pasynUserSelf, ASYN_TRACE_FLOW, "%s:%s: nread_expected=%d, nread=%d, status=%d, timeout=%f, eomReason=%d\n", + driverName, functionName, (int)nread_expect, (int)nread, status, M1K_TIMEOUT+acquireTime, eomReason); if(nread == nread_expect) { this->lock();