Modify Prewet RunRecipeRoutine and KeepWetRoutine; Revise SRD Bugs;

CyberX8_RT/Config/Devices/ModuleIOCfg.xml

@@ -254,12 +254,12 @@
 	<IO Name="Dryer2.BlowerHigh" IOName="c_HVD_2_HIGH"/>
 	</Module>
 	<Module Name="Prewet1">
-	<IO Name="Prewet1.PumpValve" IOName="c_SPW1_LEV_PUMP_VALVE"/>
+	<IO Name="Prewet1.PumpValve" IOName="c_PREWET_DI_FILL"/>
 	<IO Name="Prewet1.PumpCurrent" IOName="r_SPW1_LEV_PUMP_CURRENT"/>
 	<IO Name="Prewet1.PumpEnable" IOName="c_SPW1_LEV_PUMP_ENB"/>
 	<IO Name="Prewet1.PumpStatus" IOName="r_SPW1_LEV_PUMP_STATUS"/>
-	<IO Name="Prewet1.PumpFlow" IOName="r_SPW1_LEV_PUMP_FLOW"/>
-	<IO Name="Prewet1.PumpPressure" IOName="r_SPW1_LEV_PUMP_PRES"/>
+	<IO Name="Prewet1.PumpFlow" IOName="r_PREWET_FLOW"/>
+	<IO Name="Prewet1.PumpPressure" IOName="r_PREWET_DI_PRESS"/>
 	<IO Name="Prewet1.PumpSpeed" IOName="c_SPW1_LEV_PUMP_SPEED"/>
 	</Module>
 	<Module Name="Safety">

CyberX8_RT/Modules/Prewet/PrewetKeepWetRoutine.cs

@@ -6,13 +6,6 @@ using CyberX8_RT.Devices.LinMot;
 using CyberX8_RT.Devices.Prewet;
 using MECF.Framework.Common.Alarm;
 using MECF.Framework.Common.Routine;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using static CyberX8_RT.Modules.Prewet.PrewetKeepWetStateMachine;
 
 namespace CyberX8_RT.Modules.Prewet
 {
@@ -54,7 +47,7 @@ namespace CyberX8_RT.Modules.Prewet
             _linMotAxis.StopOperation("", null);
             if (_prewetDevice != null)
             {
-                _prewetDevice.PumpDisableOperation("prewetPump Disable",null);
+                _prewetDevice.PumpValveClose();
             }
             Runner.Stop("Manual Abort");
         }
@@ -118,12 +111,12 @@ namespace CyberX8_RT.Modules.Prewet
             }
 
             //bool pumpEnableResult = _prewetDevice.PumpEnableOperation("", null);
-            bool pumpEnableResult = _prewetDevice.PumpEnable();
-            if (!pumpEnableResult)
-            {
-                LOG.WriteLog(eEvent.ERR_PREWET, Module, "pump enable error");
-                return false;
-            }
+            //bool pumpEnableResult = _prewetDevice.PumpEnable();
+            //if (!pumpEnableResult)
+            //{
+            //    LOG.WriteLog(eEvent.ERR_PREWET, Module, "pump enable error");
+            //    return false;
+            //}
             bool result = _linMotAxis.StartPosition("", new object[] { 1 });
             if (!result)
             {
@@ -149,30 +142,44 @@ namespace CyberX8_RT.Modules.Prewet
             if(!result)
             {
 
-                string strFlow = $"pump flow status is {_prewetDevice.PrewetPumpData.PumpFlowData.Value} in warning";
-                if (AlarmListManager.Instance.AddWarn(Module, "Pump Flow", strFlow))
-                {
-                    LOG.WriteLog(eEvent.WARN_PREWET, Module, strFlow);
-                }
-                if (_prewetDevice.PrewetPumpData.PumpFlowData.IsError)
+                //Pressure
+                if (_prewetDevice.PrewetPumpData.PumpPressureData.IsError)
                 {
-                    LOG.WriteLog(eEvent.ERR_PREWET, Module, "pump flow status is in error");
+                    _linMotAxis.StopOperation("", null);
+                    _prewetDevice.PumpValveClose();
+                    LOG.WriteLog(eEvent.ERR_PREWET, Module, $"Pump pressure {_prewetDevice.PrewetPumpData.PumpPressureData.Value} is in error");
                     return true;
                 }
-                string strPressure = $"pump pressure status is {_prewetDevice.PrewetPumpData.PumpPressureData.Value} in warning";
-                if (AlarmListManager.Instance.AddWarn(Module, "Pump Pressure", strPressure))
+                else if (_prewetDevice.PrewetPumpData.PumpPressureData.IsWarning)
                 {
-                    LOG.WriteLog(eEvent.WARN_PREWET, Module, strPressure);
+                    string str = $"Pump pressure {_prewetDevice.PrewetPumpData.PumpPressureData.Value} is in warning";
+                    if (AlarmListManager.Instance.AddWarn(Module, "Pump Pressure", str))
+                    {
+                        LOG.WriteLog(eEvent.WARN_PREWET, Module, str);
+                    }
                 }
-                if (_prewetDevice.PrewetPumpData.PumpPressureData.IsError)
+                //Flow
+                if (_prewetDevice.PrewetPumpData.PumpFlowData.IsError)
                 {
-                    LOG.WriteLog(eEvent.ERR_PREWET, Module, "pump pressure status is in error");
+                    LOG.WriteLog(eEvent.ERR_PREWET, Module, $"Pump flow {_prewetDevice.PrewetPumpData.PumpFlowData.Value} is in error");
+                    _linMotAxis.StopOperation("", null);
+                    _prewetDevice.PumpValveClose();
                     return true;
                 }
+                else if (_prewetDevice.PrewetPumpData.PumpFlowData.IsWarning)
+                {
+                    string str = $"Pump flow {_prewetDevice.PrewetPumpData.PumpFlowData.Value} is in warning";
+                    if (AlarmListManager.Instance.AddWarn(Module, "Pump Flow", str))
+                    {
+                        LOG.WriteLog(eEvent.WARN_PREWET, Module, str);
+                    }
+                }
+
                 return false;
             }
             else
             {
+                _prewetDevice.PumpValveClose();
                 return true;
             }
         }
