implement dlsPLC parameter type overrides

epics-containers · Jan 17, 2025 · b4e005a · b4e005a
1 parent 31917f4
commit b4e005a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/ibek-support-dls b/ibek-support-dls
diff --git a/src/builder2ibek/converters/digitelMpc.py b/src/builder2ibek/converters/digitelMpc.py
@@ -14,5 +14,5 @@ def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
         unit = int(entity.get("unit"))  # type: ignore
         unit_enum = f"{unit:02d}"
         entity.unit = unit_enum
-    elif entity_type in ["digitelMpcIonp", "digitelMpcIonpGroup"]:
+    elif entity_type in ["digitelMpcIonp", "digitelMpcIonpGroup", "dummyIonp"]:
         entity.remove("name")
diff --git a/src/builder2ibek/converters/dlsPLC.py b/src/builder2ibek/converters/dlsPLC.py
@@ -15,5 +15,11 @@ def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
         id = int(id_val)  # type: ignore
         id_enum = f"{id:02d}"
         entity.id = id_enum
-    elif entity_type == "NX102_readReal":
+    elif entity_type in [
+        "NX102_readReal",
+        "read100",
+        "externalValve",
+        "dummyValve",
+        "overrideRequestMain",
+    ]:
         entity.remove("name")
diff --git a/tests/samples/bl16i-va-ioc-01.yaml b/tests/samples/bl16i-va-ioc-01.yaml
@@ -891,19 +891,15 @@ entities:
 
   - type: digitelMpc.dummyIonp
     device: BL16I-VA-DIONP-01
-    name: BL16I-VA-DIONP-01
 
   - type: digitelMpc.dummyIonp
     device: BL16I-VA-DIONP-02
-    name: BL16I-VA-DIONP-02
 
   - type: digitelMpc.dummyIonp
     device: BL16I-VA-DIONP-13
-    name: BL16I-VA-DIONP-13
 
   - type: digitelMpc.dummyIonp
     device: BL16I-VA-DIONP-14
-    name: BL16I-VA-DIONP-14
 
   - type: FINS.FINSHostlink
     asyn_port: ty_40_0
@@ -920,43 +916,36 @@ entities:
   - type: dlsPLC.read100
     century: 0
     device: BL16I-VA-VLVCC-01
-    name: VLVCC01.0
     port: VLVCC01
 
   - type: dlsPLC.read100
     century: 3
     device: BL16I-VA-VLVCC-01
-    name: VLVCC01.3
     port: VLVCC01
 
   - type: dlsPLC.read100
     century: 0
     device: BL16I-VA-VLVCC-02
-    name: VLVCC02.0
     port: VLVCC02
 
   - type: dlsPLC.read100
     century: 1
     device: BL16I-VA-VLVCC-02
-    name: VLVCC02.1
     port: VLVCC02
 
   - type: dlsPLC.read100
     century: 0
     device: BL16I-MP-TMPCC-01
-    name: TMPCC01.0
     port: TMPCC01
 
   - type: dlsPLC.read100
     century: 1
     device: BL16I-MP-TMPCC-01
-    name: TMPCC01.1
     port: TMPCC01
 
   - type: dlsPLC.read100
     century: 2
     device: BL16I-MP-TMPCC-01
-    name: TMPCC01.2
     port: TMPCC01
 
   - type: dlsPLC.vacValveDebounce
@@ -1641,20 +1630,16 @@ entities:
 
   - type: dlsPLC.externalValve
     device: FE16I-VA-VALVE-02
-    name: FE16I-VA-VALVE-02
 
   - type: dlsPLC.dummyValve
     device: BL16I-VA-DVALV-01
-    name: BL16I-VA-DVALV-01
 
   - type: dlsPLC.dummyValve
     device: BL16I-VA-DVALV-02
-    name: BL16I-VA-DVALV-02
 
   - type: dlsPLC.overrideRequestMain
     P: BL16I-VA-VLVCC-01
     Q: :OVERRIDE
-    name: VLCC01.Override
     outaddr: 80
     port: VLVCC01