From 71f12cfdcf179160fdf428ae1c34e682bd73b52d Mon Sep 17 00:00:00 2001
From: Iocuser <noemail@user.com>
Date: Wed, 23 Nov 2022 16:49:52 +0100
Subject: [PATCH] update

---
 ADHamaApp/src/hama.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/ADHamaApp/src/hama.cpp b/ADHamaApp/src/hama.cpp
index b14e0aa..5139f53 100644
--- a/ADHamaApp/src/hama.cpp
+++ b/ADHamaApp/src/hama.cpp
@@ -237,6 +237,9 @@ int Hama::initCamera(){
    err |= getParameterStr(DCAM_IDSTR_MODULEVERSION); 
    err |= getParameterStr(DCAM_IDSTR_DCAMAPIVERSION); 
 
+   err |= getParameter(DCAM_IDPROP_SENSORMODE);
+   err |= getParameter(DCAM_IDPROP_READOUTSPEED);
+   err |= getParameter(DCAM_IDPROP_READOUT_DIRECTION);
 
    err |= getParameter(DETECTOR_PIXEL_NUM_HORZ); 
    err |= getParameter(DETECTOR_PIXEL_NUM_VERT); 
@@ -254,9 +257,6 @@ int Hama::initCamera(){
 	err |= getParameter( DCAM_IDPROP_SUBARRAYVSIZE);
 
 
-   err |= getParameter(DCAM_IDPROP_SENSORMODE);
-   err |= getParameter(DCAM_IDPROP_READOUTSPEED);
-   err |= getParameter(DCAM_IDPROP_READOUT_DIRECTION);
    err |= getParameter(DCAM_IDPROP_TRIGGERSOURCE);
    err |= getParameter(DCAM_IDPROP_TRIGGER_MODE);
    err |= getParameter(DCAM_IDPROP_TRIGGERACTIVE);
@@ -427,19 +427,25 @@ asynStatus Hama::getParameter(int propertyID){
 
    case DCAM_IDPROP_SENSORMODE:
       m_err = dcamprop_getvalue(m_hdcam, DCAM_IDPROP_SENSORMODE, &dvalue);
-      printError(m_hdcam, m_err, "SENSOR MODE", "IDPROP:0x%08x, VALUE:%f\n", propertyID, dvalue);
+      if(failed(m_err)) {
+         printError(m_hdcam, m_err, "SENSOR MODE", "IDPROP:0x%08x, VALUE:%f\n", propertyID, dvalue);
+      }
       status = setIntegerParam(hSensorMode, dvalue);
    break;
  
    case DCAM_IDPROP_READOUTSPEED:
       m_err = dcamprop_getvalue(m_hdcam, DCAM_IDPROP_READOUTSPEED, &dvalue);
-      printError(m_hdcam, m_err, "READOUT SPEED", "IDPROP:0x%08x, VALUE:%f\n", propertyID, dvalue);
+      if(failed(m_err)) {
+         printError(m_hdcam, m_err, "READOUT SPEED", "IDPROP:0x%08x, VALUE:%f\n", propertyID, dvalue);
+      }
       status = setIntegerParam(hReadoutSpeed, dvalue);
    break;
    
    case DCAM_IDPROP_READOUT_DIRECTION:
       m_err = dcamprop_getvalue(m_hdcam, DCAM_IDPROP_READOUT_DIRECTION, &dvalue);
-      printError(m_hdcam, m_err, "R DIRECTION", "IDPROP:0x%08x, VALUE:%f\n", propertyID, dvalue);
+      if(failed(m_err)) {
+         printError(m_hdcam, m_err, "R DIRECTION", "IDPROP:0x%08x, VALUE:%f\n", propertyID, dvalue);
+      }
       status = setIntegerParam(hReadoutDirection, dvalue);
    break;
    
@@ -1762,7 +1768,7 @@ void Hama::printError(HDCAM hdcam, DCAMERR errid, const char* apiname, const cha
    DCAMERR err;
    dcamdev_string( err, hdcam, errid, errtext, sizeof(errtext) );
 
-   printf( "-[ERROR]- (DCAMERR) 0x%08X %s @ %s\n", errid, errtext, apiname );
+   printf( "-[ERROR]- -(DCAMERR)- -0x%08X- -%s- -%s-\n", errid, errtext, apiname );
 
    if( fmt != NULL ) {
      printf( " : " );