@@ -198,10 +205,10 @@ namespace CyberX8_RT.Modules.Prewet
         /// <returns></returns>
         private bool KeepWetComplete()
         {
-            bool result = _prewetDevice.PumpDisableOperation("pump disable",null);
+            bool result = _prewetDevice.PumpValveClose();
             if (!result)
             {
-                LOG.WriteLog(eEvent.ERR_PREWET, Module, "pump disable error");
+                LOG.WriteLog(eEvent.ERR_PREWET, Module, "pump valve close error");
                 return false;
             }
             result = _linMotAxis.SwitchOff();

CyberX8_RT/Modules/Prewet/PrewetProcessRoutine.cs

@@ -1,27 +1,12 @@
 using Aitex.Core.RT.Device;
 using Aitex.Core.RT.Log;
-using Aitex.Core.RT.RecipeCenter;
 using Aitex.Core.RT.Routine;
-using Aitex.Core.RT.SCCore;
-using Aitex.Core.Util;
 using CyberX8_Core;
 using CyberX8_RT.Devices.LinMot;
 using CyberX8_RT.Devices.Prewet;
 using MECF.Framework.Common.Alarm;
-using MECF.Framework.Common.CommonData;
-using MECF.Framework.Common.CommonData.Prewet;
-using MECF.Framework.Common.Persistent.Dryer;
-using MECF.Framework.Common.Persistent.Prewet;
-using MECF.Framework.Common.Persistent.Temperature;
 using MECF.Framework.Common.RecipeCenter;
 using MECF.Framework.Common.Routine;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using static CyberX8_RT.Modules.Prewet.PrewetKeepWetStateMachine;
 
 namespace CyberX8_RT.Modules.Prewet
 {
@@ -210,34 +195,34 @@ namespace CyberX8_RT.Modules.Prewet
                 _prewetDevice.PumpValveClose();
                 return true;
             }
-
+            //Pressure
             if (_prewetDevice.PrewetPumpData.PumpPressureData.IsError)
             {
                 _linMotAxis.StopOperation("",null);
                 _prewetDevice.PumpValveClose();
-                LOG.WriteLog(eEvent.ERR_PREWET, Module, $"pump pressure status {_prewetDevice.PrewetPumpData.PumpPressureData.Value} is in error");
+                LOG.WriteLog(eEvent.ERR_PREWET, Module, $"Pump pressure {_prewetDevice.PrewetPumpData.PumpPressureData.Value} is in error");
                 return true;
             }
-
-            if (_prewetDevice.PrewetPumpData.PumpFlowData.IsWarning)
+            else if (_prewetDevice.PrewetPumpData.PumpPressureData.IsWarning)
             {
-                string str = $"pump flow status {_prewetDevice.PrewetPumpData.PumpFlowData.Value}  is in warning";
-                if (AlarmListManager.Instance.AddWarn(Module, "PumpFlow", str))
+                string str = $"Pump pressure {_prewetDevice.PrewetPumpData.PumpPressureData.Value} is in warning";
+                if (AlarmListManager.Instance.AddWarn(Module, "Pump Pressure", str))
                 {
                     LOG.WriteLog(eEvent.WARN_PREWET, Module, str);
                 }
             }
+            //Flow
             if (_prewetDevice.PrewetPumpData.PumpFlowData.IsError)
             {
-                LOG.WriteLog(eEvent.ERR_PREWET, Module, $"pump flow status {_prewetDevice.PrewetPumpData.PumpFlowData.Value} is in error");
+                LOG.WriteLog(eEvent.ERR_PREWET, Module, $"Pump flow {_prewetDevice.PrewetPumpData.PumpFlowData.Value} is in error");
                 _linMotAxis.StopOperation("", null);
                 _prewetDevice.PumpValveClose();
                 return true;
             }
-            if (_prewetDevice.PrewetPumpData.PumpPressureData.IsWarning)
+            else if (_prewetDevice.PrewetPumpData.PumpFlowData.IsWarning)
             {
-                string str = $"pump pressure status is { _prewetDevice.PrewetPumpData.PumpPressureData.Value } in warning";
-                if (AlarmListManager.Instance.AddWarn(Module, "Pump Pressure", str))
+                string str = $"Pump flow {_prewetDevice.PrewetPumpData.PumpFlowData.Value}  is in warning";
+                if (AlarmListManager.Instance.AddWarn(Module, "Pump Flow", str))
                 {
                     LOG.WriteLog(eEvent.WARN_PREWET, Module, str);
                 }

CyberX8_RT/Modules/SRD/SRDProcessRecipeRoutine.cs

@@ -213,6 +213,14 @@ namespace CyberX8_RT.Modules.SRD
             }
             _datas.Clear();
             _lotTackTime = DateTime.Now;
+
+            SRDEntity srdEntity = Singleton<RouteManager>.Instance.GetModule<SRDEntity>(Module);
+            if (srdEntity.IsManual && !srdEntity.IsLoaded)
+            {
+                NotifyError(eEvent.ERR_SRD, $"{Module} is not Loaded, can't run recipe", 0);
+                return RState.Failed;
+            }
+
             return Runner.Start(Module, "Process Recipe");
         }
 

