Skip to content
Snippets Groups Projects
Commit fdf7e968 authored by Gabriel Fedel's avatar Gabriel Fedel :speech_balloon:
Browse files

Merge branch 'master' into 'master' 

Master

See merge request !6
parents b643380b 7ed7133a
No related branches found
No related tags found
1 merge request!6Master
Pipeline #87756 failed
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4234 additions and 4351 deletions
10-Top/01-interlocks.bob
+ 194
− 153
View file @ fdf7e968
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>Interlocks</name>
<height>550</height>
<width>650</width>
<widget type="rectangle" version="2.0.0">
<name>title-bar_3</name>
<width>800</width>
<width>650</width>
<height>50</height>
<line_width>0</line_width>
<background_color>
......@@ -65,17 +65,6 @@
</font>
</font>
</widget>
<widget type="label" version="2.0.0">
<name>I4_label</name>
<text>Recovery line (SCV91):</text>
<x>45</x>
<y>273</y>
<width>189</width>
<font>
<font family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
</widget>
<widget type="label" version="2.0.0">
<name>I1_label_text</name>
<text>CryoReady AND PVPSrun AND Pressure &lt; 32 mBar</text>
......@@ -129,95 +118,11 @@
</font>
</font>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_1</name>
<text>TS2-010CRM:Cryo-CV-091:Closed</text>
<x>214</x>
<y>273</y>
<width>300</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
</widget>
<widget type="led" version="2.0.0">
<name>SCV91_led</name>
<pv_name>TS2-010CRM:Cryo-CV-091:Closed</pv_name>
<x>559</x>
<y>273</y>
<off_color>
<color name="RED" red="252" green="13" blue="27">
</color>
</off_color>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_2</name>
<text>TS2-010CRM:Cryo-PT-003:MeasValue</text>
<x>214</x>
<y>364</y>
<width>300</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
<pv_name>TS2-010CRM:Cryo-PT-003:MeasValue</pv_name>
<x>515</x>
<y>364</y>
<width>64</width>
<precision>2</precision>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_3</name>
<text>TS2-010CDL:Cryo-CV-82303:ValvePosition</text>
<x>214</x>
<y>333</y>
<width>300</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>TS2-010CDL:Cryo-CV-82303:ValvePosition</pv_name>
<x>515</x>
<y>333</y>
<width>64</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_4</name>
<text>TS2-010CRM:Cryo-PS-091:Off</text>
<x>214</x>
<y>304</y>
<width>300</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
</widget>
<widget type="led" version="2.0.0">
<name>SCV91_led_1</name>
<pv_name>TS2-010CRM:Cryo-PS-091:Opened</pv_name>
<x>559</x>
<y>304</y>
<off_color>
<color name="ON" red="70" green="255" blue="70">
</color>
</off_color>
<on_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
</on_color>
</widget>
<widget type="label" version="2.0.0">
<name>13_label_1</name>
<text>MotorOK:</text>
<x>135</x>
<y>242</y>
<x>132</x>
<y>277</y>
<width>75</width>
<font>
<font family="Source Sans Pro" style="BOLD" size="16.0">
......@@ -260,8 +165,8 @@
<widget type="label" version="2.0.0">
<name>I3_label_text_7</name>
<text>CryoOK and Cavities &lt; 5 K for 1 min</text>
<x>213</x>
<y>242</y>
<x>210</x>
<y>277</y>
<width>300</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
......@@ -277,8 +182,8 @@
<WIDSecSub>TS2-010</WIDSecSub>
</macros>
<file>../99-Shared/HW_INTLCK_BlockIcon_Compact.bob</file>
<x>559</x>
<y>232</y>
<x>556</x>
<y>267</y>
<width>50</width>
<height>32</height>
<resize>2</resize>
......@@ -309,54 +214,17 @@
</action>
</actions>
<text>D</text>
<x>524</x>
<y>242</y>
<x>521</x>
<y>277</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>13_label_4</name>
<text>Night Mode OK:</text>
<x>42</x>
<y>211</y>
<width>161</width>
<font>
<font family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_6</name>
<text>PT-003 &lt; 1500 mBar AND LT &lt; 90% during Night</text>
<x>215</x>
<y>211</y>
<width>309</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
</widget>
<widget type="led" version="2.0.0">
<name>CryoRdy_led_4</name>
<pv_name>TS2-010CRM:Cryo-Virt-Night:Alarm</pv_name>
<x>559</x>
<y>211</y>
<off_color>
<color name="ON" red="70" green="255" blue="70">
</color>
</off_color>
<on_color>
<color name="RED" red="252" green="13" blue="27">
</color>
</on_color>
</widget>
<widget type="label" version="2.0.0">
<name>I4_label_1</name>
<text>Heaters:</text>
<x>126</x>
<y>393</y>
<x>123</x>
<y>210</y>
<width>80</width>
<font>
<font family="Source Sans Pro" style="BOLD" size="16.0">
......@@ -367,8 +235,8 @@
<widget type="label" version="2.0.0">
<name>I3_label_text_8</name>
<text>Temperature high OR Level low</text>
<x>214</x>
<y>393</y>
<x>211</x>
<y>210</y>
<width>345</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
......@@ -385,8 +253,8 @@
</action>
</actions>
<text>D</text>
<x>550</x>
<y>394</y>
<x>547</x>
<y>211</y>
<width>30</width>
<height>20</height>
<tooltip>$(actions)</tooltip>
......@@ -409,8 +277,8 @@
<widget type="label" version="2.0.0">
<name>I3_label_text_9</name>
<text>IsoVac and BeamVac and CDSVac OK</text>
<x>215</x>
<y>424</y>
<x>212</x>
<y>241</y>
<width>300</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
......@@ -426,8 +294,8 @@
<WIDSecSub>TS2-010</WIDSecSub>
</macros>
<file>../99-Shared/HW_INTLCK_BlockIcon_Compact.bob</file>
<x>559</x>
<y>415</y>
<x>556</x>
<y>232</y>
<width>50</width>
<height>32</height>
<resize>2</resize>
......@@ -436,7 +304,7 @@
<name>13_label_3</name>
<text>VacuumOK:</text>
<x>26</x>
<y>424</y>
<y>241</y>
<width>180</width>
<font>
<font family="Source Sans Pro" style="BOLD" size="16.0">
......@@ -460,4 +328,177 @@
<height>20</height>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="group" version="2.0.0">
<name>CV-091</name>
<x>17</x>
<y>298</y>
<width>580</width>
<height>90</height>
<widget type="label" version="2.0.0">
<name>I4_label</name>
<text>Recovery line (SCV91):</text>
<x>5</x>
<y>-1</y>
<width>189</width>
<font>
<font family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_1</name>
<text>TS2-010CRM:Cryo-CV-091:Closed</text>
<x>174</x>
<y>-1</y>
<width>300</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
</widget>
<widget type="led" version="2.0.0">
<name>SCV91_led</name>
<pv_name>TS2-010CRM:Cryo-CV-091:Closed</pv_name>
<x>519</x>
<y>-1</y>
<off_color>
<color name="RED" red="252" green="13" blue="27">
</color>
</off_color>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_4</name>
<text>TS2-010CRM:Cryo-PS-091:Off</text>
<x>174</x>
<y>30</y>
<width>300</width>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
</widget>
<widget type="led" version="2.0.0">
<name>SCV91_led_1</name>
<pv_name>TS2-010CRM:Cryo-PS-091:Opened</pv_name>
<x>519</x>
<y>30</y>
<off_color>
<color name="ON" red="70" green="255" blue="70">
</color>
</off_color>
<on_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
</on_color>
</widget>
</widget>
<widget type="group" version="2.0.0">
<name>Night_Mode_OK</name>
<x>17</x>
<y>388</y>
<width>580</width>
<height>198</height>
<font>
<font family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<widget type="led" version="2.0.0">
<name>CryoRdy_led_4</name>
<pv_name>TS2-010CRM:Cryo-Virt-Night:Alarm</pv_name>
<x>519</x>
<y>57</y>
<off_color>
<color name="ON" red="70" green="255" blue="70">
</color>
</off_color>
<on_color>
<color name="RED" red="252" green="13" blue="27">
</color>
</on_color>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_6</name>
<text>Closes CV-82303 and turns OFF EH-010, EH-020, EH-030 and EH-040 if PT-003 &gt; 1500 mBar OR LT &gt; 90% during Night</text>
<x>5</x>
<y>9</y>
<width>480</width>
<height>58</height>
<font>
<font family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
</widget>
<widget type="label" version="2.0.0">
<name>13_label_4</name>
<text>Night Mode OK:</text>
<x>383</x>
<y>57</y>
<width>119</width>
<font>
<font family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_2</name>
<text>PT-003:</text>
<x>20</x>
<y>128</y>
<width>68</width>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
<pv_name>TS2-010CRM:Cryo-PT-003:MeasValue</pv_name>
<x>100</x>
<y>128</y>
<width>64</width>
<precision>2</precision>
</widget>
<widget type="label" version="2.0.0">
<name>I3_label_text_3</name>
<text>CV-82303:</text>
<x>20</x>
<y>97</y>
<width>79</width>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>TS2-010CDL:Cryo-CV-82303:ValvePosition</pv_name>
<x>100</x>
<y>97</y>
<width>64</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>I2_label_text_10</name>
<text>LT-002:</text>
<x>383</x>
<y>129</y>
<width>59</width>
</widget>
<widget type="label" version="2.0.0">
<name>I2_label_text_11</name>
<text>LT-001:</text>
<x>383</x>
<y>97</y>
<width>69</width>
</widget>
<widget type="textupdate" version="2.0.0">
<name>LT001</name>
<pv_name>TS2-010CRM:Cryo-LT-001:MeasValue</pv_name>
<x>463</x>
<y>97</y>
<width>64</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>LT002</name>
<pv_name>TS2-010CRM:Cryo-LT-002:MeasValue</pv_name>
<x>463</x>
<y>129</y>
<width>64</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
</widget>
</display>
10-Top/TS2_main.bob
+ 17
− 0
View file @ fdf7e968
......@@ -3061,4 +3061,21 @@
<resize>1</resize>
<transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
<name>Analog_TRANSMITTER_OnlyText_Vertical_BlockIcon_71</name>
<macros>
<WIDDev>TE</WIDDev>
<WIDDis>Cryo</WIDDis>
<WIDIndex>904</WIDIndex>
<WIDLabel>Calculated TE from PT-004</WIDLabel>
<WIDSecSub>TS2-010CRM</WIDSecSub>
</macros>
<file>$(OPI_LOC)999-Cryo/99-Shared/AnalogTransmitters/blockicons/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
<x>1224</x>
<y>585</y>
<width>117</width>
<height>50</height>
<resize>1</resize>
<transparent>true</transparent>
</widget>
</display>
99-Shared/CryomoduleReady.bob
+ 1917
− 1953
View file @ fdf7e968
This diff is collapsed.
99-Shared/Device_group_settings.bob
+ 1579
− 1579
View file @ fdf7e968
This diff is collapsed.
99-Shared/EHinterlocks.bob
+ 525
− 664
View file @ fdf7e968
This diff is collapsed.
99-Shared/Heaters/blockicons/EH_HeaterSupply_PID_Analog_BlockIcon_OnlyText_Horizontal_Compact.bob
+ 1
− 1
View file @ fdf7e968
......@@ -66,7 +66,7 @@
<rules>
<rule name="TextRule" prop_id="text" out_exp="false">
<exp bool_exp="pv0 == true">
<value>A</value>
<value></value>
</exp>
<exp bool_exp="pv1 == true">
<value>M</value>
......
99-Shared/Heaters/blockicons/EH_HeaterSupply_PID_Analog_BlockIcon_OnlyText_Vertical_Compact.bob
+ 1
− 1
View file @ fdf7e968
......@@ -66,7 +66,7 @@
<rules>
<rule name="TextRule" prop_id="text" out_exp="false">
<exp bool_exp="pv0 == true">
<value>A</value>
<value></value>
</exp>
<exp bool_exp="pv1 == true">
<value>M</value>
......
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