Skip to content
Snippets Groups Projects
Commit 38edeb93 authored by Benjamin Bertrand's avatar Benjamin Bertrand
Browse files

Merge branch 'master' into 'master' 

Master

See merge request ics-software/ess-opis!232
parents 777a061d addfcd96
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Common/Embedded/TICP-Header.bob
+ 1
− 1
View file @ 38edeb93
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<name>Embedded Display</name> <name>Embedded Display</name>
<file>TICP-menualarm.bob</file> <file>TICP-menualarm.bob</file>
<y>110</y> <y>110</y>
<width>1080</width> <width>1920</width>
<height>50</height> <height>50</height>
</widget> </widget>
<widget type="rectangle" version="2.0.0"> <widget type="rectangle" version="2.0.0">
......
NON-APPROVED/Cryo/TICP/CrS-TICP_CRYO_ESS/Common/Embedded/TICP-menualarm.bob
+ 60
− 1
View file @ 38edeb93
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0"> <display version="2.0.0">
<name>Menu TICP</name> <name>Menu TICP</name>
<width>1080</width> <width>1920</width>
<height>50</height> <height>50</height>
<widget type="polyline" version="2.0.0"> <widget type="polyline" version="2.0.0">
<name>Devider_1</name> <name>Devider_1</name>
...@@ -382,4 +382,63 @@ ...@@ -382,4 +382,63 @@
</point> </point>
</points> </points>
</widget> </widget>
<widget type="polyline" version="2.0.0">
<name>Devider_5</name>
<x>880</x>
<y>22</y>
<width>1</width>
<height>26</height>
<line_color>
<color name="BLACK-BORDER" red="121" green="121" blue="121">
</color>
</line_color>
<points>
<point x="0.0" y="0.0">
</point>
<point x="0.0" y="26.0">
</point>
</points>
</widget>
<widget type="group" version="2.0.0">
<name>AckGroup</name>
<x>890</x>
<y>20</y>
<width>200</width>
<height>30</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>MenuBack_5</name>
<width>200</width>
<height>30</height>
<line_width>0</line_width>
<background_color>
<color red="210" green="215" blue="211">
</color>
</background_color>
</widget>
<widget type="action_button" version="3.0.0">
<name>Op_MenuButton_2</name>
<actions>
<action type="write_pv">
<pv_name>$(Pref)-Virt-CMD2:Ack_O</pv_name>
<value>1</value>
<description>Ack. WCS alarms</description>
</action>
<action type="write_pv">
<pv_name>$(Pref)-Virt-CMD1:Cmd_Ack_Start</pv_name>
<value>1</value>
<description>Ack CBX alarms</description>
</action>
</actions>
<text>Acknowledge</text>
<width>200</width>
<background_color>
<color name="GRAY" red="169" green="169" blue="169">
</color>
</background_color>
<transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
</widget>
</display> </display>
NON-APPROVED/Cryo/Utilities/Cooling water G04/CoolingWater-CUB.bob
+ 44
− 33
View file @ 38edeb93
...@@ -54,30 +54,32 @@ ...@@ -54,30 +54,32 @@
<height>150</height> <height>150</height>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_7</name> <name>Embedded Display_7</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-PT-031</PVBase> <PVBase>CWS-G04:WtrC-PT-031</PVBase>
<PVName>CWS-G04:WtrC-PT-031:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-PT-031:ProcessValueRB</PVName>
<PVShortName>PT-031</PVShortName> <PVShortName>PT-031</PVShortName>
<PVUnit>BarG</PVUnit> <PVUnit>BarG</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>9</x> <x>9</x>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_9</name> <name>Embedded Display_9</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-TT-031</PVBase> <PVBase>CWS-G04:WtrC-TT-031</PVBase>
<PVName>CWS-G04:WtrC-TT-031:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-TT-031:ProcessValueRB</PVName>
<PVShortName>TT-031</PVShortName> <PVShortName>TT-031</PVShortName>
<PVUnit>°C</PVUnit> <PVUnit>°C</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>9</x> <x>9</x>
<y>59</y> <y>59</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
</widget> </widget>
<widget type="rectangle" version="2.0.0"> <widget type="rectangle" version="2.0.0">
...@@ -143,45 +145,48 @@ ...@@ -143,45 +145,48 @@
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display</name> <name>Embedded Display</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-PT-019</PVBase> <PVBase>CWS-G04:WtrC-PT-019</PVBase>
<PVName>CWS-G04:WtrC-PT-019:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-PT-019:ProcessValueRB</PVName>
<PVShortName>PT-019</PVShortName> <PVShortName>PT-019</PVShortName>
<PVUnit>BarG</PVUnit> <PVUnit>BarG</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>418</x> <x>418</x>
<y>403</y> <y>403</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_1</name> <name>Embedded Display_1</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-TT-013</PVBase> <PVBase>CWS-G04:WtrC-TT-013</PVBase>
<PVName>CWS-G04:WtrC-TT-013:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-TT-013:ProcessValueRB</PVName>
<PVShortName>TT-013</PVShortName> <PVShortName>TT-013</PVShortName>
<PVUnit>°C</PVUnit> <PVUnit>°C</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>418</x> <x>418</x>
<y>493</y> <y>493</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_2</name> <name>Embedded Display_2</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-TT-025</PVBase> <PVBase>CWS-G04:WtrC-TT-025</PVBase>
<PVName>CWS-G04:WtrC-TT-025:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-TT-025:ProcessValueRB</PVName>
<PVShortName>TT-025</PVShortName> <PVShortName>TT-025</PVShortName>
<PVUnit>°C</PVUnit> <PVUnit>°C</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>255</x> <x>255</x>
<y>194</y> <y>194</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
<border_color> <border_color>
<color name="PRIMARY" red="0" green="148" blue="202"> <color name="PRIMARY" red="0" green="148" blue="202">
</color> </color>
...@@ -189,31 +194,33 @@ ...@@ -189,31 +194,33 @@
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_3</name> <name>Embedded Display_3</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-TT-014</PVBase> <PVBase>CWS-G04:WtrC-TT-014</PVBase>
<PVName>CWS-G04:WtrC-TT-014:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-TT-014:ProcessValueRB</PVName>
<PVShortName>TT-014</PVShortName> <PVShortName>TT-014</PVShortName>
<PVUnit>°C</PVUnit> <PVUnit>°C</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>255</x> <x>255</x>
<y>404</y> <y>404</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_4</name> <name>Embedded Display_4</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-TT-001</PVBase> <PVBase>CWS-G04:WtrC-TT-001</PVBase>
<PVName>CWS-G04:WtrC-TT-001:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-TT-001:ProcessValueRB</PVName>
<PVShortName>TT-001</PVShortName> <PVShortName>TT-001</PVShortName>
<PVUnit>°C</PVUnit> <PVUnit>°C</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>255</x> <x>255</x>
<y>494</y> <y>494</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
<border_color> <border_color>
<color name="PRIMARY" red="0" green="148" blue="202"> <color name="PRIMARY" red="0" green="148" blue="202">
</color> </color>
...@@ -221,57 +228,61 @@ ...@@ -221,57 +228,61 @@
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_5</name> <name>Embedded Display_5</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-TT-024</PVBase> <PVBase>CWS-G04:WtrC-TT-024</PVBase>
<PVName>CWS-G04:WtrC-TT-024:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-TT-024:ProcessValueRB</PVName>
<PVShortName>TT-024</PVShortName> <PVShortName>TT-024</PVShortName>
<PVUnit>°C</PVUnit> <PVUnit>°C</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>255</x> <x>255</x>
<y>703</y> <y>703</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_6</name> <name>Embedded Display_6</name>
<file>Embedded/Indicator.bob</file>
<macros> <macros>
<PVBase>CWS-G04:WtrC-TT-020</PVBase> <PVBase>CWS-G04:WtrC-TT-020</PVBase>
<PVName>CWS-G04:WtrC-PT-020:ProcessValueRB</PVName> <PVName>CWS-G04:WtrC-PT-020:ProcessValueRB</PVName>
<PVShortName>PT-020</PVShortName> <PVShortName>PT-020</PVShortName>
<PVUnit>BarG</PVUnit> <PVUnit>BarG</PVUnit>
</macros> </macros>
<file>Embedded/Indicator.bob</file>
<x>882</x> <x>882</x>
<y>405</y> <y>405</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_8</name> <name>Embedded Display_8</name>
<file>Embedded/IndicatorNoSettings.bob</file>
<macros> <macros>
<PVName>CWS-G04:WtrC-P-001A:SpeedRB</PVName> <PVName>CWS-G04:WtrC-P-001A:SpeedRB</PVName>
<PVShortName>P-001A:Speed</PVShortName> <PVShortName>P-001A:Speed</PVShortName>
<PVUnit>%</PVUnit> <PVUnit>%</PVUnit>
</macros> </macros>
<file>Embedded/IndicatorNoSettings.bob</file>
<x>610</x> <x>610</x>
<y>356</y> <y>356</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
<widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
<name>Embedded Display_10</name> <name>Embedded Display_10</name>
<file>Embedded/IndicatorNoSettings.bob</file>
<macros> <macros>
<PVName>CWS-G04:WtrC-P-001B:SpeedRB</PVName> <PVName>CWS-G04:WtrC-P-001B:SpeedRB</PVName>
<PVShortName>P-001B:Speed</PVShortName> <PVShortName>P-001B:Speed</PVShortName>
<PVUnit>%</PVUnit> <PVUnit>%</PVUnit>
</macros> </macros>
<file>Embedded/IndicatorNoSettings.bob</file>
<x>610</x> <x>610</x>
<y>657</y> <y>657</y>
<width>123</width> <width>124</width>
<height>46</height> <height>48</height>
<resize>2</resize>
</widget> </widget>
<widget type="action_button" version="3.0.0"> <widget type="action_button" version="3.0.0">
<name>PumpA_Button</name> <name>PumpA_Button</name>
......
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