Add genicam auto db and pvi generation

epics-containers · Jul 1, 2024 · 2abb180 · 2abb180
1 parent b2d58a5
commit 2abb180
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5,264 deletions.
diff --git a/ADAravis/ADAravis.ibek.support.yaml b/ADAravis/ADAravis.ibek.support.yaml
@@ -5,7 +5,7 @@ module: ADAravis
 entity_models:
   - name: aravisCamera
     description: |-
-      Creates a aravisCamera camera areaDetector driver
+      Creates an aravisCamera camera areaDetector driver
     parameters:
       P:
         type: str
@@ -27,53 +27,6 @@ entity_models:
         description: |-
           Cam ip address, hostname, MAC address, or ID <manufacturer>-<serial>, (e.g. Prosilica-02-2166A-06844)
 
-      CLASS:
-        type: enum
-        description: |-
-          Camera class for custom commands
-        values:
-          Basler-a2A2600-20gmBAS:
-          Basler-scA1400-30gm:
-          Basler-scA1300-32gm:
-          Basler-scA640-70gm:
-          Basler-acA640-90gm:
-          Basler-acA640-300gm:
-          Basler-acA1300-30gm:
-          Basler-acA1300-60gm:
-          Basler-acA1300-75gm:
-          Basler_piA640_210gm:
-          AVT_Manta_G319B:
-          AVT_Mako_G040B:
-          AVT_Manta_G2460C:
-          AVT_Mako_G125B:
-          AVT_Mako_G125C:
-          AVT_Prosilica_GC1280M:
-          AVT_Mako_1_52:
-          AVT_Manta_G507B:
-          AVT_Manta_G145B:
-          AVT_Mako_G507B:
-          AVT_Mako_G507C:
-          AVT_Prosilica_GT5120:
-          AVT_Mako_G319C:
-          AVT_Manta_G419C:
-          AVT_Prosilica_GC1020C:
-          AVT_Prosilica_GC655C:
-          XIMEA_MC124CG-SY:
-          JAI_CM140_v2-2:
-          Prosilica_GC:
-          AVT_Manta_G125B:
-          AVT_Manta_G125C:
-          AVT_Manta_G040B:
-          AVT_Manta_G895B:
-          AVT_Mako_G158B:
-          AVT_Mako_G158C:
-          AVT_Manta_G235B:
-          AVT_Manta_G235C:
-          AVT_Manta_1_44:
-          AVT_Mako_G234C:
-          AVT_Mako_G234B:
-          AVT_Manta_G609B:
-          JAI_CM140:
       BUFFERS:
         type: int
         description: |-
@@ -100,6 +53,10 @@ entity_models:
 
     pre_init:
       - value: |
+          system "arv-tool-0.8 -a {{ID}} genicam > /epics/runtime/genicam.xml"
+          system "python /epics/support/ADGenICam/scripts/makeDb.py /epics/runtime/genicam.xml /epics/runtime/genicam.template"
+          dbLoadRecords /epics/runtime/genicam.template "P={{ P }},R={{ R }},PORT={{ PORT }}"
+          system "pvi convert device --template /epics/runtime/genicam.template /epics/pvi-defs/ /epics/support/ADGenICam/include/ADGenICam.h"
           # aravisConfig(const char *portName, const char *cameraName, size_t maxMemory, int priority, int stackSize)
           aravisConfig("{{PORT}}", "{{ID}}", {{MEMORY}}, 0, 1)
 
@@ -112,14 +69,6 @@ entity_models:
           TIMEOUT:
           ADDR:
 
-      - file: $(ADGENICAM)/db/{{CLASS}}.template
-        args:
-          P:
-          R:
-          PORT:
-          TIMEOUT:
-          ADDR:
-
     pvi:
       yaml_path: ADDriver.pvi.device.yaml
       ui_macros:
@@ -130,7 +79,7 @@ entity_models:
 
   - name: aravisSettings
     description: |-
-      Creates detailed settings screens for and Aravis camera
+      Creates detailed settings screens for an Aravis camera
     parameters:
       camera:
         type: object

diff --git a/ADAravis/arvFeature.pvi.device.yaml b/ADAravis/arvFeature.pvi.device.yaml
@@ -1,5 +1,5 @@
 label: arvFeature
-parent: ADDriver
+parent: ADGenICam
 children:
   - type: Group
     name: ADAravis

diff --git a/ADAravis/install.sh b/ADAravis/install.sh
@@ -49,7 +49,7 @@ ibek support register ${NAME}
 
 # declare the libs and DBDs that are required in ioc/iocApp/src/Makefile
 ibek support add-libs ADAravis
-ibek support add-dbds ADAravisSupport.dbd
+ibek support add-dbds ADAravisSupport.dbd system.dbd
 
 # add any required changes to CONFIG_SITE
 CONFIG='