updates for autogenerated aravis db/pvi

ADAravis/ADAravis.ibek.support.yaml

@@ -7,6 +7,11 @@ entity_models:
     description: |-
       Creates an aravisCamera camera areaDetector driver
     parameters:
+      ID:
+        type: str
+        description: |-
+          Cam ip address, hostname, MAC address, or ID <manufacturer>-<serial>, (e.g. Prosilica-02-2166A-06844)
+
       P:
         type: str
         description: |-
@@ -22,11 +27,6 @@ entity_models:
         description: |-
           Port name for the camera
 
-      ID:
-        type: str
-        description: |-
-          Cam ip address, hostname, MAC address, or ID <manufacturer>-<serial>, (e.g. Prosilica-02-2166A-06844)
-
       BUFFERS:
         type: int
         description: |-
@@ -51,40 +51,106 @@ entity_models:
           Asyn Port address, default 0
         default: 0
 
+      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:
+          AutoADGenICam:
+        # The AutoADGenICam value causes the start.sh to contact the camera and auto
+        # generate the DB file. The pvi.device file is always autogenerated
+
     pre_init:
       - value: |
-          dbLoadRecords /tmp/genicam/genicam.template "P={{ P }},R={{ R }},PORT={{ PORT }}"
           # aravisConfig(const char *portName, const char *cameraName, size_t maxMemory, int priority, int stackSize)
           aravisConfig("{{PORT}}", "{{ID}}", {{MEMORY}}, 0, 1)
 
     databases:
       - file: $(ADARAVIS)/db/aravisCamera.template
-        args:
-          P:
-          R:
-          PORT:
-          TIMEOUT:
-          ADDR:
+        args: { P, R, PORT, TIMEOUT, ADDR }
 
     pvi:
-      yaml_path: ADDriver.pvi.device.yaml
+      yaml_path: ADAravis.pvi.device.yaml
       ui_macros:
         P:
         R:
       pv: true
       pv_prefix: $(P)$(R)
 
   - name: aravisSettings
-    description: |-
-      Creates detailed settings screens for an Aravis camera
+
+    description: |
+      Create detailed settings screens for an Aravis camera from one of
+      the predefined database files in ADGenICam or from the auto generated
+      database file for a specific camera.
+
+      Specify which one using the CLASS parameter or leave CLASS as the
+      default value to auto generate database file. In this case start.sh
+      will contact the camera and generate the database file from its XML
+      description of all its configuration parameters.
+
     parameters:
       camera:
         type: object
         description: the aravisCamera object to create settings for
+
     pvi:
-      yaml_path: arvFeature.pvi.device.yaml
+      # TODO - fix ibek to support yaml
+      #yaml_path: "{{CLASS}}.pvi.device.yaml"
+      yaml_path: "AutoADGenICam.pvi.device.yaml"
       ui_macros:
         P: "{{ camera.P }}"
         R: "{{ camera.R }}"
       pv: true
       pv_prefix: "{{ camera.P }}{{ camera.R }}"
+
+    databases:
+      - file: "{{ camera.CLASS }}.template"
+        args:
+          P: "{{ camera.P }}"
+          R: "{{ camera.R }}"
+          PORT: "{{ camera.PORT }}"
+          TIMEOUT: "{{ camera.TIMEOUT }}"
+          ADDR: "{{ camera.ADDR }}"

ADAravis/arvFeature.pvi.device.yaml → ADAravis/ADAravis.pvi.device.yaml

@@ -1,5 +1,5 @@
 label: arvFeature
-parent: ADGenICam
+parent: ADDriver
 children:
   - type: Group
     name: ADAravis

ADGenICam/ADGenICam.pvi.device.yaml

@@ -3,7 +3,7 @@ parent: ADDriver
 children:
 
 - type: Group
-  name: Genicam
+  name: AutoADGenICam
   layout:
     type: Grid
     labelled: true