diff --git a/NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr.bob b/NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr.bob
index 3e647848818674a536e0f458bb4cbdd3d1819239..b4178fc3990663af7467270dfc88f7b16cf6b091 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>$(DEVICE)</name>
<width>760</width>
- <height>735</height>
+ <height>755</height>
<widget type="label" version="2.0.0">
<name>CABTR</name>
<text>CABTR $(DEVICE)</text>
@@ -428,6 +428,7 @@
<x>140</x>
<y>695</y>
<width>130</width>
+ <height>50</height>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -443,22 +444,47 @@
<x>300</x>
<y>695</y>
<width>130</width>
+ <height>50</height>
+ <rules>
+ <rule name="Attention" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="Attention" red="252" green="242" blue="17">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(DEVICE):SaveToFlashReqR</pv_name>
+ </rule>
+ </rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Commit Curves</name>
+ <name>Commit Channels</name>
<actions>
<action type="write_pv">
<pv_name>$(pv_name)</pv_name>
<value>0</value>
- <description>Commmit Curves</description>
+ <description>Commmit Channels</description>
</action>
</actions>
- <pv_name>$(DEVICE):CommitCurvesCmd</pv_name>
+ <pv_name>$(DEVICE):CommitChansCmd</pv_name>
<x>620</x>
<y>695</y>
<width>130</width>
- <tooltip>$(actions)</tooltip>
+ <height>50</height>
+ <rules>
+ <rule name="Attention" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="Attention" red="252" green="242" blue="17">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(DEVICE):ChanCommitNeededR</pv_name>
+ </rule>
+ </rules>
+ <tooltip>Commit Channel Modifications</tooltip>
+ <show_confirm_dialog>true</show_confirm_dialog>
</widget>
<widget type="action_button" version="3.0.0">
<name>StorBufClrCmd</name>
@@ -473,6 +499,7 @@
<x>460</x>
<y>695</y>
<width>130</width>
+ <height>50</height>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="tabs" version="2.0.0">
@@ -1197,4 +1224,59 @@
<height>31</height>
</widget>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Flash Write Counter</name>
+ <text>Flash Write Counter:</text>
+ <x>10</x>
+ <y>250</y>
+ <width>140</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>FlashWriteCntrR</name>
+ <pv_name>$(DEVICE):FlashWriteCntrR</pv_name>
+ <x>156</x>
+ <y>250</y>
+ <width>50</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>NumOfRstR</name>
+ <pv_name>$(DEVICE):NumOfRstR</pv_name>
+ <x>156</x>
+ <y>280</y>
+ <width>50</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Number of Resets</name>
+ <text>Number of Resets:</text>
+ <x>10</x>
+ <y>280</y>
+ <width>140</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Operating Temperature</name>
+ <text>Operating Temp:</text>
+ <x>10</x>
+ <y>310</y>
+ <width>140</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <tooltip>Operating Temperature</tooltip>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>OperTempR</name>
+ <pv_name>$(DEVICE):OperTempR</pv_name>
+ <x>156</x>
+ <y>310</y>
+ <width>50</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
</display>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr_te.bob b/NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr_te.bob
index 9ab63f9b7b0083fe7938937ee375f24882cb2a72..231cf9d851d5923dd6272071ddb91c3618636020 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr_te.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr_te.bob
@@ -246,8 +246,13 @@
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Apply Channel Name</name>
+ <widget type="checkbox" version="2.0.0">
+ <name>Modify Channel Name</name>
+ <pv_name>$(DEVICE):ModNameCmd</pv_name>
+ <label>Modify Channel Name</label>
+ <x>433</x>
+ <y>270</y>
+ <width>200</width>
<actions>
<action type="write_pv">
<pv_name>$(pv_name)</pv_name>
@@ -255,11 +260,8 @@
<description>Apply</description>
</action>
</actions>
- <pv_name>$(DEVICE):CommitNameCmd</pv_name>
- <x>433</x>
- <y>270</y>
- <height>20</height>
- <tooltip>$(actions)</tooltip>
+ <tooltip>Controls if the name will be modified</tooltip>
+ <show_confirm_dialog>false</show_confirm_dialog>
</widget>
<widget type="label" version="2.0.0">
<name>Curve Name</name>
@@ -286,8 +288,13 @@
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Apply Curve Name</name>
+ <widget type="checkbox" version="2.0.0">
+ <name>Modify Curve Name</name>
+ <pv_name>$(DEVICE):ModCurveCmd</pv_name>
+ <label>Modify Calibration Curve</label>
+ <x>433</x>
+ <y>300</y>
+ <width>200</width>
<actions>
<action type="write_pv">
<pv_name>$(pv_name)</pv_name>
@@ -295,11 +302,8 @@
<description>Apply</description>
</action>
</actions>
- <pv_name>$(DEVICE):CommitCurveCmd</pv_name>
- <x>433</x>
- <y>300</y>
- <height>20</height>
- <tooltip>$(actions)</tooltip>
+ <tooltip>Control if the calibration curve will be modified</tooltip>
+ <show_confirm_dialog>false</show_confirm_dialog>
</widget>
<widget type="label" version="2.0.0">
<name>Curve Mode</name>
@@ -357,4 +361,31 @@
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Commit Needed</name>
+ <text>The changes need to be commited on the main page with the 'Commit Channels' button</text>
+ <x>433</x>
+ <y>330</y>
+ <width>200</width>
+ <height>82</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="Attention" red="252" green="242" blue="17">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvInt0 == 0">
+ <value>false</value>
+ </exp>
+ <pv_name>$(DEVICE):ModMode-RB</pv_name>
+ </rule>
+ </rules>
+ </widget>
</display>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/cabtr/ts2-cabtrs.bob b/NON-APPROVED/TS2/ts2-cryomodule/cabtr/ts2-cabtrs.bob
new file mode 100644
index 0000000000000000000000000000000000000000..fd90f19ae67a48fc9b941faac2a8d6230d1fa3ba
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-cryomodule/cabtr/ts2-cabtrs.bob
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>TS2 CABTR collection</name>
+ <macros>
+ <CABTR_PREFIX>cabtr</CABTR_PREFIX>
+ </macros>
+ <widget type="action_button" version="3.0.0">
+ <name>TC-001</name>
+ <actions>
+ <action type="open_display">
+ <file>cabtr.bob</file>
+ <macros>
+ <DEVICE>${CABTR_PREFIX}-001</DEVICE>
+ <IDX>001</IDX>
+ </macros>
+ <target>tab</target>
+ <description>Open TC-001</description>
+ </action>
+ </actions>
+ <pv_name>${CABTR_PREFIX}-001:CommsStatR</pv_name>
+ <height>60</height>
+ <rules>
+ <rule name="CommsStat" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0 > 0 and pvInt0 < 3">
+ <value>
+ <color red="125" green="125" blue="0" alpha="81">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pvInt0 == 3">
+ <value>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>TC-002</name>
+ <actions>
+ <action type="open_display">
+ <file>cabtr.bob</file>
+ <macros>
+ <DEVICE>${CABTR_PREFIX}-002</DEVICE>
+ <IDX>002</IDX>
+ </macros>
+ <target>tab</target>
+ <description>Open TC-002</description>
+ </action>
+ </actions>
+ <pv_name>${CABTR_PREFIX}-002:CommsStatR</pv_name>
+ <x>110</x>
+ <height>60</height>
+ <rules>
+ <rule name="CommsStat" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0 > 0 and pvInt0 < 3">
+ <value>
+ <color red="125" green="125" blue="0" alpha="81">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pvInt0 == 3">
+ <value>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>TC-003</name>
+ <actions>
+ <action type="open_display">
+ <file>cabtr.bob</file>
+ <macros>
+ <DEVICE>${CABTR_PREFIX}-003</DEVICE>
+ </macros>
+ <target>tab</target>
+ <description>Open TC-003</description>
+ </action>
+ </actions>
+ <pv_name>${CABTR_PREFIX}-003:CommsStatR</pv_name>
+ <x>220</x>
+ <height>60</height>
+ <rules>
+ <rule name="CommsStat" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0 > 0 and pvInt0 < 3">
+ <value>
+ <color red="125" green="125" blue="0" alpha="81">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pvInt0 == 3">
+ <value>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>TC-004</name>
+ <actions>
+ <action type="open_display">
+ <file>cabtr.bob</file>
+ <macros>
+ <DEVICE>${CABTR_PREFIX}-004</DEVICE>
+ </macros>
+ <target>tab</target>
+ <description>Open TC-004</description>
+ </action>
+ </actions>
+ <pv_name>${CABTR_PREFIX}-004:CommsStatR</pv_name>
+ <x>330</x>
+ <height>60</height>
+ <rules>
+ <rule name="CommsStat" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0 > 0 and pvInt0 < 3">
+ <value>
+ <color red="125" green="125" blue="0" alpha="81">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pvInt0 == 3">
+ <value>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>TC-005</name>
+ <actions>
+ <action type="open_display">
+ <file>cabtr.bob</file>
+ <macros>
+ <DEVICE>${CABTR_PREFIX}-005</DEVICE>
+ </macros>
+ <target>tab</target>
+ <description>Open TC-005</description>
+ </action>
+ </actions>
+ <pv_name>${CABTR_PREFIX}-005:CommsStatR</pv_name>
+ <x>440</x>
+ <height>60</height>
+ <rules>
+ <rule name="CommsStat" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0 > 0 and pvInt0 < 3">
+ <value>
+ <color red="125" green="125" blue="0" alpha="81">
+ </color>
+ </value>
+ </exp>
+ <exp bool_exp="pvInt0 == 3">
+ <value>
+ <color name="OK" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+</display>