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

Merge remote-tracking branch 'upstream/master'

parents 1da8931f 02f49e2a
No related branches found
No related tags found
1 merge request!31BCM updates
Expand all Hide whitespace changes
Inline Side-by-side
10-Top/bpmioc/support/instance.bob
+ 10
− 10
View file @ 8b328d2d
...@@ -763,8 +763,8 @@ M7 - FRU Communication Lost</tooltip> ...@@ -763,8 +763,8 @@ M7 - FRU Communication Lost</tooltip>
<name>BPM01</name> <name>BPM01</name>
<class></class> <class></class>
<macros> <macros>
<BPM_PAIR>$(PAIR1_BPMMan)</BPM_PAIR> <BPM_PAIR>$(PAIR_BPMMan)</BPM_PAIR>
<P>$(P1_BPMMan)</P> <P>$(P_BPMMan)</P>
<R>$(R1_BPMMan)</R> <R>$(R1_BPMMan)</R>
<S>$(S1_BPMMan)</S> <S>$(S1_BPMMan)</S>
</macros> </macros>
...@@ -787,12 +787,12 @@ M7 - FRU Communication Lost</tooltip> ...@@ -787,12 +787,12 @@ M7 - FRU Communication Lost</tooltip>
<action type="open_display"> <action type="open_display">
<file>../../../99-Shared/bpmmanager/bpmmanager-bpm-instance.bob</file> <file>../../../99-Shared/bpmmanager/bpmmanager-bpm-instance.bob</file>
<macros> <macros>
<BPM_PAIR>$(PAIR1_BPMMan)</BPM_PAIR> <BPM_PAIR>$(PAIR_BPMMan)</BPM_PAIR>
<P>$(P1_BPMMan)$(S1_BPMMan)</P> <P>$(P_BPMMan)$(S1_BPMMan)</P>
<R>$(R1_BPMMan)</R> <R>$(R1_BPMMan)</R>
</macros> </macros>
<target>tab</target> <target>tab</target>
<description>$(S2_BPMMan)BPM01</description> <description>$(S1_BPMMan)$(R1_BPMMan)</description>
</action> </action>
</actions> </actions>
<text>...</text> <text>...</text>
...@@ -810,8 +810,8 @@ M7 - FRU Communication Lost</tooltip> ...@@ -810,8 +810,8 @@ M7 - FRU Communication Lost</tooltip>
<name>BPM01_1</name> <name>BPM01_1</name>
<class></class> <class></class>
<macros> <macros>
<BPM_PAIR>$(PAIR2_BPMMan)</BPM_PAIR> <BPM_PAIR>$(PAIR_BPMMan)</BPM_PAIR>
<P>$(P2_BPMMan)</P> <P>$(P_BPMMan)</P>
<R>$(R2_BPMMan)</R> <R>$(R2_BPMMan)</R>
<S>$(S2_BPMMan)</S> <S>$(S2_BPMMan)</S>
</macros> </macros>
...@@ -834,12 +834,12 @@ M7 - FRU Communication Lost</tooltip> ...@@ -834,12 +834,12 @@ M7 - FRU Communication Lost</tooltip>
<action type="open_display"> <action type="open_display">
<file>../../../99-Shared/bpmmanager/bpmmanager-bpm-instance.bob</file> <file>../../../99-Shared/bpmmanager/bpmmanager-bpm-instance.bob</file>
<macros> <macros>
<BPM_PAIR>$(PAIR2_BPMMan)</BPM_PAIR> <BPM_PAIR>$(PAIR_BPMMan)</BPM_PAIR>
<P>$(P2_BPMMan)$(S2_BPMMan)</P> <P>$(P_BPMMan)$(S2_BPMMan)</P>
<R>$(R2_BPMMan)</R> <R>$(R2_BPMMan)</R>
</macros> </macros>
<target>tab</target> <target>tab</target>
<description>$(S2_BPMMan)BPM01</description> <description>$(S2_BPMMan)$(R2_BPMMan)</description>
</action> </action>
</actions> </actions>
<text>...</text> <text>...</text>
......
10-Top/bpmioc/top.bob
+ 981
− 38
View file @ 8b328d2d
This diff is collapsed.
10-Top/fcioc/controls.bob 0 → 100755
+ 106
− 0
View file @ 8b328d2d
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>FC-operators-controls</name>
<class></class>
<width>80</width>
<height>200</height>
<background_color>
<color name="Transparent" red="255" green="255" blue="255" alpha="0">
</color>
</background_color>
<widget type="textupdate" version="2.0.0">
<name>Text Update_10</name>
<pv_name>$(P)$(R)HVEnable-RB</pv_name>
<y>60</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<rules>
<rule name="No voltage warning" prop_id="background_color" out_exp="false">
<exp bool_exp="pvStr0==&quot;On&quot;&amp;&amp;pvStr1==&quot;OK&quot;&amp;&amp;pv2==0.0">
<value>
<color name="WARNING" red="252" green="242" blue="17">
</color>
</value>
</exp>
<pv_name>$(P)$(R)HVEnable-RB</pv_name>
<pv_name>$(P)$(R)VacuumInterlockOK</pv_name>
<pv_name>$(P)$(R)Voltage-R</pv_name>
</rule>
</rules>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_14</name>
<pv_name>$(P)$(R)STAT3-MaxValueR</pv_name>
<y>90</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<show_units>false</show_units>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_18</name>
<pv_name>$(P)$(R)STAT3-MeanValueR</pv_name>
<y>120</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<show_units>false</show_units>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_22</name>
<pv_name>$(P)$(R)STAT3-MinValueR</pv_name>
<y>150</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<show_units>false</show_units>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_26</name>
<pv_name>$(P)$(R)PulseChargeUcR</pv_name>
<y>180</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<show_units>false</show_units>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)$(R)CollisionAvoidance</pv_name>
<x>30</x>
<visible>$(CollisionVis=True)</visible>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_4</name>
<pv_name>$(P)$(R)Position-R</pv_name>
<y>30</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
</display>
10-Top/fcioc/operator_old.bob 0 → 100644
+ 1122
− 0
View file @ 8b328d2d
This diff is collapsed.
10-Top/fcioc/top.bob
+ 19
− 18
View file @ 8b328d2d
...@@ -76,21 +76,6 @@ ...@@ -76,21 +76,6 @@
<vertical_alignment use_class="true">1</vertical_alignment> <vertical_alignment use_class="true">1</vertical_alignment>
<wrap_words use_class="true">false</wrap_words> <wrap_words use_class="true">false</wrap_words>
</widget> </widget>
<widget type="action_button" version="3.0.0">
<name>Operator_4</name>
<actions>
<action type="open_display">
<file>../../../../../30-Operator/10-ACC/999-PBI/10-Top/FC.bob</file>
<target>replace</target>
<description>Open Display</description>
</action>
</actions>
<text>Operator</text>
<x>490</x>
<y>10</y>
<width>120</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0"> <widget type="action_button" version="3.0.0">
<name>MachineExpert_2</name> <name>MachineExpert_2</name>
<actions> <actions>
...@@ -184,13 +169,13 @@ ...@@ -184,13 +169,13 @@
<x>390</x> <x>390</x>
<y>240</y> <y>240</y>
<width>330</width> <width>330</width>
<height>150</height> <height>210</height>
<style>3</style> <style>3</style>
<transparent>true</transparent> <transparent>true</transparent>
<widget type="rectangle" version="2.0.0"> <widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_9</name> <name>BGGrey03-titlebar_9</name>
<width>330</width> <width>330</width>
<height>150</height> <height>210</height>
<line_width>0</line_width> <line_width>0</line_width>
<background_color> <background_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151"> <color name="GROUP-BORDER" red="150" green="155" blue="151">
...@@ -204,7 +189,7 @@ ...@@ -204,7 +189,7 @@
<x>20</x> <x>20</x>
<y>50</y> <y>50</y>
<width>290</width> <width>290</width>
<height>80</height> <height>140</height>
<line_width>0</line_width> <line_width>0</line_width>
<background_color> <background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201"> <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
...@@ -270,5 +255,21 @@ ...@@ -270,5 +255,21 @@
<height>40</height> <height>40</height>
<tooltip>$(actions)</tooltip> <tooltip>$(actions)</tooltip>
</widget> </widget>
<widget type="action_button" version="3.0.0">
<name>Former operators OPI</name>
<actions>
<action type="open_display">
<file>operator_old.bob</file>
<target>replace</target>
<description>Open Display</description>
</action>
</actions>
<text>System overview</text>
<x>40</x>
<y>130</y>
<width>250</width>
<height>40</height>
<tooltip>$(actions)</tooltip>
</widget>
</widget> </widget>
</display> </display>
99-Shared/bpmmanager/bpmmanager-top.bob
+ 1080
− 420
View file @ 8b328d2d
This diff is collapsed.
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