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

Merge branch 'master' into 'master' 

Master

See merge request !11
parents db827349 f836031a
No related branches found
No related tags found
1 merge request!11Master
Pipeline #98556 failed
Stage: deploy
    Hide whitespace changes
    Inline Side-by-side
    10-Top/TS2_main.bob
    + 1
    − 1
    View file @ 1c3e3484
    ......@@ -2686,7 +2686,7 @@
    <name>MODESScreen_Button</name>
    <actions>
    <action type="open_display">
    <file>../99-Shared/TS2_modeSelector.bob</file>
    <file>../99-Shared/TS2_automode.bob</file>
    <macros>
    <PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
    </macros>
    ......
    99-Shared/CryomoduleReady.bob
    + 3
    − 2
    View file @ 1c3e3484
    ......@@ -963,9 +963,9 @@
    <widget type="label" version="2.0.0">
    <name>Label_25</name>
    <text>FPC cryo temperature &lt; 318 K
    He cavity tank temperature &lt; 4.5 K
    He cavity tank temperature &lt; 10 K
    PT04 &amp;&amp; PT03 &lt; 1100 mbar
    He level LT-001 &amp;&amp; LT-002 &gt; 80%</text>
    He level LT-001 &amp;&amp; LT-002 &gt; 40%</text>
    <y>9</y>
    <width>249</width>
    <height>128</height>
    ......@@ -1816,6 +1816,7 @@ He level LT-001 &amp;&amp; LT-002 &gt; 80%</text>
    <y>60</y>
    <width>1070</width>
    <height>510</height>
    <active_tab>1</active_tab>
    </widget>
    <widget type="action_button" version="3.0.0">
    <name>ColdCond</name>
    ......
    99-Shared/TS2_automode.bob 0 → 100644
    + 359
    − 0
    View file @ 1c3e3484
    <?xml version="1.0" encoding="UTF-8"?>
    <display version="2.0.0">
    <name>Automode</name>
    <width>2560</width>
    <height>850</height>
    <actions>
    <action type="execute">
    <script file="EmbeddedPy">
    <text><![CDATA[]]></text>
    </script>
    <description>Execute Script</description>
    </action>
    </actions>
    <widget type="rectangle" version="2.0.0">
    <name>TitleBar</name>
    <class>TITLE-BAR</class>
    <x use_class="true">0</x>
    <y use_class="true">0</y>
    <width>2555</width>
    <height use_class="true">50</height>
    <line_width use_class="true">0</line_width>
    <background_color use_class="true">
    <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
    </color>
    </background_color>
    </widget>
    <widget type="label" version="2.0.0">
    <name>TitleText</name>
    <class>TITLE</class>
    <text>Automode</text>
    <x use_class="true">20</x>
    <y use_class="true">0</y>
    <width>330</width>
    <height use_class="true">50</height>
    <font use_class="true">
    <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
    </font>
    </font>
    <foreground_color use_class="true">
    <color name="HEADER-TEXT" red="0" green="0" blue="0">
    </color>
    </foreground_color>
    <transparent use_class="true">true</transparent>
    <horizontal_alignment use_class="true">0</horizontal_alignment>
    <vertical_alignment use_class="true">1</vertical_alignment>
    <wrap_words use_class="true">false</wrap_words>
    </widget>
    <widget type="textupdate" version="2.0.0">
    <name>State</name>
    <pv_name>TS2-010:Cryo-Virt-900:st_ActStateMsg</pv_name>
    <x>330</x>
    <y>10</y>
    <width>700</width>
    <height>30</height>
    <font>
    <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
    </font>
    </font>
    <vertical_alignment>1</vertical_alignment>
    </widget>
    <widget type="label" version="2.0.0">
    <name>Label</name>
    <text>Msg:</text>
    <x>270</x>
    <y>10</y>
    <width>50</width>
    <height>30</height>
    <font>
    <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
    </font>
    </font>
    <vertical_alignment>1</vertical_alignment>
    </widget>
    <widget type="group" version="2.0.0">
    <name>AutoOFF</name>
    <x>40</x>
    <y>230</y>
    <width>170</width>
    <height>80</height>
    <style>3</style>
    <transparent>true</transparent>
    <widget type="led" version="2.0.0">
    <name>LED</name>
    <pv_name>TS2-010:Cryo-Virt-900:si_SystemSopped</pv_name>
    <width>170</width>
    <height>80</height>
    <off_color>
    <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
    </color>
    </off_color>
    <on_color>
    <color name="LED-RED-ON" red="255" green="60" blue="46">
    </color>
    </on_color>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
    </font>
    </font>
    <square>true</square>
    </widget>
    <widget type="action_button" version="3.0.0">
    <name>BUTTON</name>
    <actions>
    <action type="write_pv">
    <pv_name>TS2-010:Cryo-Virt-900:Cmd_Manual</pv_name>
    <value>1</value>
    <description>AutoOFF</description>
    </action>
    </actions>
    <text>Auto Off</text>
    <x>10</x>
    <y>10</y>
    <width>150</width>
    <height>60</height>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="18.0">
    </font>
    </font>
    <tooltip>$(actions)</tooltip>
    <show_confirm_dialog>true</show_confirm_dialog>
    </widget>
    </widget>
    <widget type="group" version="2.0.0">
    <name>AutoON</name>
    <x>40</x>
    <y>320</y>
    <width>170</width>
    <height>80</height>
    <style>3</style>
    <transparent>true</transparent>
    <widget type="led" version="2.0.0">
    <name>LED</name>
    <pv_name>TS2-010:Cryo-Virt-900:si_CryomReady</pv_name>
    <width>170</width>
    <height>80</height>
    <off_color>
    <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
    </color>
    </off_color>
    <on_color>
    <color name="LED-GREEN-ON" red="70" green="255" blue="70">
    </color>
    </on_color>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
    </font>
    </font>
    <square>true</square>
    </widget>
    <widget type="action_button" version="3.0.0">
    <name>BUTTON</name>
    <actions>
    <action type="write_pv">
    <pv_name>TS2-010:Cryo-Virt-900:Cmd_Auto</pv_name>
    <value>1</value>
    <description>AutoON</description>
    </action>
    </actions>
    <text>Auto On</text>
    <x>10</x>
    <y>10</y>
    <width>150</width>
    <height>60</height>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="18.0">
    </font>
    </font>
    <tooltip>$(actions)</tooltip>
    <show_confirm_dialog>true</show_confirm_dialog>
    </widget>
    </widget>
    <widget type="group" version="2.0.0">
    <name>Sby300K</name>
    <x>210</x>
    <y>320</y>
    <width>240</width>
    <height>80</height>
    <style>3</style>
    <transparent>true</transparent>
    <widget type="polyline" version="2.0.0">
    <name>Polyline</name>
    <y>40</y>
    <width>70</width>
    <height>0</height>
    <points>
    <point x="0.0" y="0.0">
    </point>
    <point x="70.0" y="0.0">
    </point>
    </points>
    </widget>
    <widget type="led" version="2.0.0">
    <name>LED</name>
    <pv_name>TS2-010:Cryo-Virt-900:si_ExtraMode01</pv_name>
    <x>70</x>
    <width>170</width>
    <height>80</height>
    <off_color>
    <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
    </color>
    </off_color>
    <on_color>
    <color name="LED-BLUE-ON" red="81" green="232" blue="255">
    </color>
    </on_color>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
    </font>
    </font>
    <square>true</square>
    </widget>
    <widget type="action_button" version="3.0.0">
    <name>BUTTON</name>
    <actions>
    <action type="write_pv">
    <pv_name>TS2-010:Cryo-Virt-900:cmd_ExtraMode01</pv_name>
    <value>1</value>
    <description>StandBy_300K</description>
    </action>
    </actions>
    <text>Stand-by 300K</text>
    <x>80</x>
    <y>10</y>
    <width>150</width>
    <height>60</height>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="18.0">
    </font>
    </font>
    <tooltip>$(actions)</tooltip>
    <show_confirm_dialog>true</show_confirm_dialog>
    </widget>
    </widget>
    <widget type="group" version="2.0.0">
    <name>CD300K_4K</name>
    <x>450</x>
    <y>320</y>
    <width>240</width>
    <height>80</height>
    <style>3</style>
    <transparent>true</transparent>
    <widget type="polyline" version="2.0.0">
    <name>Polyline</name>
    <y>40</y>
    <width>70</width>
    <height>1</height>
    <points>
    <point x="0.0" y="0.0">
    </point>
    <point x="70.0" y="0.0">
    </point>
    </points>
    </widget>
    <widget type="led" version="2.0.0">
    <name>LED</name>
    <pv_name>TS2-010:Cryo-Virt-900:si_CoolDown_300K_4K</pv_name>
    <x>70</x>
    <width>170</width>
    <height>80</height>
    <off_color>
    <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
    </color>
    </off_color>
    <on_color>
    <color name="LED-BLUE-ON" red="81" green="232" blue="255">
    </color>
    </on_color>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
    </font>
    </font>
    <square>true</square>
    </widget>
    <widget type="action_button" version="3.0.0">
    <name>BUTTON</name>
    <actions>
    <action type="write_pv">
    <pv_name>TS2-010:Cryo-Virt-900:cmd_CoolDown_300K_4K</pv_name>
    <value>1</value>
    <description>CoolDown_300K_4K</description>
    </action>
    </actions>
    <text>CoolDown
    300K to 4K</text>
    <x>80</x>
    <y>10</y>
    <width>150</width>
    <height>60</height>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="18.0">
    </font>
    </font>
    <tooltip>$(actions)</tooltip>
    <show_confirm_dialog>true</show_confirm_dialog>
    </widget>
    </widget>
    <widget type="group" version="2.0.0">
    <name>Sby4K</name>
    <x>690</x>
    <y>320</y>
    <width>240</width>
    <height>80</height>
    <style>3</style>
    <transparent>true</transparent>
    <widget type="polyline" version="2.0.0">
    <name>Polyline</name>
    <y>40</y>
    <width>70</width>
    <height>1</height>
    <points>
    <point x="0.0" y="0.0">
    </point>
    <point x="70.0" y="0.0">
    </point>
    </points>
    </widget>
    <widget type="led" version="2.0.0">
    <name>LED</name>
    <pv_name>TS2-010:Cryo-Virt-900:si_ExtraMode02</pv_name>
    <x>70</x>
    <width>170</width>
    <height>80</height>
    <off_color>
    <color name="LED-BLUE-OFF" red="90" green="110" blue="110">
    </color>
    </off_color>
    <on_color>
    <color name="LED-BLUE-ON" red="81" green="232" blue="255">
    </color>
    </on_color>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="20.0">
    </font>
    </font>
    <square>true</square>
    </widget>
    <widget type="action_button" version="3.0.0">
    <name>BUTTON</name>
    <actions>
    <action type="write_pv">
    <pv_name>TS2-010:Cryo-Virt-900:cmd_ExtraMode02</pv_name>
    <value>1</value>
    <description>StandBy_4K</description>
    </action>
    </actions>
    <text>Stand-by 4K</text>
    <x>80</x>
    <y>10</y>
    <width>150</width>
    <height>60</height>
    <font>
    <font family="Digital Readout Thick Upright Regular" style="REGULAR" size="18.0">
    </font>
    </font>
    <tooltip>$(actions)</tooltip>
    <show_confirm_dialog>true</show_confirm_dialog>
    </widget>
    </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