From 78896cce79640dcafe1d5672842be2085a3d902c Mon Sep 17 00:00:00 2001 From: Iocuser Date: Thu, 7 Jul 2022 16:06:45 +0200 Subject: [PATCH] Fix timeout issue --- ADHamaApp/Db/hama.template | 2 +- ADHamaApp/src/hama.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ADHamaApp/Db/hama.template b/ADHamaApp/Db/hama.template index ee2f2d0..7eda79e 100644 --- a/ADHamaApp/Db/hama.template +++ b/ADHamaApp/Db/hama.template @@ -248,7 +248,7 @@ record(mbbo, "$(P)$(R)TriggerSource-S") { field(THVL, "4") field(THST, "Master Pulse") field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))H_TRIGGER_SOURCE") - field(VAL, "1") + field(VAL, "0") } record(mbbi, "$(P)$(R)TriggerSource-RB") { diff --git a/ADHamaApp/src/hama.cpp b/ADHamaApp/src/hama.cpp index 92a145f..081feaa 100644 --- a/ADHamaApp/src/hama.cpp +++ b/ADHamaApp/src/hama.cpp @@ -495,9 +495,6 @@ epicsTimeStamp imageStamp; acquireStatusError = 0; setIntegerParam(ADStatus, ADStatusAcquire); - // release buffer - dcambuf_release(m_hdcam); - status = startAcquire(); printf("Status: %d\n", status); if (status != asynSuccess) { @@ -922,7 +919,12 @@ asynStatus Hama::startAcquire(void) { int status = 0; - status = allocateBuffers(1000); + // release buffer + freeBuffers(); + + // allocate buffer + allocateBuffers(1000); + // start capture m_err = dcamcap_start(m_hdcam, DCAMCAP_START_SNAP); if(failed(m_err)) {