fix support yaml and dbds/libs for adandor3

epics-containers · Oct 11, 2024 · 593df0e · 593df0e
1 parent e3a5726
commit 593df0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 54 deletions.
diff --git a/ADAndor3/ADAndor3.ibek.support.yaml b/ADAndor3/ADAndor3.ibek.support.yaml
@@ -3,7 +3,6 @@
 module: ADAndor3
 
 entity_models:
-
   - name: andor3
     description: |-
       Creates a andorSCMOS camera areaDetector driver
@@ -21,13 +20,15 @@ entity_models:
         description: |-
           Port name for the detector
       TIMEOUT:
-        type: str
+        type: int
         description: |-
           Timeout
+        default: 1
       ADDR:
-        type: str
+        type: int
         description: |-
           Asyn Port address
+        default: 0
       SCANRATE:
         type: enum
         description: |-
@@ -84,9 +85,7 @@ entity_models:
         description: |-
           Path to the Andor3 SDK
 
-
     databases:
-
       - file: $(ADANDOR3)/db/andor3.template
         args:
           P:
@@ -97,58 +96,9 @@ entity_models:
           SCANRATE:
 
     pre_init:
-
       - value: |
           # Set LD library path and BitFlow install dir variables to built Andor3 SDK
           epicsEnvSet "LD_LIBRARY_PATH", \'{{ANDOR_SDK3}}/prefix/lib\'
           epicsEnvSet "BITFLOW_INSTALL_DIRS", \'{{ANDOR_SDK3}}/prefix/bf\'
           # andor3Config(portName, cameraID, maxBuffers, maxMemory, priority, stackSize, maxFrames)
           andor3Config("{{PORT}}", "{{CAMERA_ID}}", {{BUFFERS}}, {{MEMORY}}, {{PRIORITY}}, {{STACKSIZE}}, "{{MAX_FRAMES}}")
- # TODO - MISSING ARGS: sdk_path
-
-  - name: andor3Template
-    description: |-
-      TODO:ADD DESCRIPTION
-    parameters:
-      P:
-        type: str
-        description: |-
-          Device Prefix
-      R:
-        type: str
-        description: |-
-          Device Suffix
-      PORT:
-        type: str
-        description: |-
-          Asyn Port name
-      TIMEOUT:
-        type: str
-        description: |-
-          Timeout
-      ADDR:
-        type: str
-        description: |-
-          Asyn Port address
-      SCANRATE:
-        type: enum
-        description: |-
-          Specified scan rate for cpu intensive PVs
-        default: I/O Intr
-        values:
-          .1 second:
-          .2 second:
-          .5 second:
-          1 second:
-          2 second:
-          5 second:
-          10 second:
-          I/O Intr:
-          Event:
-          Passive:
-
-    databases:
-
-      - file: $(ADANDOR3)/db/andor3.template
-        args:
-          .*:
diff --git a/ADAndor3/install.sh b/ADAndor3/install.sh
@@ -28,8 +28,13 @@ SZIP_INCLUDE   = -I/usr/include
 HDF5_LIB      = /usr/lib/x86_64-linux-gnu/hdf5/serial/
 HDF5_INCLUDE  = /usr/include/hdf5/serial/
 '
+
 ibek support add-to-config-site ${NAME} "${CONFIG}"
 
+# declare the libs and DBDs that are required in ioc/iocApp/src/Makefile
+ibek support add-libs andor3 atcore
+ibek support add-dbds andor3Support.dbd
+
 # global config settings
 ${FOLDER}/../../ibek-support/_global/install.sh ${NAME}