update genicam template names and cope with missing camera with auto-…

…gen (#45) * update genicam template names and cope with missing camera with auto-gen * Add failure message --------- Co-authored-by: Marcell Nagy <[email protected]>
epics-containers · Nov 14, 2024 · f73bfe7 · f73bfe7
1 parent d416080
commit f73bfe7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ibek-support b/ibek-support
diff --git a/ioc/start.sh b/ioc/start.sh
@@ -138,10 +138,17 @@ elif [ -f ${ibek_src} ]; then
             instance_id=$(yq .entities[${count}].ID ${ibek_src})
 
             if [[ $instance_class == "AutoADGenICam" ]]; then
-                instance_class=${instance_id}-${instance_class}
+                instance_class=auto-${instance_id}
                 # Auto generate GenICam database from camera parameters XML
                 arv-tool-0.8 -a ${instance_id} genicam > /tmp/${instance_id}-genicam.xml
-                python /epics/support/ADGenICam/scripts/makeDb.py /tmp/${instance_id}-genicam.xml /epics/support/ADGenICam/db/${instance_class}.template
+                if [[ ! -s /tmp/${instance_id}-genicam.xml ]]; then
+                    # can't contact the camera - make an empty template
+                    echo "Can't connect to camera ${instance_id}"
+                    touch /epics/support/ADGenICam/db/${instance_class}.template
+                else
+                    # make a db file from the GenICam XML
+                    python /epics/support/ADGenICam/scripts/makeDb.py /tmp/${instance_id}-genicam.xml /epics/support/ADGenICam/db/${instance_class}.template
+                fi
             fi
             # Generate pvi device from the GenICam DB
             template=/epics/support/ADGenICam/db/$instance_class.template
+77 −39		ADAravis/ADAravis.ibek.support.yaml
+4 −1		_global/install.sh
+1 −1		asyn/install.sh
+1 −1		busy/install.sh
+1 −1		calc/install.sh
+1 −1		iocStats/install.sh
+1 −1		ipac/install.sh
+1 −1		lakeshore340/install.sh
+1 −1		motor/install.sh
+30 −0		positioner/install.sh
+427 −0		positioner/positioner.ibek.support.yaml
+1 −1		sequencer/install.sh
+36 −0		snmp/install.sh
+27 −0		terminalserver/install.sh
+113 −0		terminalserver/terminalserver.ibek.support.yaml