diff --git a/NON-APPROVED/ts2-010rfc-rflps/scripts/macroNames.py b/NON-APPROVED/ts2-010rfc-rflps/scripts/macroNames.py
index aedf68c8bc845e5db6c4fc109559f3f2c786b734..bd1b8f84fbb978b21d4b97a38c2db11dbab4663d 100644
--- a/NON-APPROVED/ts2-010rfc-rflps/scripts/macroNames.py
+++ b/NON-APPROVED/ts2-010rfc-rflps/scripts/macroNames.py
@@ -52,10 +52,14 @@ di04_ = "RFS-FIM-110:DI4"
di05_ = "RFS-VacPS-110:I-SP"
di06_ = "RFS-VacPS-120:I-SP"
di07_ = "RFS-FIM-110:DI7"
-di08_ = "RFS-ADR-201001:ItckStat"
-di09_ = "RFS-ADR-110:ItckStat"
-di10_ = "RFS-ADR-120:ItckStat"
-di11_ = "RFS-FIM-110:DI11"
+# Old configuration forAtomki's SCB
+#di08_ = "RFS-ADR-201001:ItckStat"
+#di09_ = "RFS-ADR-110:ItckStat"
+#di10_ = "RFS-ADR-120:ItckStat"
+di08_ = "RFS-FIM-110:DI8"
+di09_ = "RFS-ADR-201001:ItckStat"
+di10_ = "RFS-ADR-201002:ItckStat"
+di11_ = "RFS-ADR-201003:ItckStat"
di12_ = "RFS-FIM-110:DI12"
di13_ = "RFS-FIM-110:DI13"
di14_ = "RFS-FIM-110:DI14"
diff --git a/NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png b/NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png
index c6a48ca88e2a2f8aa485f5020eb26191bc28079b..740642e08aff1bffd976b2b743f5ee83da557952 100644
Binary files a/NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png and b/NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png differ
diff --git a/NON-APPROVED/ts2-010rfc-rflps/support/overview.bob b/NON-APPROVED/ts2-010rfc-rflps/support/overview.bob
index 11846deff1ff3343bb02894cae4ed864cc4d0269..d85ec493161ccb7cce7369979870778f776a42db 100644
--- a/NON-APPROVED/ts2-010rfc-rflps/support/overview.bob
+++ b/NON-APPROVED/ts2-010rfc-rflps/support/overview.bob
@@ -132,8 +132,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_4</name>
<pv_name>$(PREFIX):RFS-Kly-110:GreenLight-INT-RB</pv_name>
- <x>80</x>
- <y>296</y>
+ <x>310</x>
+ <y>230</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -159,8 +159,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_5</name>
<pv_name>$(PREFIX):RFS-Kly-110:YellowLight-INT-RB</pv_name>
- <x>80</x>
- <y>271</y>
+ <x>310</x>
+ <y>205</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -186,8 +186,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_6</name>
<pv_name>$(PREFIX):RFS-Kly-110:RedLight-INT-RB</pv_name>
- <x>80</x>
- <y>246</y>
+ <x>310</x>
+ <y>180</y>
<width>90</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -402,9 +402,9 @@ else:
</widget>
<widget type="led" version="2.0.0">
<name>LED_17</name>
- <pv_name>$(PREFIX):RFS-ADR-110:ItckStat:FastIntStat</pv_name>
- <x>359</x>
- <y>460</y>
+ <pv_name>$(PREFIX):RFS-ADR-201002:ItckStat:FastIntStat</pv_name>
+ <x>520</x>
+ <y>246</y>
<off_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
@@ -422,12 +422,11 @@ else:
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_34</name>
- <pv_name>$(PREFIX):RFS-ADR-110:ItckStat.DESC</pv_name>
- <x>100</x>
- <y>460</y>
+ <pv_name>$(PREFIX):RFS-ADR-201002:ItckStat.DESC</pv_name>
+ <x>560</x>
+ <y>246</y>
<width>240</width>
<transparent>true</transparent>
- <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
@@ -1942,7 +1941,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_37</name>
- <pv_name>$(PREFIX):RFS-ADR-120:ItckStat.DESC</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201003:ItckStat.DESC</pv_name>
<x>100</x>
<y>493</y>
<width>240</width>
@@ -1953,7 +1952,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
</widget>
<widget type="led" version="2.0.0">
<name>LED_20</name>
- <pv_name>$(PREFIX):RFS-ADR-120:ItckStat:FastIntStat</pv_name>
+ <pv_name>$(PREFIX):RFS-ADR-201003:ItckStat:FastIntStat</pv_name>
<x>359</x>
<y>493</y>
<off_color>
@@ -2169,4 +2168,43 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
<width>295</width>
<horizontal_alignment>1</horizontal_alignment>
</widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Symbol</name>
+ <pv_name>$(PREFIX):RFS-Kly-110:GreenLight-INT-RB</pv_name>
+ <symbols>
+ <symbol>images/SG-TL70-W-2.png</symbol>
+ <symbol>images/SG-TL70-G-2.png</symbol>
+ </symbols>
+ <x>410</x>
+ <y>222</y>
+ <width>30</width>
+ <height>30</height>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Symbol_1</name>
+ <pv_name>$(PREFIX):RFS-Kly-110:YellowLight-INT-RB</pv_name>
+ <symbols>
+ <symbol>images/SG-TL70-W-2.png</symbol>
+ <symbol>images/SG-TL70-Y-2.png</symbol>
+ </symbols>
+ <x>410</x>
+ <y>199</y>
+ <width>30</width>
+ <height>30</height>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Symbol_2</name>
+ <pv_name>$(PREFIX):RFS-Kly-110:RedLight-INT-RB</pv_name>
+ <symbols>
+ <symbol>images/SG-TL70-W-2.png</symbol>
+ <symbol>images/SG-TL70-R-2.png</symbol>
+ </symbols>
+ <x>410</x>
+ <y>176</y>
+ <width>30</width>
+ <height>30</height>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ </widget>
</display>
diff --git a/NON-APPROVED/ts2-010rfc-rflps/support/rflpsDiagnostics.bob b/NON-APPROVED/ts2-010rfc-rflps/support/rflpsDiagnostics.bob
index e6d74706a0fe28c1963573ce3cade4866dca6923..771ab73f656cf9a0411cd5b967797a188788c4f3 100644
--- a/NON-APPROVED/ts2-010rfc-rflps/support/rflpsDiagnostics.bob
+++ b/NON-APPROVED/ts2-010rfc-rflps/support/rflpsDiagnostics.bob
@@ -1095,7 +1095,7 @@
<height>100</height>
<style>1</style>
<font>
- <font name="SUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+ <font name="SUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="18.0">
</font>
</font>
<foreground_color>
@@ -1132,7 +1132,7 @@
<height>100</height>
<style>1</style>
<font>
- <font name="SUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+ <font name="SUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="18.0">
</font>
</font>
<foreground_color>
@@ -1172,6 +1172,13 @@
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_2</name>
+ <actions>
+ <action type="open_display">
+ <file>simulationDisplay.bob</file>
+ <target>window</target>
+ <description>Open Filament simulation module</description>
+ </action>
+ </actions>
<text>Run self-test</text>
<x>520</x>
<y>62</y>
diff --git a/NON-APPROVED/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob b/NON-APPROVED/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob
index 98199ad8ffcbab1fc2bec7bece084a422c7442ce..0714bfb278a4f24f02920993c195d9408888814c 100644
--- a/NON-APPROVED/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob
+++ b/NON-APPROVED/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob
@@ -344,6 +344,7 @@ widget.setValue(data)]]></text>
<pv_name>$(PREFIX):$(SGNL)-WRN-RB</pv_name>
<pv_name>$(PREFIX):$(SGNL)-ERRDISTOL-RB</pv_name>
<pv_name>$(PREFIX):$(SGNL)-ERRTIME-RB</pv_name>
+ <pv_name>$(PREFIX):$(SGNL)-ERRONSTAT-RB</pv_name>
</script>
</scripts>
<editable>false</editable>
@@ -434,6 +435,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<x_axis>
<title>Time (min)</title>
<autoscale>false</autoscale>
+ <log_scale>false</log_scale>
<minimum>0.0</minimum>
<maximum>100.0</maximum>
<show_grid>true</show_grid>
@@ -1884,7 +1886,7 @@ Reset all non-active interlocks</tooltip>
<y>869</y>
<width>690</width>
<font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
<foreground_color>
diff --git a/NON-APPROVED/ts2-010rfc-rflps/support/simulationDisplay.bob b/NON-APPROVED/ts2-010rfc-rflps/support/simulationDisplay.bob
new file mode 100644
index 0000000000000000000000000000000000000000..b2426be9a1abf49a5c242026e7b86ec5f656ac73
--- /dev/null
+++ b/NON-APPROVED/ts2-010rfc-rflps/support/simulationDisplay.bob
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>Filament Simulation Module</name>
+ <width>920</width>
+ <widget type="picture" version="2.0.0">
+ <name>Picture_1</name>
+ <file>images/filament_psu.png</file>
+ <x>20</x>
+ <y>190</y>
+ <width>880</width>
+ <height>260</height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_5</name>
+ <text>FILAMENT Simulation Module</text>
+ <width>920</width>
+ <height>82</height>
+ <font>
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="PRIMARY" red="0" green="148" blue="202">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle_4</name>
+ <x>74</x>
+ <y>230</y>
+ <width>506</width>
+ <height>90</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <background_color>
+ <color red="242" green="242" blue="242">
+ </color>
+ </background_color>
+ <corner_width>4</corner_width>
+ <corner_height>4</corner_height>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle_3</name>
+ <x>74</x>
+ <y>341</y>
+ <width>506</width>
+ <height>80</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </line_color>
+ <background_color>
+ <color red="242" green="242" blue="242">
+ </color>
+ </background_color>
+ <corner_width>4</corner_width>
+ <corner_height>4</corner_height>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update</name>
+ <pv_name>LAB-011RFC:CONNECTION-STAT</pv_name>
+ <x>791</x>
+ <y>30</y>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="colorRule" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pv0 == 1">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pv0 == 0">
+ <value>
+ <color name="DISCONNECTED" red="135" green="29" blue="100">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_2</name>
+ <class>COMMENT</class>
+ <text>Connection status</text>
+ <x>641</x>
+ <y>30</y>
+ <width>140</width>
+ <font>
+ <font name="Comment" family="Source Sans Pro" style="ITALIC" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_2</name>
+ <pv_name>LAB-011RFC:FIL-ISetIn-RB</pv_name>
+ <x>649</x>
+ <y>275</y>
+ <horizontal_alignment>1</horizontal_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_4</name>
+ <text>Set close loop mode</text>
+ <x>685</x>
+ <y>120</y>
+ <width>176</width>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="bool_button" version="2.0.0">
+ <name>Boolean Button_2</name>
+ <pv_name>LAB-011RFC:FIL-CloseLoop</pv_name>
+ <x>695</x>
+ <y>150</y>
+ <width>166</width>
+ <labels_from_pv>true</labels_from_pv>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_10</name>
+ <text>I-SET from LPS</text>
+ <x>639</x>
+ <y>241</y>
+ <width>121</width>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Polyline_4</name>
+ <x>571</x>
+ <y>250</y>
+ <width>70</width>
+ <height>70</height>
+ <visible>false</visible>
+ <line_color>
+ <color name="PRIMARY" red="0" green="148" blue="202">
+ </color>
+ </line_color>
+ <arrows>1</arrows>
+ <arrow_length>10</arrow_length>
+ <points>
+ <point x="0.0" y="35.0">
+ </point>
+ <point x="70.0" y="35.0">
+ </point>
+ </points>
+ <rules>
+ <rule name="showNarrow" prop_id="visible" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>true</value>
+ </exp>
+ <pv_name>LAB-011RFC:FIL-CloseLoop-RB</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="bool_button" version="2.0.0">
+ <name>RESET_BUTTON_2</name>
+ <pv_name>LAB-011RFC:CPU-RST</pv_name>
+ <x>60</x>
+ <y>150</y>
+ <width>93</width>
+ <off_label>CPU Reset</off_label>
+ <off_color>
+ <color red="0" green="100" blue="0">
+ </color>
+ </off_color>
+ <on_label>Reseting...</on_label>
+ <on_color>
+ <color red="0" green="255" blue="0">
+ </color>
+ </on_color>
+ <show_led>false</show_led>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color red="240" green="240" blue="240">
+ </color>
+ </background_color>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)
+Reset all non-active interlocks</tooltip>
+ <confirm_message>This will reset all non-active interlocks</confirm_message>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>LED_1</name>
+ <pv_name>LAB-011RFC:FIL-LocRemOut-RB</pv_name>
+ <x>234</x>
+ <y>372</y>
+ <off_color>
+ <color name="ON" red="22" green="222" blue="33">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="OFF" red="169" green="169" blue="169">
+ </color>
+ </on_color>
+ <tooltip>$(pv_name)
+$(pv_value)
+Local/Remote Status</tooltip>
+ </widget>
+ <widget type="bool_button" version="2.0.0">
+ <name>Boolean Button_4</name>
+ <pv_name>LAB-011RFC:FIL-LocRemOut</pv_name>
+ <x>268</x>
+ <y>366</y>
+ <width>110</width>
+ <show_led>false</show_led>
+ <labels_from_pv>true</labels_from_pv>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>LED_5</name>
+ <pv_name>LAB-011RFC:FIL-OnStatOut-RB</pv_name>
+ <x>90</x>
+ <y>372</y>
+ <tooltip>$(pv_name)
+$(pv_value)
+ON/OFF Status</tooltip>
+ </widget>
+ <widget type="bool_button" version="2.0.0">
+ <name>Boolean Button_5</name>
+ <pv_name>LAB-011RFC:FIL-OnStatOut</pv_name>
+ <x>119</x>
+ <y>366</y>
+ <show_led>false</show_led>
+ <labels_from_pv>true</labels_from_pv>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>LED_6</name>
+ <pv_name>LAB-011RFC:FIL-FaultStatOut-RB</pv_name>
+ <x>394</x>
+ <y>372</y>
+ <off_color>
+ <color name="MAJOR" red="252" green="13" blue="27">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </on_color>
+ <tooltip>$(pv_name)
+$(pv_value)
+Fault status</tooltip>
+ </widget>
+ <widget type="bool_button" version="2.0.0">
+ <name>Boolean Button_6</name>
+ <pv_name>LAB-011RFC:FIL-FaultStatOut</pv_name>
+ <x>429</x>
+ <y>366</y>
+ <off_color>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="MAJOR" red="252" green="13" blue="27">
+ </color>
+ </on_color>
+ <show_led>false</show_led>
+ <labels_from_pv>true</labels_from_pv>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_4</name>
+ <pv_name>LAB-011RFC:FIL-WMonOut-RB</pv_name>
+ <x>215</x>
+ <y>275</y>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textentry" version="3.0.0">
+ <name>Text Entry_3</name>
+ <pv_name>LAB-011RFC:FIL-WMonOut</pv_name>
+ <x>90</x>
+ <y>275</y>
+ </widget>
+ <widget type="textentry" version="3.0.0">
+ <name>Text Entry_4</name>
+ <pv_name>LAB-011RFC:FIL-IMonOut</pv_name>
+ <x>340</x>
+ <y>275</y>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_5</name>
+ <pv_name>LAB-011RFC:FIL-IMonOut-RB</pv_name>
+ <x>461</x>
+ <y>275</y>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_11</name>
+ <text>W-MON</text>
+ <x>135</x>
+ <y>241</y>
+ <width>136</width>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_12</name>
+ <text>I-MON</text>
+ <x>383</x>
+ <y>241</y>
+ <width>136</width>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>LED_7</name>
+ <pv_name>LAB-011RFC:FIL-RstCmdIn-RB</pv_name>
+ <x>641</x>
+ <y>341</y>
+ <tooltip>$(pv_name)
+$(pv_value)
+ON/OFF Status</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_13</name>
+ <text>Reset CMD</text>
+ <x>685</x>
+ <y>341</y>
+ <width>85</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>LED_8</name>
+ <pv_name>LAB-011RFC:FIL-OnCmdIn-RB</pv_name>
+ <x>641</x>
+ <y>372</y>
+ <tooltip>$(pv_name)
+$(pv_value)
+ON/OFF Status</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_14</name>
+ <text>ON CMD</text>
+ <x>685</x>
+ <y>372</y>
+ <width>85</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+</display>