Skip to content
Snippets Groups Projects
Commit 25d3b681 authored by Juliano Murari's avatar Juliano Murari
Browse files

Update BCM01 CPU02 names and add EVR_DEV macro

parent 06307b72
No related branches found
No related tags found
1 merge request!31BCM updates
Hide whitespace changes
Inline Side-by-side
10-Top/bcmioc/top.bob
+ 34
− 24
View file @ 25d3b681
......@@ -84,10 +84,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<CONTROL_GROUP>PBI-BCM01</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>PBI-BCM01:</P>
<R>Ctrl-AMC-110:</R>
......@@ -102,6 +102,7 @@
<SYSTEM8>ISrc-010:ISS-HVPf</SYSTEM8>
<SYSTEM9>DTL-030:PBI-BCM-001</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>10</x>
<y>60</y>
<width>410</width>
......@@ -109,10 +110,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_1</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-004</AMC_NAME>
<CONTROL_GROUP>LAB-BCM09</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>LAB-BCM09:</P>
<R>Ctrl-AMC-004:</R>
......@@ -127,6 +128,7 @@
<SYSTEM8>LAB-009:PBI-BCM-008</SYSTEM8>
<SYSTEM9>LAB-009:PBI-BCM-009</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>830</x>
<y>230</y>
<width>410</width>
......@@ -134,24 +136,25 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_3</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<CONTROL_GROUP>BCM01-CPU02</CONTROL_GROUP>
<AMC_NAME>Ctrl-AMC-210</AMC_NAME>
<CONTROL_GROUP>PBI-BCM01</CONTROL_GROUP>
<EVR_DEV>EVR-201</EVR_DEV>
<HV_EN>true</HV_EN>
<P>BCM01-CPU02:</P>
<R>Ctrl-AMC-110:</R>
<SYSTEM1>ISrc-010:PBI-BCM-001-CPU-002</SYSTEM1>
<SYSTEM10>DTL-040:PBI-BCM-001-CPU-002</SYSTEM10>
<SYSTEM2>LEBT-010:PBI-BCM-001-CPU-002</SYSTEM2>
<SYSTEM3>RFQ-010:PBI-BCM-001-CPU-002</SYSTEM3>
<SYSTEM4>MEBT-010:PBI-BCM-001-CPU-002</SYSTEM4>
<SYSTEM5>MEBT-010:PBI-BCM-002-CPU-002</SYSTEM5>
<SYSTEM6>DTL-010:PBI-BCM-001-CPU-002</SYSTEM6>
<SYSTEM7>DTL-020:PBI-BCM-001-CPU-002</SYSTEM7>
<SYSTEM8>ISrc-010:ISS-HVPf-CPU-002</SYSTEM8>
<SYSTEM9>DTL-030:PBI-BCM-001</SYSTEM9>
<P>PBI-BCM01:</P>
<R>Ctrl-AMC-210:</R>
<SYSTEM1>ISrc-010:PBI-BCM-201</SYSTEM1>
<SYSTEM10>$(P)$(R):AI10-</SYSTEM10>
<SYSTEM2>LEBT-010:PBI-BCM-201</SYSTEM2>
<SYSTEM3>RFQ-010:PBI-BCM-201</SYSTEM3>
<SYSTEM4>MEBT-010:PBI-BCM-201</SYSTEM4>
<SYSTEM5>MEBT-010:PBI-BCM-202</SYSTEM5>
<SYSTEM6>DTL-010:PBI-BCM-201</SYSTEM6>
<SYSTEM7>DTL-020:PBI-BCM-201</SYSTEM7>
<SYSTEM8>ISrc-010:ISS-HVPf-201</SYSTEM8>
<SYSTEM9>$(P)$(R):AI9-</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>10</x>
<y>230</y>
<width>410</width>
......@@ -159,10 +162,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_2</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-005</AMC_NAME>
<CONTROL_GROUP>LAB-BCM08</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>LAB-BCM08:</P>
<R>Ctrl-AMC-005:</R>
......@@ -177,6 +180,7 @@
<SYSTEM8>LAB-008:PBI-BCM-008</SYSTEM8>
<SYSTEM9>LAB-008:PBI-BCM-009</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>830</x>
<y>60</y>
<width>470</width>
......@@ -184,10 +188,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_4</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-005</AMC_NAME>
<CONTROL_GROUP>LAB-BCM11</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>LAB-BCM11:</P>
<R>Ctrl-AMC-005:</R>
......@@ -202,6 +206,7 @@
<SYSTEM8>LAB-011:PBI-BCM-008</SYSTEM8>
<SYSTEM9>LAB-011:PBI-BCM-009</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>830</x>
<y>400</y>
<width>470</width>
......@@ -209,10 +214,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_5</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<CONTROL_GROUP>PBI-BCM02</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
......@@ -227,6 +232,7 @@
<SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
<SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>10</x>
<y>400</y>
<width>410</width>
......@@ -234,10 +240,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_6</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<CONTROL_GROUP>PBI-BCM03</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
......@@ -252,6 +258,7 @@
<SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
<SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>10</x>
<y>570</y>
<width>410</width>
......@@ -259,10 +266,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_7</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<CONTROL_GROUP>PBI-BCM04</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
......@@ -277,6 +284,7 @@
<SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
<SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>420</x>
<y>60</y>
<width>410</width>
......@@ -284,10 +292,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_8</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<CONTROL_GROUP>PBI-BCM05</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
......@@ -302,6 +310,7 @@
<SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
<SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>420</x>
<y>230</y>
<width>410</width>
......@@ -309,10 +318,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_9</name>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-110</AMC_NAME>
<CONTROL_GROUP>PBI-BCM06</CONTROL_GROUP>
<EVR_DEV>EVR-101</EVR_DEV>
<HV_EN>true</HV_EN>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
......@@ -327,6 +336,7 @@
<SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008</SYSTEM8>
<SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009</SYSTEM9>
</macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>420</x>
<y>400</y>
<width>410</width>
......
99-Shared/adsis8300bcm/bcm_crate.bob
+ 4
− 3
View file @ 25d3b681
......@@ -2492,11 +2492,11 @@ pvs[1].setValue("{0}.{1}.{2}".format((ver>>24)&0x0f,(ver>>8)&0x0f,ver&0x0f))
<action type="open_display">
<file>../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</file>
<macros>
<EVR>$(P)Ctrl-EVR-101</EVR>
<EVR>$(P)Ctrl-$(EVR_DEV)</EVR>
<P>$(P)</P>
<R>Ctrl-EVR-101:</R>
<R>Ctrl-$(EVR_DEV):</R>
</macros>
<target>replace</target>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
......@@ -2508,5 +2508,6 @@ pvs[1].setValue("{0}.{1}.{2}".format((ver>>24)&0x0f,(ver>>8)&0x0f,ver&0x0f))
<color red="240" green="240" blue="240">
</color>
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
</display>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment