diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob index 1f2c874ddf8e3aed50592afb8554904888a08538..67082b178dfd696b104f0c189763999fc37b0c16 100644 --- a/10-Top/bcmioc/top.bob +++ b/10-Top/bcmioc/top.bob @@ -87,6 +87,7 @@ <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> @@ -107,36 +108,12 @@ <width>410</width> <height>170</height> </widget> - <widget type="embedded" version="2.0.0"> - <name>Embedded Display_1</name> - <macros> - <AMC_NAME>Ctrl-AMC-004</AMC_NAME> - <CONTROL_GROUP>LAB-BCM09</CONTROL_GROUP> - <HV_EN>true</HV_EN> - <P>LAB-BCM09:</P> - <R>Ctrl-AMC-004:</R> - <SYSTEM1>LAB-009:PBI-BCM-001:</SYSTEM1> - <SYSTEM10>LAB-009:PBI-BCM-010:</SYSTEM10> - <SYSTEM2>LAB-009:PBI-BCM-002:</SYSTEM2> - <SYSTEM3>LAB-009:PBI-BCM-003:</SYSTEM3> - <SYSTEM4>LAB-009:PBI-BCM-004:</SYSTEM4> - <SYSTEM5>LAB-009:PBI-BCM-005:</SYSTEM5> - <SYSTEM6>LAB-009:PBI-BCM-006:</SYSTEM6> - <SYSTEM7>LAB-009:PBI-BCM-007:</SYSTEM7> - <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> - <height>200</height> - </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_3</name> <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>PBI-BCM01:</P> <R>Ctrl-AMC-210:</R> @@ -162,6 +139,7 @@ <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> @@ -178,7 +156,7 @@ </macros> <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> <x>830</x> - <y>60</y> + <y>400</y> <width>470</width> <height>200</height> </widget> @@ -187,6 +165,7 @@ <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> @@ -203,7 +182,7 @@ </macros> <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> <x>830</x> - <y>400</y> + <y>570</y> <width>470</width> <height>200</height> </widget> @@ -212,19 +191,20 @@ <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> - <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1> - <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10> - <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2> - <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3> - <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4> - <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5> - <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6> - <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7> - <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8> - <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9> + <SYSTEM1>DTL-030:PBI-BCM-001:</SYSTEM1> + <SYSTEM10>$(P)$(R)AI10-</SYSTEM10> + <SYSTEM2>DTL-040:PBI-BCM-001:</SYSTEM2> + <SYSTEM3>DTL-050:PBI-BCM-001:</SYSTEM3> + <SYSTEM4>$(P)$(R)AI4-</SYSTEM4> + <SYSTEM5>$(P)$(R)AI5-</SYSTEM5> + <SYSTEM6>$(P)$(R)AI6-</SYSTEM6> + <SYSTEM7>$(P)$(R)AI7-</SYSTEM7> + <SYSTEM8>$(P)$(R)AI8-</SYSTEM8> + <SYSTEM9>$(P)$(R)AI9-</SYSTEM9> </macros> <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> <x>10</x> @@ -233,23 +213,50 @@ <height>170</height> </widget> <widget type="embedded" version="2.0.0"> - <name>Embedded Display_6</name> + <name>Embedded Display_12</name> <macros> <AMC_NAME>Ctrl-AMC-110</AMC_NAME> - <CONTROL_GROUP>PBI-BCM03</CONTROL_GROUP> + <CONTROL_GROUP>PBI-BCMT1</CONTROL_GROUP> + <EVR_DEV>EVR-101</EVR_DEV> + <HV_EN>true</HV_EN> + <P>PBI-BCMT1:</P> + <R>Ctrl-AMC-110:</R> + <SYSTEM1>TS4-ISrc:PBI-BCM-001:</SYSTEM1> + <SYSTEM10>$(P)$(R)AI10-</SYSTEM10> + <SYSTEM2>TS4-LEBT:PBI-BCM-001:</SYSTEM2> + <SYSTEM3>$(P)$(R)AI3-</SYSTEM3> + <SYSTEM4>$(P)$(R)AI4-</SYSTEM4> + <SYSTEM5>$(P)$(R)AI5-</SYSTEM5> + <SYSTEM6>$(P)$(R)AI6-</SYSTEM6> + <SYSTEM7>$(P)$(R)AI7-</SYSTEM7> + <SYSTEM8>$(P)$(R)AI8-</SYSTEM8> + <SYSTEM9>$(P)$(R)AI9-</SYSTEM9> + </macros> + <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> + <x>830</x> + <y>230</y> + <width>410</width> + <height>170</height> + </widget> + <widget type="embedded" version="2.0.0"> + <name>Embedded Display_13</name> + <macros> + <AMC_NAME>Ctrl-AMC-210</AMC_NAME> + <CONTROL_GROUP>PBI-BCM02</CONTROL_GROUP> + <EVR_DEV>EVR-201</EVR_DEV> <HV_EN>true</HV_EN> <P>$(CONTROL_GROUP):</P> <R>$(AMC_NAME):</R> - <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1> - <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10> - <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2> - <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3> - <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4> - <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5> - <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6> - <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7> - <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8> - <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9> + <SYSTEM1>DTL-030:PBI-BCM-201:</SYSTEM1> + <SYSTEM10>$(P)$(R)AI10-</SYSTEM10> + <SYSTEM2>DTL-040:PBI-BCM-201:</SYSTEM2> + <SYSTEM3>DTL-050:PBI-BCM-201:</SYSTEM3> + <SYSTEM4>$(P)$(R)AI4-</SYSTEM4> + <SYSTEM5>$(P)$(R)AI5-</SYSTEM5> + <SYSTEM6>$(P)$(R)AI6-</SYSTEM6> + <SYSTEM7>$(P)$(R)AI7-</SYSTEM7> + <SYSTEM8>$(P)$(R)AI8-</SYSTEM8> + <SYSTEM9>$(P)$(R)AI9-</SYSTEM9> </macros> <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> <x>10</x> @@ -258,23 +265,24 @@ <height>170</height> </widget> <widget type="embedded" version="2.0.0"> - <name>Embedded Display_7</name> + <name>Embedded Display_15</name> <macros> <AMC_NAME>Ctrl-AMC-110</AMC_NAME> - <CONTROL_GROUP>PBI-BCM04</CONTROL_GROUP> + <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> - <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1> - <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10> - <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2> - <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3> - <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4> - <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5> - <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6> - <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7> - <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8> - <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9> + <SYSTEM1>MBL-010LWU:PBI-BCM-001:</SYSTEM1> + <SYSTEM10>$(P)$(R)AI10-</SYSTEM10> + <SYSTEM2>$(P)$(R)AI2-</SYSTEM2> + <SYSTEM3>$(P)$(R)AI3-</SYSTEM3> + <SYSTEM4>$(P)$(R)AI4-</SYSTEM4> + <SYSTEM5>$(P)$(R)AI5-</SYSTEM5> + <SYSTEM6>$(P)$(R)AI6-</SYSTEM6> + <SYSTEM7>$(P)$(R)AI7-</SYSTEM7> + <SYSTEM8>$(P)$(R)AI8-</SYSTEM8> + <SYSTEM9>$(P)$(R)AI9-</SYSTEM9> </macros> <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> <x>420</x> @@ -283,23 +291,24 @@ <height>170</height> </widget> <widget type="embedded" version="2.0.0"> - <name>Embedded Display_8</name> + <name>Embedded Display_16</name> <macros> <AMC_NAME>Ctrl-AMC-110</AMC_NAME> - <CONTROL_GROUP>PBI-BCM05</CONTROL_GROUP> + <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> - <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1> - <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10> - <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2> - <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3> - <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4> - <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5> - <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6> - <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7> - <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8> - <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9> + <SYSTEM1>HBL-010LWU:PBI-BCM-001:</SYSTEM1> + <SYSTEM10>$(P)$(R)AI10-</SYSTEM10> + <SYSTEM2>$(P)$(R)AI2-</SYSTEM2> + <SYSTEM3>$(P)$(R)AI3-</SYSTEM3> + <SYSTEM4>$(P)$(R)AI4-</SYSTEM4> + <SYSTEM5>$(P)$(R)AI5-</SYSTEM5> + <SYSTEM6>$(P)$(R)AI6-</SYSTEM6> + <SYSTEM7>$(P)$(R)AI7-</SYSTEM7> + <SYSTEM8>$(P)$(R)AI8-</SYSTEM8> + <SYSTEM9>$(P)$(R)AI9-</SYSTEM9> </macros> <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> <x>420</x> @@ -308,23 +317,24 @@ <height>170</height> </widget> <widget type="embedded" version="2.0.0"> - <name>Embedded Display_9</name> + <name>Embedded Display_17</name> <macros> <AMC_NAME>Ctrl-AMC-110</AMC_NAME> - <CONTROL_GROUP>PBI-BCM06</CONTROL_GROUP> + <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> - <SYSTEM1>$(CONTROL_GROUP):PBI-BCM-001:</SYSTEM1> - <SYSTEM10>$(CONTROL_GROUP):PBI-BCM-010:</SYSTEM10> - <SYSTEM2>$(CONTROL_GROUP):PBI-BCM-002:</SYSTEM2> - <SYSTEM3>$(CONTROL_GROUP):PBI-BCM-003:</SYSTEM3> - <SYSTEM4>$(CONTROL_GROUP):PBI-BCM-004:</SYSTEM4> - <SYSTEM5>$(CONTROL_GROUP):PBI-BCM-005:</SYSTEM5> - <SYSTEM6>$(CONTROL_GROUP):PBI-BCM-006:</SYSTEM6> - <SYSTEM7>$(CONTROL_GROUP):PBI-BCM-007:</SYSTEM7> - <SYSTEM8>$(CONTROL_GROUP):PBI-BCM-008:</SYSTEM8> - <SYSTEM9>$(CONTROL_GROUP):PBI-BCM-009:</SYSTEM9> + <SYSTEM1>HEBT-010LWU:PBI-BCM-001:</SYSTEM1> + <SYSTEM10>$(P)$(R)AI10-</SYSTEM10> + <SYSTEM2>$(P)$(R)AI2-</SYSTEM2> + <SYSTEM3>$(P)$(R)AI3-</SYSTEM3> + <SYSTEM4>$(P)$(R)AI4-</SYSTEM4> + <SYSTEM5>$(P)$(R)AI5-</SYSTEM5> + <SYSTEM6>$(P)$(R)AI6-</SYSTEM6> + <SYSTEM7>$(P)$(R)AI7-</SYSTEM7> + <SYSTEM8>$(P)$(R)AI8-</SYSTEM8> + <SYSTEM9>$(P)$(R)AI9-</SYSTEM9> </macros> <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> <x>420</x> @@ -332,4 +342,56 @@ <width>410</width> <height>170</height> </widget> + <widget type="embedded" version="2.0.0"> + <name>Embedded Display_18</name> + <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> + <SYSTEM1>HEBT-160LWU:PBI-BCM-001:</SYSTEM1> + <SYSTEM10>$(P)$(R)AI10-</SYSTEM10> + <SYSTEM2>A2T-010LWU:PBI-BCM-001:</SYSTEM2> + <SYSTEM3>DmpL-010Drf:PBI-BCM-001:</SYSTEM3> + <SYSTEM4>$(P)$(R)AI4-</SYSTEM4> + <SYSTEM5>$(P)$(R)AI5-</SYSTEM5> + <SYSTEM6>$(P)$(R)AI6-</SYSTEM6> + <SYSTEM7>$(P)$(R)AI7-</SYSTEM7> + <SYSTEM8>$(P)$(R)AI8-</SYSTEM8> + <SYSTEM9>$(P)$(R)AI9-</SYSTEM9> + </macros> + <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> + <x>420</x> + <y>570</y> + <width>410</width> + <height>170</height> + </widget> + <widget type="embedded" version="2.0.0"> + <name>Embedded Display_19</name> + <macros> + <AMC_NAME>Ctrl-AMC-110</AMC_NAME> + <CONTROL_GROUP>PBI-BCM07</CONTROL_GROUP> + <EVR_DEV>EVR-101</EVR_DEV> + <HV_EN>true</HV_EN> + <P>$(CONTROL_GROUP):</P> + <R>$(AMC_NAME):</R> + <SYSTEM1>A2T-090Drf:PBI-BCM-001:</SYSTEM1> + <SYSTEM10>$(P)$(R)AI10-</SYSTEM10> + <SYSTEM2>A2T-130LWU:PBI-BCM-001:</SYSTEM2> + <SYSTEM3>DmpL-040Drf:PBI-BCM-001:</SYSTEM3> + <SYSTEM4>$(P)$(R)AI4-</SYSTEM4> + <SYSTEM5>$(P)$(R)AI5-</SYSTEM5> + <SYSTEM6>$(P)$(R)AI6-</SYSTEM6> + <SYSTEM7>$(P)$(R)AI7-</SYSTEM7> + <SYSTEM8>$(P)$(R)AI8-</SYSTEM8> + <SYSTEM9>$(P)$(R)AI9-</SYSTEM9> + </macros> + <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> + <x>830</x> + <y>60</y> + <width>410</width> + <height>170</height> + </widget> </display> diff --git a/99-Shared/adsis8300bcm/acct_m.bob b/99-Shared/adsis8300bcm/acct_m.bob index 6867dddef591d87c3d848680477c221896fef3be..e776eaef01cbf9a925b391a077f1ab40d1caa9e1 100644 --- a/99-Shared/adsis8300bcm/acct_m.bob +++ b/99-Shared/adsis8300bcm/acct_m.bob @@ -1226,7 +1226,7 @@ pvs[1].setValue(dec)]]></text> <x>40</x> <y>354</y> <width>119</width> - <height>21</height> + <height>25</height> <auto_size>true</auto_size> </widget> <widget type="slide_button" version="2.0.0"> @@ -1235,8 +1235,8 @@ pvs[1].setValue(dec)]]></text> <label>Baseline Correction</label> <x>40</x> <y>378</y> - <width>174</width> - <height>21</height> + <width>175</width> + <height>25</height> <auto_size>true</auto_size> </widget> <widget type="slide_button" version="2.0.0"> @@ -1246,7 +1246,7 @@ pvs[1].setValue(dec)]]></text> <x>40</x> <y>402</y> <width>117</width> - <height>21</height> + <height>25</height> <auto_size>true</auto_size> </widget> <widget type="slide_button" version="2.0.0"> @@ -1255,8 +1255,8 @@ pvs[1].setValue(dec)]]></text> <label>Droop Compensation</label> <x>40</x> <y>426</y> - <width>186</width> - <height>21</height> + <width>187</width> + <height>25</height> <auto_size>true</auto_size> </widget> <widget type="textupdate" version="2.0.0"> @@ -1616,7 +1616,7 @@ pvs[1].setValue(dec)]]></text> <x>37</x> <y>640</y> <width>199</width> - <height>21</height> + <height>25</height> <off_color> <color red="0" green="255" blue="0"> </color> @@ -1636,7 +1636,7 @@ pvs[1].setValue(dec)]]></text> <x>37</x> <y>616</y> <width>144</width> - <height>21</height> + <height>25</height> <off_color> <color red="0" green="255" blue="0"> </color> @@ -1656,7 +1656,7 @@ pvs[1].setValue(dec)]]></text> <x>37</x> <y>592</y> <width>85</width> - <height>21</height> + <height>25</height> <off_color> <color red="0" green="255" blue="0"> </color> @@ -1676,7 +1676,7 @@ pvs[1].setValue(dec)]]></text> <x>37</x> <y>568</y> <width>85</width> - <height>21</height> + <height>25</height> <off_color> <color red="0" green="255" blue="0"> </color> @@ -1696,7 +1696,7 @@ pvs[1].setValue(dec)]]></text> <x>37</x> <y>544</y> <width>85</width> - <height>21</height> + <height>25</height> <off_color> <color red="0" green="255" blue="0"> </color> @@ -1711,11 +1711,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_11</name> - <file>ml.bob</file> <macros> <ML>AlarmLimit</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>635</y> <width>70</width> @@ -1724,11 +1724,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_10</name> - <file>ml.bob</file> <macros> <ML>AlarmTrigger</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>611</y> <width>70</width> @@ -1737,11 +1737,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_9</name> - <file>ml.bob</file> <macros> <ML>AlarmErrant</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>587</y> <width>70</width> @@ -1750,11 +1750,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_8</name> - <file>ml.bob</file> <macros> <ML>AlarmLower</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>563</y> <width>70</width> @@ -1763,11 +1763,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_7</name> - <file>ml.bob</file> <macros> <ML>AlarmUpper</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>539</y> <width>70</width> @@ -1865,11 +1865,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_16</name> - <file>ml.bob</file> <macros> <ML>AlarmChargeTooHigh</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>683</y> <width>70</width> @@ -1878,11 +1878,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_14</name> - <file>ml.bob</file> <macros> <ML>AlarmAiuFault</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>659</y> <width>70</width> @@ -1896,7 +1896,7 @@ pvs[1].setValue(dec)]]></text> <x>37</x> <y>760</y> <width>112</width> - <height>21</height> + <height>25</height> <off_color> <color red="0" green="255" blue="0"> </color> @@ -1916,7 +1916,7 @@ pvs[1].setValue(dec)]]></text> <x>37</x> <y>736</y> <width>145</width> - <height>21</height> + <height>25</height> <off_color> <color red="0" green="255" blue="0"> </color> @@ -1936,7 +1936,7 @@ pvs[1].setValue(dec)]]></text> <x>37</x> <y>712</y> <width>135</width> - <height>21</height> + <height>25</height> <off_color> <color red="0" green="255" blue="0"> </color> @@ -1951,11 +1951,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_15</name> - <file>ml.bob</file> <macros> <ML>AlarmAdcStuck</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>755</y> <width>70</width> @@ -1964,11 +1964,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_13</name> - <file>ml.bob</file> <macros> <ML>AlarmAdcUnderflow</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>731</y> <width>70</width> @@ -1977,11 +1977,11 @@ pvs[1].setValue(dec)]]></text> </widget> <widget type="embedded" version="2.0.0"> <name>Embedded Display_12</name> - <file>ml.bob</file> <macros> <ML>AlarmAdcOverflow</ML> <PVin>$(P)$(R)$(ID)</PVin> </macros> + <file>ml.bob</file> <x>370</x> <y>707</y> <width>70</width> @@ -2239,76 +2239,6 @@ pvs[1].setValue(dec)]]></text> <vertical_alignment>1</vertical_alignment> <wrap_words>false</wrap_words> </widget> - <widget type="textentry" version="3.0.0"> - <name>Text Input_14</name> - <pv_name>$(P)$(R)$(ID)FlatTopEnd</pv_name> - <x>575</x> - <y>1037</y> - <width>80</width> - <height>30</height> - <format>1</format> - <show_units>false</show_units> - <actions> - </actions> - <border_alarm_sensitive>false</border_alarm_sensitive> - <border_color> - <color red="0" green="128" blue="255"> - </color> - </border_color> - </widget> - <widget type="textupdate" version="2.0.0"> - <name>Text Update_92</name> - <pv_name>$(P)$(R)$(ID)FlatTopEndR</pv_name> - <x>666</x> - <y>1037</y> - <width>80</width> - <height>30</height> - <format>1</format> - <horizontal_alignment>1</horizontal_alignment> - <vertical_alignment>1</vertical_alignment> - <wrap_words>false</wrap_words> - <actions> - </actions> - <border_color> - <color red="0" green="128" blue="255"> - </color> - </border_color> - </widget> - <widget type="textentry" version="3.0.0"> - <name>Text Input_13</name> - <pv_name>$(P)$(R)$(ID)FlatTopStart</pv_name> - <x>575</x> - <y>997</y> - <width>80</width> - <height>30</height> - <format>1</format> - <show_units>false</show_units> - <actions> - </actions> - <border_alarm_sensitive>false</border_alarm_sensitive> - <border_color> - <color red="0" green="128" blue="255"> - </color> - </border_color> - </widget> - <widget type="textupdate" version="2.0.0"> - <name>Text Update_91</name> - <pv_name>$(P)$(R)$(ID)FlatTopStartR</pv_name> - <x>666</x> - <y>997</y> - <width>80</width> - <height>30</height> - <format>1</format> - <horizontal_alignment>1</horizontal_alignment> - <vertical_alignment>1</vertical_alignment> - <wrap_words>false</wrap_words> - <actions> - </actions> - <border_color> - <color red="0" green="128" blue="255"> - </color> - </border_color> - </widget> <widget type="label" version="2.0.0"> <name>BGGrey02-title_23</name> <text>Lower Thr. En. Wnd.</text> @@ -2899,4 +2829,144 @@ pvs[1].setValue(dec)]]></text> <corner_width>5</corner_width> <corner_height>5</corner_height> </widget> + <widget type="slide_button" version="2.0.0"> + <name>Slide Button_14</name> + <pv_name>$(P)$(R)$(ID)AutoFlatTopEnable</pv_name> + <label></label> + <x>514</x> + <y>970</y> + <width>43</width> + <height>25</height> + <auto_size>true</auto_size> + </widget> + <widget type="label" version="2.0.0"> + <name>Label_358</name> + <text>Auto</text> + <x>517</x> + <y>945</y> + <width>48</width> + <height>30</height> + <vertical_alignment>1</vertical_alignment> + <wrap_words>false</wrap_words> + <actions> + </actions> + <border_color> + <color red="0" green="128" blue="255"> + </color> + </border_color> + </widget> + <widget type="textentry" version="3.0.0"> + <name>Text Input_13</name> + <pv_name>$(P)$(R)$(ID)FlatTopStart</pv_name> + <x>575</x> + <y>997</y> + <width>80</width> + <height>30</height> + <format>1</format> + <show_units>false</show_units> + <actions> + </actions> + <rules> + <rule name="update_auto_mode" prop_id="pv_name" out_exp="false"> + <exp bool_exp="pv0=0"> + <value>$(P)$(R)$(ID)FlatTopStart</value> + </exp> + <exp bool_exp="pv0=1"> + <value>$(P)$(R)$(ID)AutoFlatTopStart</value> + </exp> + <pv_name>$(P)$(R)$(ID)AutoFlatTopEnable</pv_name> + </rule> + </rules> + <border_alarm_sensitive>false</border_alarm_sensitive> + <border_color> + <color red="0" green="128" blue="255"> + </color> + </border_color> + </widget> + <widget type="textentry" version="3.0.0"> + <name>Text Input_14</name> + <pv_name>$(P)$(R)$(ID)FlatTopEnd</pv_name> + <x>575</x> + <y>1037</y> + <width>80</width> + <height>30</height> + <format>1</format> + <show_units>false</show_units> + <actions> + </actions> + <rules> + <rule name="update_auto_mode" prop_id="pv_name" out_exp="false"> + <exp bool_exp="pv0=0"> + <value>$(P)$(R)$(ID)FlatTopEnd</value> + </exp> + <exp bool_exp="pv0=1"> + <value>$(P)$(R)$(ID)AutoFlatTopEnd</value> + </exp> + <pv_name>$(P)$(R)$(ID)AutoFlatTopEnable</pv_name> + </rule> + </rules> + <border_alarm_sensitive>false</border_alarm_sensitive> + <border_color> + <color red="0" green="128" blue="255"> + </color> + </border_color> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>Text Update_92</name> + <pv_name>$(P)$(R)$(ID)FlatTopEndR</pv_name> + <x>666</x> + <y>1037</y> + <width>80</width> + <height>30</height> + <format>1</format> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + <wrap_words>false</wrap_words> + <actions> + </actions> + <rules> + <rule name="update_auto_mode" prop_id="pv_name" out_exp="false"> + <exp bool_exp="pv0=0"> + <value>$(P)$(R)$(ID)FlatTopEndR</value> + </exp> + <exp bool_exp="pv0=1"> + <value>$(P)$(R)$(ID)AutoFlatTopEndR</value> + </exp> + <pv_name>$(P)$(R)$(ID)AutoFlatTopEnable</pv_name> + </rule> + </rules> + <border_color> + <color red="0" green="128" blue="255"> + </color> + </border_color> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>Text Update_91</name> + <pv_name>$(P)$(R)$(ID)FlatTopStartR</pv_name> + <x>666</x> + <y>997</y> + <width>80</width> + <height>30</height> + <format>1</format> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + <wrap_words>false</wrap_words> + <actions> + </actions> + <rules> + <rule name="update_auto_mode" prop_id="pv_name" out_exp="false"> + <exp bool_exp="pv0=0"> + <value>$(P)$(R)$(ID)FlatTopStartR</value> + </exp> + <exp bool_exp="pv0=1"> + <value>$(P)$(R)$(ID)AutoFlatTopStartR</value> + </exp> + <pv_name>$(P)$(R)$(ID)AutoFlatTopEnable</pv_name> + </rule> + </rules> + <border_color> + <color red="0" green="128" blue="255"> + </color> + </border_color> + </widget> </display> diff --git a/99-Shared/adsis8300bcm/bcm_crate.bob b/99-Shared/adsis8300bcm/bcm_crate.bob index 3776216ffd5b2e41bf461312df001a1d387fcbb5..12f61168fccdc5e3813f380c64096dcd75d61a41 100644 --- a/99-Shared/adsis8300bcm/bcm_crate.bob +++ b/99-Shared/adsis8300bcm/bcm_crate.bob @@ -658,7 +658,13 @@ $(pv_value)</tooltip> </background_color> <rules> <rule name="New Rule" prop_id="background_color" out_exp="false"> - <exp bool_exp="pv0==0"> + <exp bool_exp="pv0==1 || pv1==1 || pv2==1 || pv3==1 || pv4==1 || pv5==1 || pv6==1 || pv7==1 || pv8==1 || pv9==1 || pv10==1 || pv11==1 || pv12==1 || pv13==1 || pv14==1 || pv15==1 || pv16==1 || pv17==1 || pv18==1 || pv19==1 || pv20==1 || pv21==1 || pv22==1 || pv23==1 || pv24==1 || pv25==1 || pv26==1 || pv27==1 || pv28==1 || pv29==1 "> + <value> + <color name="MAJOR" red="252" green="13" blue="27"> + </color> + </value> + </exp> + <exp bool_exp="pv0==0 && pv1==0 && pv2==0 && pv3==0 && pv4==0 && pv5==0 && pv6==0 && pv7==0 && pv8==0 && pv9==0 && pv10==0 && pv11==0 && pv12==0 && pv13==0 && pv14==0 && pv15==0 && pv16==0 && pv17==0 && pv18==0 && pv19==0 && pv20==0 && pv21==0 && pv22==0 && pv23==0 && pv24==0 && pv25==0 && pv26==0 && pv27==0 && pv28==0 && pv29==0 "> <value> <color red="0" green="255" blue="0"> </color> @@ -667,6 +673,33 @@ $(pv_value)</tooltip> <pv_name>$(P)$(R)DF1-AlarmFastHoldR</pv_name> <pv_name>$(P)$(R)DF1-AlarmMediumHoldR</pv_name> <pv_name>$(P)$(R)DF1-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF2-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF2-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF2-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF3-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF3-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF3-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF4-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF4-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF4-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF5-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF5-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF5-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF6-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF6-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF6-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF7-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF7-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF7-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF8-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF8-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF8-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF9-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF9-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF9-AlarmSlowHoldR</pv_name> + <pv_name>$(P)$(R)DF10-AlarmFastHoldR</pv_name> + <pv_name>$(P)$(R)DF10-AlarmMediumHoldR</pv_name> + <pv_name>$(P)$(R)DF10-AlarmSlowHoldR</pv_name> </rule> </rules> <tooltip>$(actions)</tooltip> @@ -2459,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> @@ -2475,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> diff --git a/99-Shared/adsis8300bcm/optic_inst.bob b/99-Shared/adsis8300bcm/optic_inst.bob index 1dd0e0492c6f552ec3007c5f990db91279661382..423d0d59a9ff9121b14fbf31eb61deba2b911ef7 100644 --- a/99-Shared/adsis8300bcm/optic_inst.bob +++ b/99-Shared/adsis8300bcm/optic_inst.bob @@ -54,6 +54,7 @@ </widget> <widget type="combo" version="2.0.0"> <name>Menu Button_9</name> + <pv_name>$(P)$(R)FB$(OptIndex)-OutDataSelect</pv_name> <x>160</x> <y>10</y> <width>120</width> @@ -61,10 +62,13 @@ <color red="240" green="240" blue="240"> </color> </background_color> + <actions> + </actions> <border_alarm_sensitive>false</border_alarm_sensitive> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_133</name> + <pv_name>$(P)$(R)FB$(OptIndex)-OutDataSelectR</pv_name> <x>300</x> <y>10</y> <width>120</width> @@ -99,16 +103,13 @@ </widget> <widget type="led" version="2.0.0"> <name>LED_27</name> - <x>102</x> - <y>45</y> + <pv_name>$(P)$(R)FB$(OptIndex)-LaneUpR</pv_name> + <x>250</x> + <y>50</y> <off_color> - <color name="IO Normal Level Alarm" red="0" green="255" blue="0"> + <color name="MAJOR" red="252" green="13" blue="27"> </color> </off_color> - <on_color> - <color name="Major" red="250" green="12" blue="14"> - </color> - </on_color> <square>true</square> <actions> </actions> @@ -116,8 +117,8 @@ <widget type="label" version="2.0.0"> <name>Label_358</name> <text>Lane Up</text> - <x>17</x> - <y>40</y> + <x>165</x> + <y>45</y> <width>75</width> <height>30</height> <vertical_alignment>1</vertical_alignment> @@ -131,14 +132,15 @@ </widget> <widget type="led" version="2.0.0"> <name>LED_28</name> - <x>254</x> - <y>45</y> + <pv_name>$(P)$(R)FB$(OptIndex)-SoftwareErrorR</pv_name> + <x>400</x> + <y>50</y> <off_color> - <color name="IO Normal Level Alarm" red="0" green="255" blue="0"> + <color name="On" red="70" green="255" blue="70"> </color> </off_color> <on_color> - <color name="Major" red="250" green="12" blue="14"> + <color name="MAJOR" red="252" green="13" blue="27"> </color> </on_color> <square>true</square> @@ -148,8 +150,8 @@ <widget type="label" version="2.0.0"> <name>Label_359</name> <text>SW Err.</text> - <x>173</x> - <y>40</y> + <x>320</x> + <y>45</y> <width>75</width> <height>30</height> <vertical_alignment>1</vertical_alignment> @@ -163,16 +165,13 @@ </widget> <widget type="led" version="2.0.0"> <name>LED_29</name> - <x>102</x> - <y>75</y> + <pv_name>$(P)$(R)FB$(OptIndex)-ChannelUpR</pv_name> + <x>250</x> + <y>80</y> <off_color> - <color name="IO Normal Level Alarm" red="0" green="255" blue="0"> + <color name="MAJOR" red="252" green="13" blue="27"> </color> </off_color> - <on_color> - <color name="Major" red="250" green="12" blue="14"> - </color> - </on_color> <square>true</square> <actions> </actions> @@ -180,8 +179,8 @@ <widget type="label" version="2.0.0"> <name>Label_360</name> <text>Ch. Up</text> - <x>17</x> - <y>70</y> + <x>165</x> + <y>75</y> <width>75</width> <height>30</height> <vertical_alignment>1</vertical_alignment> @@ -195,14 +194,15 @@ </widget> <widget type="led" version="2.0.0"> <name>LED_30</name> - <x>254</x> - <y>75</y> + <pv_name>$(P)$(R)FB$(OptIndex)-HardwareErrorR</pv_name> + <x>400</x> + <y>80</y> <off_color> - <color name="IO Normal Level Alarm" red="0" green="255" blue="0"> + <color name="On" red="70" green="255" blue="70"> </color> </off_color> <on_color> - <color name="Major" red="250" green="12" blue="14"> + <color name="MAJOR" red="252" green="13" blue="27"> </color> </on_color> <square>true</square> @@ -212,8 +212,8 @@ <widget type="label" version="2.0.0"> <name>Label_361</name> <text>HW Err.</text> - <x>173</x> - <y>70</y> + <x>320</x> + <y>75</y> <width>75</width> <height>30</height> <vertical_alignment>1</vertical_alignment> @@ -227,16 +227,13 @@ </widget> <widget type="led" version="2.0.0"> <name>LED_31</name> - <x>396</x> - <y>45</y> + <pv_name>$(P)$(R)FB$(OptIndex)-SFPPresentR</pv_name> + <x>120</x> + <y>80</y> <off_color> - <color name="IO Normal Level Alarm" red="0" green="255" blue="0"> + <color name="MAJOR" red="252" green="13" blue="27"> </color> </off_color> - <on_color> - <color name="Major" red="250" green="12" blue="14"> - </color> - </on_color> <square>true</square> <actions> </actions> @@ -244,8 +241,8 @@ <widget type="label" version="2.0.0"> <name>Label_362</name> <text>SFP Pres.</text> - <x>315</x> - <y>40</y> + <x>10</x> + <y>75</y> <width>75</width> <height>30</height> <vertical_alignment>1</vertical_alignment> @@ -257,4 +254,52 @@ </color> </border_color> </widget> + <widget type="led" version="2.0.0"> + <name>LED_32</name> + <pv_name>$(P)$(R)FB$(OptIndex)-OutDataEnableR</pv_name> + <x>120</x> + <y>50</y> + <off_color> + <color name="MAJOR" red="252" green="13" blue="27"> + </color> + </off_color> + <square>true</square> + <actions> + </actions> + </widget> + <widget type="label" version="2.0.0"> + <name>Label_363</name> + <text>Enable</text> + <x>10</x> + <y>45</y> + <width>75</width> + <height>30</height> + <vertical_alignment>1</vertical_alignment> + <wrap_words>false</wrap_words> + <actions> + </actions> + <border_color> + <color red="0" green="128" blue="255"> + </color> + </border_color> + </widget> + <widget type="slide_button" version="2.0.0"> + <name>Slide Button_5</name> + <pv_name>$(P)$(R)FB$(OptIndex)-OutDataEnable</pv_name> + <label></label> + <x>70</x> + <y>48</y> + <width>50</width> + <height>20</height> + <off_color> + <color name="Off" red="90" green="110" blue="90"> + </color> + </off_color> + <on_color> + <color name="On" red="70" green="255" blue="70"> + </color> + </on_color> + <actions> + </actions> + </widget> </display>