ipac and mks937b fixes for dlsvmevac

epics-containers · Jan 20, 2025 · 2c26600 · 2c26600
1 parent e68591c
commit 2c26600
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/_global/epics.ibek.support.yaml b/_global/epics.ibek.support.yaml
@@ -85,4 +85,4 @@ entity_models:
 
     env_vars:
       - name: "{{ name }}"
-        value: '{{  _global.incrementor("InterruptVector", start=192, stop=255, inc=count) }}'
+        value: '{{  _global.incrementor("InterruptVector", start=192, stop=255, increment=count) }}'
diff --git a/ipac/ipac.ibek.support.yaml b/ipac/ipac.ibek.support.yaml
@@ -16,6 +16,7 @@ entity_models:
         type: id
         description: |-
           Identifier for this device - typically IPAC{{ slot }}
+        default: IPAC{{ slot }}
 
       intLevel:
         type: int
@@ -33,14 +34,24 @@ entity_models:
         type: object
         description: Interrupt Vector reserved with epics.InterruptVectorVME, count=1
 
+    pre_defines:
+      carrier_id:
+        description: |-
+          carrier card ID - zero based and auto incremented on each new carrier
+        type: int
+        value: |-
+          {{ _global.incrementor("CarrierCardId", start=0, stop=64) }}
+
     pre_init:
       - value: |
           # ipacAddHy8002("slot, intLevel, interrupt_vector")
         when: first
 
       - value: |
           ipacAddHy8002("{{ slot }}, {{ intLevel}}, $({{interrupt_vector.name}})")
+          # record current carrier card ID in and increment it
           epicsEnvSet {{ name }} = {{ carrier_id }}
+          ipacAddNullCarrier()
 
   - name: Hy8001
     description: |-
@@ -51,6 +62,10 @@ entity_models:
         description: |-
           VME Slot number
 
+      interrupt_vector:
+        type: object
+        description: Interrupt Vector reserved with epics.InterruptVectorVME, count=1
+
       direction:
         type: enum
         description: |-
@@ -102,9 +117,7 @@ entity_models:
 
     pre_init:
       - value: |
-          Hy8001Configure({{cardid}}, {{slot}}, {{vector}}, {{intLevel}}, 0, 0, {{clock}}, {{scan}}, {{direction}}, {{invertin}}, {{invertout}})
-  # TODO - MISSING ARGS: vector
-  # WARNING - non print commands in Initialise not parsed
+          Hy8001Configure({{cardid}}, {{slot}}, {{interrupt_vector}}, {{intLevel}}, 0, 0, {{clock}}, {{scan}}, {{direction}}, {{invertin}}, {{invertout}})
 
   - name: Hy8005
     description: |-

diff --git a/mks937b/mks937b.ibek.support.yaml b/mks937b/mks937b.ibek.support.yaml
@@ -289,7 +289,6 @@ entity_models:
           dom:
           ctlsp_hopr:
           ctlsp_drvh:
-          GCTLR:
           ctlsp_level:
           ctlspoff_desc:
           plog_calc:
@@ -483,7 +482,6 @@ entity_models:
           ctlsp_level:
           device:
           offwarn:
-          GCTLR:
           channel:
 
   - name: mks937bImgGroup
@@ -622,10 +620,10 @@ entity_models:
         description: |-
           or (if using Hy8401 VME IP) mks937bHy8401.template
 
-      GCTLR:
-        type: str
-        description: |-
-          The gauge controller PV prefix, for gui purposes
+      # GCTLR:
+      #   type: str
+      #   description: |-
+      #     The gauge controller PV prefix, for gui purposes
 
       ctlsp_level:
         type: float