CyberX8_RT/Modules/SRD/SRDRunRecipeRoutine.cs

@@ -155,12 +155,7 @@ namespace CyberX8_RT.Modules.SRD
             _systemFacilities = DEVICE.GetDevice<SystemFacilities>("System.Facilities");
             string otherSRD = Module == "SRD1" ? "SRD2" : "SRD1";
             _otherSrdEntity = Singleton<RouteManager>.Instance.GetModule<SRDEntity>(otherSRD);
-            SRDEntity srdEntity = Singleton<RouteManager>.Instance.GetModule<SRDEntity>(Module);
-            if (srdEntity.IsManual && !srdEntity.IsLoaded)
-            {
-                NotifyError(eEvent.ERR_SRD, $"{Module} is not Loaded, can't run recipe", 0);
-                return RState.Failed;
-            }
+            
             _rotationProviderAxis = BeckhoffAxisProviderManager.Instance.GetAxisProvider($"{Module}.Rotation");
             if (_rotationProviderAxis == null)
             {

CyberX8_Themes/UserControls/SRDMoveControl.xaml

@@ -45,7 +45,7 @@
                 <RowDefinition/>
                 <RowDefinition Height="4*"/>
             </Grid.RowDefinitions>
-            <Button Style="{StaticResource SysBtnStyle}" Margin="0,8,0,7" Height="25" Width="100" HorizontalAlignment="Center" Content="Closed" Click="Closed_Click" Grid.RowSpan="3"/>
+            <Button Style="{StaticResource SysBtnStyle}" Margin="0,8,0,7" Height="25" Width="100" HorizontalAlignment="Center" Content="Close" Click="Closed_Click" Grid.RowSpan="3"/>
         </Grid>
         <Grid Grid.Row="0" Grid.Column="3">
             <Button Style="{StaticResource SysBtnStyle}" Margin="10,0,10,0" Grid.Column="1" Height="25" Width="100" HorizontalAlignment="Center" Content="Open" Click="Open_Click"></Button>