Merge remote-tracking branch 'origin/dls-vme-vac' into ioc-dlslinuxvac

epics-containers · Jun 13, 2024 · d344029 · d344029
2 parents 733dfad + 03485f4
commit d344029
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/ipac/ipac.ibek.support.yaml b/ipac/ipac.ibek.support.yaml
@@ -7,33 +7,49 @@ defs:
     description: |-
       Configure a Hytec 8002 Carrier card
     args:
-      - type: id
-        name: IPACid
-        description: |-
-          Identifier for this device
-        default: IPAC{{slot}}
-
       - type: int
         name: slot
         description: |-
           VME Slot number
 
+      - type: id
+        name: name
+        description: |-
+          Identifier for this device - typically IPAC{{ slot }}
+
       - type: int
         name: intLevel
         description: |-
           VME Interrupt Level
         default: 2
 
+      - name: test
+        type: str
+        description: test
+        default: |
+          {{ slot }}
+
       - name: interrupt_vector
         type: object
         description: Interrupt Vector reserved with epics.InterruptVectorVME, count=1
 
+    values:
+      - name: carrier_id
+        value: '{{ __utils__.counter("Carriers", start=0) }}'
+        description: Carrier Card Identifier
+
     pre_init:
-      - value: IPAC4 = ipacAddHy8002("4, 2, {{interrupt_vector.name}}")
+      - value: |
+          # ipacAddHy8002("slot, intLevel, interrupt_vector")
+        when: first
+
+      - value: |
+          ipacAddHy8002("{{ slot }}, {{ intLevel}}, $({{interrupt_vector.name}})")
+          epicsEnvSet {{ name }} = {{ carrier_id }}
 
   - name: Hy8001
     description: |-
-      TODO:ADD DESCRIPTION
+      TODO:ADD DESCRIPTIONS
     args:
       - type: int
         name: slot

diff --git a/mks937a/install.sh b/mks937a/install.sh
@@ -14,6 +14,9 @@ ibek support git-clone ${NAME} ${VERSION} --org https://github.com/dls-controls/
 
 ibek support register ${NAME}
 
+# Remove the unecessary DLS 'WORK' macro
+ibek support add-release-macro WORK
+
 # declare the libs and DBDs that are required in ioc/iocApp/src/Makefile
 ibek support add-libs mks937a
 ibek support add-dbds mks937a.dbd

diff --git a/mks937b/install.sh b/mks937b/install.sh
@@ -10,10 +10,13 @@ FOLDER=$(dirname $(readlink -f $0))
 set -xe
 
 # get the source and fix up the configure/RELEASE files
-ibek support git-clone ${NAME} ${VERSION} --org https://github.com/diamondlightsource/
+ibek support git-clone ${NAME} ${VERSION} --org https://github.com/dls-controls/
 
 ibek support register ${NAME}
 
+# Remove the unecessary DLS 'WORK' macro
+ibek support add-release-macro WORK
+
 # declare the libs and DBDs that are required in ioc/iocApp/src/Makefile
 ibek support add-libs mks937b
 ibek support add-dbds mks937b.dbd