From 16a727931f5e675349a16375aed8fed55d65bc47 Mon Sep 17 00:00:00 2001 From: Marcell Nagy Date: Tue, 16 Jul 2024 11:19:51 +0000 Subject: [PATCH] Add pvi changes to convert device command --- ioc/start.sh | 10 ++-------- requirements.txt | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ioc/start.sh b/ioc/start.sh index 9547123..ca18411 100755 --- a/ioc/start.sh +++ b/ioc/start.sh @@ -144,14 +144,8 @@ elif [ -f ${ibek_src} ]; then python /epics/support/ADGenICam/scripts/makeDb.py /tmp/${instance_id}-genicam.xml /epics/support/ADGenICam/db/${instance_class}.template fi # Generate pvi device from the GenICam DB - pvi convert device --template /epics/support/ADGenICam/db/$instance_class.template /epics/pvi-defs/ /epics/support/ADGenICam/include/ADGenICam.h - mv /epics/pvi-defs/ADGenICam.pvi.device.yaml /epics/pvi-defs/$instance_class.pvi.device.yaml - # change the title of the pvi device to match the camera ID - sed -i "s/label: ADGenICam/label: GenICam $instance_id/g" /epics/pvi-defs/$instance_class.pvi.device.yaml - # remove ADDriver from GenICam device - sed -i "s/ADDriver//" /epics/pvi-defs/$instance_class.pvi.device.yaml - # TODO: pvi changes should allow us to remove the last 2 sed lines above - # a) you will be able to specify no parent, b) you will be able to specify the label + template=/epics/support/ADGenICam/db/$instance_class.template + pvi convert device --template $template --name $instance_class --label "GenICam $instance_id" /epics/pvi-defs/ fi done diff --git a/requirements.txt b/requirements.txt index aa6ca66..58984aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ ibek==3.0.1 # to install direct from github during development in a branch # ibek@git+https://github.com/epics-containers/ibek.git@branch +pvi@git+https://github.com/epics-containers/pvi.git@convert-template # For testing only \ No newline at end of file