Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into Release_5.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tom-Willemsen
Tom-Willemsen committed Jan 30, 2019
2 parents c138ce7 + 886273d commit 152545d
Showing 1 changed file with 40 additions and 40 deletions.
80 changes: 40 additions & 40 deletions base/uk.ac.stfc.isis.ibex.opis/resources/moxa1262.opi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<exp bool_exp="pv0 == 0">
<value>true</value>
</exp>
<pv trig="true">$(PV_ROOT):CH0:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH0:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -229,7 +229,7 @@
<exp bool_exp="pv0 == 0">
<value>true</value>
</exp>
<pv trig="true">$(PV_ROOT):CH1:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH1:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -277,7 +277,7 @@
<exp bool_exp="pv0 == 0">
<value>true</value>
</exp>
<pv trig="true">$(PV_ROOT):CH2:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH2:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -325,7 +325,7 @@
<exp bool_exp="pv0 == 0">
<value>true</value>
</exp>
<pv trig="true">$(PV_ROOT):CH3:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH3:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -373,7 +373,7 @@
<exp bool_exp="pv0 == 0">
<value>true</value>
</exp>
<pv trig="true">$(PV_ROOT):CH4:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH4:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -421,7 +421,7 @@
<exp bool_exp="pv0 == 0">
<value>true</value>
</exp>
<pv trig="true">$(PV_ROOT):CH5:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH5:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -469,7 +469,7 @@
<exp bool_exp="pv0 == 0">
<value>true</value>
</exp>
<pv trig="true">$(PV_ROOT):CH6:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH6:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -517,7 +517,7 @@
<exp bool_exp="pv0 == 0">
<value>true</value>
</exp>
<pv trig="true">$(PV_ROOT):CH7:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH7:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -936,15 +936,15 @@
<name>Text Update</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH0:TEMP:RBV:NAME</pv_name>
<pv_name>$(PV_ROOT):CH0:TEMP:NAME</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH0:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH0:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -995,15 +995,15 @@ $(pv_value)</tooltip>
<name>Text Update</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH1:TEMP:RBV:NAME</pv_name>
<pv_name>$(PV_ROOT):CH1:TEMP:NAME</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH1:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH1:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1054,15 +1054,15 @@ $(pv_value)</tooltip>
<name>Text Update</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH2:TEMP:RBV:NAME</pv_name>
<pv_name>$(PV_ROOT):CH2:TEMP:NAME</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH2:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH2:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1113,15 +1113,15 @@ $(pv_value)</tooltip>
<name>Text Update_1</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH3:TEMP:RBV:NAME</pv_name>
<pv_name>$(PV_ROOT):CH3:TEMP:NAME</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH3:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH3:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1172,15 +1172,15 @@ $(pv_value)</tooltip>
<name>Text Update</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH4:TEMP:RBV:NAME</pv_name>
<pv_name>$(PV_ROOT):CH4:TEMP:NAME</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH4:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH4:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1231,15 +1231,15 @@ $(pv_value)</tooltip>
<name>Text Update_1</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH5:TEMP:RBV:NAME</pv_name>
<pv_name>$(PV_ROOT):CH5:TEMP:NAME</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH5:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH5:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1290,15 +1290,15 @@ $(pv_value)</tooltip>
<name>Text Update_2</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH6:TEMP:RBV:NAME</pv_name>
<pv_name>$(PV_ROOT):CH6:TEMP:NAME</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH6:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH6:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1349,15 +1349,15 @@ $(pv_value)</tooltip>
<name>Text Update_3</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH7:TEMP:RBV:NAME</pv_name>
<pv_name>$(PV_ROOT):CH7:TEMP:NAME</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH7:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH7:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1408,15 +1408,15 @@ $(pv_value)</tooltip>
<name>Text Update</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH0:TEMP:RBV</pv_name>
<pv_name>$(PV_ROOT):CH0:TEMP</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH0:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH0:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1467,15 +1467,15 @@ $(pv_value)</tooltip>
<name>Text Update_9</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH1:TEMP:RBV</pv_name>
<pv_name>$(PV_ROOT):CH1:TEMP</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH1:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH1:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1526,15 +1526,15 @@ $(pv_value)</tooltip>
<name>Text Update</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH2:TEMP:RBV</pv_name>
<pv_name>$(PV_ROOT):CH2:TEMP</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH2:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH2:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1585,15 +1585,15 @@ $(pv_value)</tooltip>
<name>Text Update_9</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH3:TEMP:RBV</pv_name>
<pv_name>$(PV_ROOT):CH3:TEMP</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH3:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH3:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1644,15 +1644,15 @@ $(pv_value)</tooltip>
<name>Text Update</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH4:TEMP:RBV</pv_name>
<pv_name>$(PV_ROOT):CH4:TEMP</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH4:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH4:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1703,15 +1703,15 @@ $(pv_value)</tooltip>
<name>Text Update_9</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH5:TEMP:RBV</pv_name>
<pv_name>$(PV_ROOT):CH5:TEMP</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH5:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH5:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1762,15 +1762,15 @@ $(pv_value)</tooltip>
<name>Text Update_10</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH6:TEMP:RBV</pv_name>
<pv_name>$(PV_ROOT):CH6:TEMP</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH6:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH6:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down Expand Up @@ -1821,15 +1821,15 @@ $(pv_value)</tooltip>
<name>Text Update_11</name>
<precision>0</precision>
<precision_from_pv>true</precision_from_pv>
<pv_name>$(PV_ROOT):CH7:TEMP:RBV</pv_name>
<pv_name>$(PV_ROOT):CH7:TEMP</pv_name>
<pv_value />
<rotation_angle>0.0</rotation_angle>
<rules>
<rule name="Rule" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv trig="true">$(PV_ROOT):CH7:TEMP:RBV:STAT</pv>
<pv trig="true">$(PV_ROOT):CH7:TEMP:STAT</pv>
</rule>
</rules>
<scale_options>
Expand Down

0 comments on commit 152545d

Please sign in to comment.