Merge pull request #480 from keenanlang/master

Add Constant NDAttributes
areaDetector · Jan 1, 2024 · 766565d · 766565d
2 parents 0a02e36 + f22f069
commit 766565d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/ADApp/ADSrc/NDAttribute.cpp b/ADApp/ADSrc/NDAttribute.cpp
@@ -17,7 +17,8 @@ static const char *NDAttrSourceStrings[] = {
     "DRIVER",
     "PARAM",
     "EPICS_PV",
-    "FUNCTION"
+    "FUNCTION",
+    "CONST"
 };
 
 const char *NDAttribute::attrSourceString(NDAttrSource_t type)
@@ -57,6 +58,9 @@ const char *NDAttribute::attrSourceString(NDAttrSource_t type)
     case NDAttrSourceFunct:
       this->sourceTypeString_ = "NDAttrSourceFunct";
       break;
+    case NDAttrSourceConst:
+      this->sourceTypeString_ = "NDAttrSourceConst";
+      break;
     default:
       this->sourceType_ = NDAttrSourceUndefined;
       this->sourceTypeString_ = "Undefined";

diff --git a/ADApp/ADSrc/NDAttribute.h b/ADApp/ADSrc/NDAttribute.h
@@ -64,6 +64,7 @@ typedef enum
     NDAttrSourceParam,     /**< Attribute is obtained from parameter library */
     NDAttrSourceEPICSPV,   /**< Attribute is obtained from an EPICS PV */
     NDAttrSourceFunct,     /**< Attribute is obtained from a user-specified function */
+    NDAttrSourceConst,     /**< Attribute is obtained from a user-specified value in the xml file */
     NDAttrSourceUndefined  /**< Attribute source is undefined */
 } NDAttrSource_t;
 

diff --git a/ADApp/ADSrc/asynNDArrayDriver.cpp b/ADApp/ADSrc/asynNDArrayDriver.cpp
@@ -457,7 +457,12 @@ asynStatus asynNDArrayDriver::readNDAttributesFile()
             functAttribute *pFunctAttribute = new functAttribute(pName, pDescription, pSource, pParam);
             this->pAttributeList->add(pFunctAttribute);
 #endif
-        } else {
+        } 
+        else if (strcmp(pAttrType, NDAttribute::attrSourceString(NDAttrSourceConst)) == 0) {
+#ifndef EPICS_LIBCOM_ONLY			
+            this->pAttributeList->add(pName, pDescription, NDAttrString, (void*) pSource);
+#endif
+        } else { 
             asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
                 "%s:%s: unknown attribute type = %s for attribute %s\n", driverName, functionName, pAttrType, pName);
             return asynError;