tidy up convertors for bl2oj-mo-brick-02

src/builder2ibek/convert.py

@@ -14,7 +14,8 @@ def dispatch(builder: Builder) -> Generic_IOC:
     and build a generic IOC from the converted Entities
     """
     ioc = Generic_IOC(
-        ioc_name=builder.name.lower(),
+        # ioc_name=builder.name.lower(),
+        ioc_name="{{ ioc_yaml_file_name }}",
         description="auto-generated by https://github.com/epics-containers/builder2ibek",
         entities=[],
     )

src/builder2ibek/converters/deviocstats.py

@@ -27,3 +27,7 @@ def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
             entity.rename("name", "IOC")
         if "name" in entity:
             entity.remove("name")
+
+        # we will always use the uppercase version of the instance YAML stem
+        # for devIOCStats IOC name.
+        entity.IOC = "{{ ioc_name | upper }}"

src/builder2ibek/converters/epics_base.py

@@ -12,6 +12,9 @@ def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
             entity.type = "epics.EpicsCaMaxArrayBytes"
         else:
             entity.rename("key", "name")
+            # remove IOCSH settings as epics-containers makes the iocsh prompt
+            if "IOCSH" in entity.name:
+                entity.delete_me()
     elif entity_type == "StartupCommand":
         if entity.post_init:
             entity.type = "epics.PostStartupCommand"

src/builder2ibek/converters/pmac.py

@@ -47,6 +47,9 @@ def handler(entity: Entity, entity_type: str, ioc: Generic_IOC):
         if entity.VMAX is not None:
             entity.VMAX = str(entity.VMAX)
 
+    elif entity_type == "GeoBrick":
+        entity.rename("Port", "pmacAsynPort")
+
     elif entity_type == "GeoBrickTrajectoryControlT":
         # don't bore the user with the fact this is a template!
         entity.type = "pmac.GeoBrickTrajectoryControl"