add inc parameter to counters

src/ibek/render.py

@@ -43,6 +43,7 @@ def render_text(self, instance: Entity, text: str, once=False, suffix="") -> str
         have been rendered already. The suffix can be used where a given
         Entity has more than one element to render once (e.g. functions)
         """
+
         if once:
             name = instance.__definition__.name + suffix
             if name not in self.once_done:
@@ -64,6 +65,9 @@ def render_text(self, instance: Entity, text: str, once=False, suffix="") -> str
         jinja_template = Template(result)
         result = jinja_template.render(self._to_dict(instance))  # type: ignore
 
+        if result == "":
+            return ""
+
         return result + "\n"
 
     def render_function(self, instance: Entity, function: Function) -> str:

src/ibek/support.py

@@ -124,7 +124,7 @@ class Function:
 
     name: A[str, desc("Name of the function to call")]
     args: A[Dict[str, Any], desc("The arguments IOC instance should supply")]
-    header: A[str, desc("commands/comments to appear before the function")]
+    header: A[str, desc("commands/comments to appear before the function")] = ""
     once: A[bool, desc("If true, only call the function once")] = False
     type: Literal["function"] = "function"
 

src/ibek/utils.py

@@ -21,8 +21,8 @@ class Counter:
     current: int
     stop: int
 
-    def increment(self):
-        self.current += 1
+    def increment(self, count: int):
+        self.current += count
         if self.current > self.stop:
             raise ValueError(
                 f"Counter {self.current} exceeded stop value of {self.stop}"
@@ -48,9 +48,11 @@ def get_var(self, key: str) -> Any:
         # Intentionally raises a KeyError if the key doesn't exist
         return self.variables[key]
 
-    def counter(self, name: str, start: int = 0, stop: int = 65535) -> int:
+    def counter(
+        self, name: str, start: int = 0, stop: int = 65535, inc: int = 1
+    ) -> int:
         """
-        get a named counter that increments each time it is called
+        get a named counter that increments by inc each time it is called
 
         creates a new counter if it does not yet exist
         """
@@ -64,7 +66,7 @@ def counter(self, name: str, start: int = 0, stop: int = 65535) -> int:
                     f"Redefining counter {name} with different start/stop values"
                 )
         result = counter.current
-        counter.increment()
+        counter.increment(inc)
         self.counters[name] = counter
 
         return result

tests/samples/example-srrfioc08/SR-RF-IOC-08.ibek.ioc.yaml

@@ -24,11 +24,11 @@ entities:
   - type: Hy8401ip.Hy8401ip
     name: SlotA
     carrier: IPAC4
-    ip_slot: 0
+    ip_site_number: 0
     vector: Vec0
 
   - type: Hy8401ip.Hy8401ip
     name: SlotC
     carrier: IPAC4
-    ip_slot: 2
+    ip_site_number: 2
     vector: Vec1

tests/samples/example-srrfioc08/st.cmd

@@ -17,8 +17,8 @@ ioc_registerRecordDeviceDriver pdbbase
 ipacAddHy8002 "4, 2" 
 epicsEnvSet IPAC4 0
 
-# Hy8401ipConfigure CardId IPACid IpSlot InterruptVector InterruptEnable AiType ExternalClock ClockRate Inhibit SampleCount SampleSpacing SampleSize 
-#   IpSlot A=0 B=1 C=2 D=3
+# Hy8401ipConfigure CardId IPACid IpSiteNumber InterruptVector InterruptEnable AiType ExternalClock ClockRate Inhibit SampleCount SampleSpacing SampleSize 
+#   IpSlot 0=A 1=B 2=C 3=D
 #   ClockRate  0=1Hz  1=2Hz  2=5Hz  3=10Hz 4=20Hz 5=50Hz 6=100Hz7=200Hz 8=500Hz 9=1kHz 10=2kHz11=5kHz 12=10kHz 13=20kHz 14=50kHz 15=100kHz
 Hy8401ipConfigure 40 $(IPAC4) 0 $(Vec0) 0 0 0 15 0 1 1 0 
 Hy8401ipConfigure 42 $(IPAC4) 2 $(Vec1) 0 0 0 15 0 1 1 0 

tests/samples/schemas/all.ibek.support.schema.json

@@ -132,29 +132,6 @@
             ],
             "additionalProperties": false
           },
-          {
-            "type": "object",
-            "properties": {
-              "entity_enabled": {
-                "type": "boolean",
-                "default": true
-              },
-              "carrier": {
-                "type": "string",
-                "description": "IPAC carrier name",
-                "vscode_ibek_plugin_type": "type_object"
-              },
-              "type": {
-                "type": "string",
-                "const": "dls_psc_support.Psc",
-                "default": "dls_psc_support.Psc"
-              }
-            },
-            "required": [
-              "carrier"
-            ],
-            "additionalProperties": false
-          },
           {
             "type": "object",
             "properties": {
@@ -323,6 +300,11 @@
                 "description": "A name for an interrupt vector variable",
                 "vscode_ibek_plugin_type": "type_id"
               },
+              "count": {
+                "type": "integer",
+                "description": "The number of interrupt vectors to reserve",
+                "default": 1
+              },
               "type": {
                 "type": "string",
                 "const": "epics.InterruptVectorVME",
@@ -351,7 +333,7 @@
                 "description": "Carrier Board Identifier",
                 "vscode_ibek_plugin_type": "type_object"
               },
-              "ip_slot": {
+              "ip_site_number": {
                 "type": "integer",
                 "description": "IP Site Number 0=A, 1=B, 2=C, 3=D"
               },
@@ -388,7 +370,7 @@
               "card_id": {
                 "type": "string",
                 "description": "Card Identifier",
-                "default": "{{ carrier.slot }}{{ ip_slot }}"
+                "default": "{{ carrier.slot }}{{ ip_site_number }}"
               },
               "type": {
                 "type": "string",
@@ -399,7 +381,7 @@
             "required": [
               "name",
               "carrier",
-              "ip_slot",
+              "ip_site_number",
               "vector"
             ],
             "additionalProperties": false

tests/samples/schemas/bl45p-mo-ioc-04.ibek.entities.schema.json

@@ -159,6 +159,11 @@
                 "description": "A name for an interrupt vector variable",
                 "vscode_ibek_plugin_type": "type_id"
               },
+              "count": {
+                "type": "integer",
+                "description": "The number of interrupt vectors to reserve",
+                "default": 1
+              },
               "type": {
                 "type": "string",
                 "const": "epics.InterruptVectorVME",

tests/samples/schemas/epics.ibek.support.schema.json

@@ -159,6 +159,11 @@
                 "description": "A name for an interrupt vector variable",
                 "vscode_ibek_plugin_type": "type_id"
               },
+              "count": {
+                "type": "integer",
+                "description": "The number of interrupt vectors to reserve",
+                "default": 1
+              },
               "type": {
                 "type": "string",
                 "const": "epics.InterruptVectorVME",

tests/samples/schemas/ibek.defs.schema.json

@@ -254,7 +254,8 @@
                     },
                     "header": {
                       "type": "string",
-                      "description": "commands/comments to appear before the function"
+                      "description": "commands/comments to appear before the function",
+                      "default": ""
                     },
                     "once": {
                       "type": "boolean",
@@ -269,8 +270,7 @@
                   },
                   "required": [
                     "name",
-                    "args",
-                    "header"
+                    "args"
                   ],
                   "additionalProperties": false
                 },