diff --git a/opi/EMU.opi b/opi/EMU.opi
index f326f8fc31df480382765f5c75671c2a47976d7d..4706819949d87d03d8cfef5bb7ce41a92a249e78 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -1762,7 +1762,7 @@ $(pv_value)</tooltip>
<push_action_index>0</push_action_index>
<rules>
<rule name="Enable" prop_id="enabled" out_exp="false">
- <exp bool_exp="pv0==1 || pv1==0">
+ <exp bool_exp="pv0==1 && pv1==0">
<value>true</value>
</exp>
<exp bool_exp="pv0==0 || pv1==1">
@@ -3470,13 +3470,14 @@ $(pv_value)</tooltip>
<push_action_index>0</push_action_index>
<rules>
<rule name="Enable" prop_id="enabled" out_exp="false">
- <exp bool_exp="pv0==0">
+ <exp bool_exp="pv0==0 || pv1==1">
<value>false</value>
</exp>
- <exp bool_exp="pv0==1">
+ <exp bool_exp="pv0==1 && pv1==0">
<value>true</value>
</exp>
<pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
+ <pv trig="true">${PREFIX_SCAN}:$(PROC)-AUTO-HOME</pv>
</rule>
</rules>
<enabled>true</enabled>
@@ -3519,20 +3520,6 @@ $(pv_value)</tooltip>
<confirm_message></confirm_message>
<description>Abort Scan</description>
</action>
- <action type="WRITE_PV">
- <pv_name>loc://stopMeasure</pv_name>
- <value>1</value>
- <timeout>10</timeout>
- <confirm_message></confirm_message>
- <description></description>
- </action>
- <action type="WRITE_PV">
- <pv_name>LNS-ISRC-010:PBI-EMV:PS.AWAIT</pv_name>
- <value>0</value>
- <timeout>10</timeout>
- <confirm_message></confirm_message>
- <description></description>
- </action>
</actions>
<font>
<opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
@@ -3551,7 +3538,7 @@ $(pv_value)</tooltip>
<exp bool_exp="pv0==0 && pv1==0 && pv2==0 && pv3==0 && pv4==0 && pv5==0">
<value>true</value>
</exp>
- <exp bool_exp="pv0==1 || pv0==0 || pv1==0 || pv2==0 || pv3==0 || pv4==0 || pv5==0">
+ <exp bool_exp="pv0==1 || pv1==0 || pv2==0 || pv3==0 || pv4==0 || pv5==0">
<value>false</value>
</exp>
<pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
@@ -3602,13 +3589,6 @@ $(pv_value)</tooltip>
<confirm_message></confirm_message>
<description>Start SCAN</description>
</action>
- <action type="WRITE_PV">
- <pv_name>loc://stopMeasure</pv_name>
- <value>0</value>
- <timeout>10</timeout>
- <confirm_message></confirm_message>
- <description></description>
- </action>
</actions>
<font>
<opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
@@ -3985,7 +3965,7 @@ $(pv_value)</tooltip>
<roi_0_w_pv_value />
<roi_0_visible>true</roi_0_visible>
<horizon_profile_x_pv_name>$(PREFIX_SCAN):CALC-PROJ-Xabsc</horizon_profile_x_pv_name>
- <height>794</height>
+ <height>797</height>
<border_width>1</border_width>
<graph_area_width>1290</graph_area_width>
<y_axis_scale_font>
@@ -4018,7 +3998,7 @@ $(pv_value)</tooltip>
<opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
</y_axis_title_font>
<border_alarm_sensitive>false</border_alarm_sensitive>
- <graph_area_height>733</graph_area_height>
+ <graph_area_height>736</graph_area_height>
<x_axis_visible>true</x_axis_visible>
<roi_0_y_pv_value />
<roi_1_h_pv_value />
@@ -6272,46 +6252,6 @@ $(trace_0_y_pv_value)</tooltip>
<color red="0" green="0" blue="255" />
</foreground_color>
</widget>
- <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
- <border_style>0</border_style>
- <tooltip></tooltip>
- <horizontal_alignment>1</horizontal_alignment>
- <rules />
- <enabled>false</enabled>
- <wuid>-47901338:158955bc5eb:-330f</wuid>
- <transparent>true</transparent>
- <auto_size>false</auto_size>
- <text></text>
- <scripts />
- <height>20</height>
- <border_width>2</border_width>
- <scale_options>
- <width_scalable>true</width_scalable>
- <height_scalable>true</height_scalable>
- <keep_wh_ratio>false</keep_wh_ratio>
- </scale_options>
- <visible>true</visible>
- <vertical_alignment>1</vertical_alignment>
- <border_color>
- <color name="IO Border" red="215" green="215" blue="215" />
- </border_color>
- <widget_type>Label</widget_type>
- <wrap_words>false</wrap_words>
- <background_color>
- <color name="IO Background" red="255" green="255" blue="205" />
- </background_color>
- <width>144</width>
- <x>150</x>
- <name>Label Orientation_2</name>
- <y>822</y>
- <foreground_color>
- <color name="IO Foreground" red="0" green="0" blue="0" />
- </foreground_color>
- <actions hook="false" hook_all="false" />
- <font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
- </font>
- </widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
<border_style>0</border_style>
<tooltip></tooltip>
@@ -7743,6 +7683,56 @@ $(pv_value)</tooltip>
<opifont.name fontName="OpenSans" height="12" style="1">Normal Bold</opifont.name>
</font>
</widget>
+ <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+ <border_style>0</border_style>
+ <tooltip></tooltip>
+ <horizontal_alignment>1</horizontal_alignment>
+ <rules>
+ <rule name="Visible" prop_id="visible" out_exp="false">
+ <exp bool_exp="pv0==1">
+ <value>true</value>
+ </exp>
+ <exp bool_exp="pv0==0">
+ <value>false</value>
+ </exp>
+ <pv trig="true">${PREFIX_SCAN}:$(PROC)-AUTO-HOME</pv>
+ </rule>
+ </rules>
+ <enabled>false</enabled>
+ <wuid>7feef39:159b7455f16:-7060</wuid>
+ <transparent>true</transparent>
+ <auto_size>false</auto_size>
+ <text>STOPPING IN PROGRESS ...</text>
+ <scripts />
+ <height>60</height>
+ <border_width>1</border_width>
+ <scale_options>
+ <width_scalable>true</width_scalable>
+ <height_scalable>true</height_scalable>
+ <keep_wh_ratio>false</keep_wh_ratio>
+ </scale_options>
+ <visible>true</visible>
+ <vertical_alignment>1</vertical_alignment>
+ <border_color>
+ <color red="0" green="128" blue="255" />
+ </border_color>
+ <widget_type>Label</widget_type>
+ <wrap_words>false</wrap_words>
+ <background_color>
+ <color red="255" green="255" blue="255" />
+ </background_color>
+ <width>505</width>
+ <x>1086</x>
+ <name>Label</name>
+ <y>150</y>
+ <foreground_color>
+ <color name="Major" red="255" green="0" blue="0" />
+ </foreground_color>
+ <actions hook="false" hook_all="false" />
+ <font>
+ <opifont.name fontName="Cantarell" height="19" style="1">Header 1</opifont.name>
+ </font>
+ </widget>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
<border_style>0</border_style>