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

Merge branch 'master' into 'master' 

Changed SS to REG FB

See merge request ics-software/ess-opis!227
parents 4e9536f9 04d4c44f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NON-APPROVED/TS2/ts2-cryomodule/controllers_overview.bob
+ 33
− 33
View file @ 6a8dacdd
......@@ -48,8 +48,8 @@
</widget>
<widget type="label" version="2.0.0">
<name>SS_LABEL</name>
<text>SS</text>
<x>440</x>
<text>REG</text>
<x>436</x>
<y>70</y>
<width>40</width>
<font>
......@@ -109,7 +109,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_1</name>
<pv_name>TS2-010CDL:Cryo-PID-CV01:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV01:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -225,7 +225,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_3</name>
<pv_name>TS2-010CDL:Cryo-PID-CV02:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV02:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -341,7 +341,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_4</name>
<pv_name>TS2-010CDL:Cryo-PID-CV03:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV03:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -457,7 +457,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_5</name>
<pv_name>TS2-010CDL:Cryo-PID-CV04:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV04:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -573,7 +573,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_6</name>
<pv_name>TS2-010CDL:Cryo-PID-CV05:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV05:Regulation</pv_name>
<x>310</x>
<y>7</y>
<off_color>
......@@ -689,7 +689,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_7</name>
<pv_name>TS2-010CDL:Cryo-PID-CV06:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV06:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -805,7 +805,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_8</name>
<pv_name>TS2-010CDL:Cryo-PID-CV07:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV07:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -921,7 +921,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_9</name>
<pv_name>TS2-010CDL:Cryo-PID-CV60:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV60:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -1038,7 +1038,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_14</name>
<pv_name>TS2-010CDL:Cryo-PID-CV61:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV61:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -1155,7 +1155,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_15</name>
<pv_name>TS2-010CDL:Cryo-PID-CV62:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV62:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -1272,7 +1272,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_16</name>
<pv_name>TS2-010CDL:Cryo-PID-CV63:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV63:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -1389,7 +1389,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_17</name>
<pv_name>TS2-010CDL:Cryo-PID-CV64:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV64:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -1552,7 +1552,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_10</name>
<pv_name>TS2-010CDL:Cryo-PID-CV71:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-CV71:Regulation</pv_name>
<x>310</x>
<y>7</y>
<off_color>
......@@ -1623,7 +1623,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_11</name>
<pv_name>TS2-010CDL:Cryo-PID-EH10:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH10:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -1739,7 +1739,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_12</name>
<pv_name>TS2-010CDL:Cryo-PID-EH20:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH20:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -1855,7 +1855,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_13</name>
<pv_name>TS2-010CDL:Cryo-PID-EH30:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH30:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -1971,7 +1971,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_22</name>
<pv_name>TS2-010CDL:Cryo-PID-EH40:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH40:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -2087,7 +2087,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_23</name>
<pv_name>TS2-010CDL:Cryo-PID-EH11:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH11:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -2203,7 +2203,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_24</name>
<pv_name>TS2-010CDL:Cryo-PID-EH12:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH12:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -2319,7 +2319,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_18</name>
<pv_name>TS2-010CDL:Cryo-PID-EH21:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH21:Regulation</pv_name>
<x>310</x>
<y>7</y>
<off_color>
......@@ -2435,7 +2435,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_19</name>
<pv_name>TS2-010CDL:Cryo-PID-EH22:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH22:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -2551,7 +2551,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_20</name>
<pv_name>TS2-010CDL:Cryo-PID-EH31:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH31:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -2667,7 +2667,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_21</name>
<pv_name>TS2-010CDL:Cryo-PID-EH32:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH32:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -2783,7 +2783,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_25</name>
<pv_name>TS2-010CDL:Cryo-PID-EH41:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH41:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -2899,7 +2899,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_26</name>
<pv_name>TS2-010CDL:Cryo-PID-EH42:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH42:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -3015,7 +3015,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_27</name>
<pv_name>TS2-010CDL:Cryo-PID-EH13:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH13:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -3131,7 +3131,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_28</name>
<pv_name>TS2-010CDL:Cryo-PID-EH23:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH23:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -3247,7 +3247,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_29</name>
<pv_name>TS2-010CDL:Cryo-PID-EH33:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH33:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -3363,7 +3363,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_30</name>
<pv_name>TS2-010CDL:Cryo-PID-EH43:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH43:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -3479,7 +3479,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_31</name>
<pv_name>TS2-010CDL:Cryo-PID-EH60:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH60:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......@@ -3595,7 +3595,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>SS_led_32</name>
<pv_name>TS2-010CDL:Cryo-PID-EH61:FB_SS_State</pv_name>
<pv_name>TS2-010CDL:Cryo-PID-EH61:Regulation</pv_name>
<x>310</x>
<y>5</y>
<off_color>
......
NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
+ 7
− 0
View file @ 6a8dacdd
......@@ -1321,6 +1321,13 @@
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button</name>
<actions>
<action type="open_display">
<file>CWM-CWS05/10-Top/Overview.bob</file>
<target>window</target>
<description>Open Display</description>
</action>
</actions>
<text>Expert</text>
<x>950</x>
<y>10</y>
......
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