From cdaf6ff84c7d1058fedbcae63abd9d53fd6e6156 Mon Sep 17 00:00:00 2001
From: Juliano Murari <juliano.murari@ess.eu>
Date: Fri, 25 Nov 2022 10:07:55 +0100
Subject: [PATCH] Fix BCM IOC version display
---
10-Top/bcmioc/top.bob | 12 ++++++++++++
99-Shared/adsis8300bcm/bcm_crate.bob | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index 67082b1..a853296 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -89,6 +89,7 @@
<CONTROL_GROUP>PBI-BCM01</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-001</IOCNAME>
<P>PBI-BCM01:</P>
<R>Ctrl-AMC-110:</R>
<SYSTEM1>ISrc-010:PBI-BCM-001:</SYSTEM1>
@@ -115,6 +116,7 @@
<CONTROL_GROUP>PBI-BCM01</CONTROL_GROUP>
<EVR_DEV>EVR-201</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-201</IOCNAME>
<P>PBI-BCM01:</P>
<R>Ctrl-AMC-210:</R>
<SYSTEM1>ISrc-010:PBI-BCM-201:</SYSTEM1>
@@ -141,6 +143,7 @@
<CONTROL_GROUP>LAB-BCM08</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>LabS-PBILab:SC-IOC-080</IOCNAME>
<P>LAB-BCM08:</P>
<R>Ctrl-AMC-005:</R>
<SYSTEM1>LAB-008:PBI-BCM-001:</SYSTEM1>
@@ -167,6 +170,7 @@
<CONTROL_GROUP>LAB-BCM11</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>LabS-PBILab:SC-IOC-010</IOCNAME>
<P>LAB-BCM11:</P>
<R>Ctrl-AMC-005:</R>
<SYSTEM1>LAB-011:PBI-BCM-001:</SYSTEM1>
@@ -193,6 +197,7 @@
<CONTROL_GROUP>PBI-BCM02</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-001</IOCNAME>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
<SYSTEM1>DTL-030:PBI-BCM-001:</SYSTEM1>
@@ -219,6 +224,7 @@
<CONTROL_GROUP>PBI-BCMT1</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-001</IOCNAME>
<P>PBI-BCMT1:</P>
<R>Ctrl-AMC-110:</R>
<SYSTEM1>TS4-ISrc:PBI-BCM-001:</SYSTEM1>
@@ -245,6 +251,7 @@
<CONTROL_GROUP>PBI-BCM02</CONTROL_GROUP>
<EVR_DEV>EVR-201</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-201</IOCNAME>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
<SYSTEM1>DTL-030:PBI-BCM-201:</SYSTEM1>
@@ -271,6 +278,7 @@
<CONTROL_GROUP>PBI-BCM03</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-001</IOCNAME>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
<SYSTEM1>MBL-010LWU:PBI-BCM-001:</SYSTEM1>
@@ -297,6 +305,7 @@
<CONTROL_GROUP>PBI-BCM04</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-001</IOCNAME>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
<SYSTEM1>HBL-010LWU:PBI-BCM-001:</SYSTEM1>
@@ -323,6 +332,7 @@
<CONTROL_GROUP>PBI-BCM05</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-001</IOCNAME>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
<SYSTEM1>HEBT-010LWU:PBI-BCM-001:</SYSTEM1>
@@ -349,6 +359,7 @@
<CONTROL_GROUP>PBI-BCM06</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-001</IOCNAME>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
<SYSTEM1>HEBT-160LWU:PBI-BCM-001:</SYSTEM1>
@@ -375,6 +386,7 @@
<CONTROL_GROUP>PBI-BCM07</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
+ <IOCNAME>$(P)SC-IOC-001</IOCNAME>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
<SYSTEM1>A2T-090Drf:PBI-BCM-001:</SYSTEM1>
diff --git a/99-Shared/adsis8300bcm/bcm_crate.bob b/99-Shared/adsis8300bcm/bcm_crate.bob
index 12f6116..a91b443 100644
--- a/99-Shared/adsis8300bcm/bcm_crate.bob
+++ b/99-Shared/adsis8300bcm/bcm_crate.bob
@@ -1697,7 +1697,7 @@ pvs[1].setValue("{0}.{1}.{2}".format((ver>>24)&0x0f,(ver>>8)&0x0f,ver&0x0f))
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_112</name>
- <pv_name>$(P)SC-IOC-001:adsis8300bcm_VER</pv_name>
+ <pv_name>$(IOCNAME):adsis8300bcm_VER</pv_name>
<x>1340</x>
<y>36</y>
<width>80</width>
--
GitLab