revise vpw auto open drip valve bug

PunkHPX8_RT/Devices/VpwCell/VpwCellDevice.cs

@@ -660,7 +660,7 @@ namespace PunkHPX8_RT.Devices.VpwCell
             return true;
         }
 
-        //cell flow满足条件过一段时间自动打开排水阀
+        //cell flow满足条件过一段时间自动打开drip阀
         private void CellFlowMonitor()
         {
             _cellFlowSetValue = SC.GetValue<double>("VPWMain.Plumbing.CellFlowStartLowLimit");
@@ -673,14 +673,14 @@ namespace PunkHPX8_RT.Devices.VpwCell
                     _totalFlowOK = true;
                     _totalFlowOkDetectTime = DateTime.Now;
                 }
-                if ((DateTime.Now - _totalFlowOkDetectTime).TotalSeconds > _dripValveOpenIdlePeriod * 60 && !_commonData.DrainValve)
+                if (_totalFlowOK == true && (_totalFlowOkDetectTime - DateTime.Now).TotalSeconds > (_dripValveOpenIdlePeriod * 60) && !_commonData.FlowDrip)
                 {
-                    LOG.WriteLog(eEvent.INFO_VPW, Module, $"total flow is large than start limit more than {_dripValveOpenIdlePeriod} min,Drin valve on!");
-                    DrainValveOn();
+                    LOG.WriteLog(eEvent.INFO_VPW, Module, $"total flow is large than start limit more than {_dripValveOpenIdlePeriod} min,Drip valve on!");
+                    FlowDripOn();
                     _totalFlowOkDetectTime = DateTime.Now;
-                    if(_commonData.DiwFlow < _cellFlowSetValue)
+                    if(_commonData.DiwFlow <= 0)
                     {
-                        LOG.WriteLog(eEvent.WARN_VPW, Module, $"Drin valve open failed!");
+                        LOG.WriteLog(eEvent.WARN_VPW, Module, $"Drip valve open failed!");
                     }
                 }
             }

PunkHPX8_RT/Modules/VpwCell/VpwManualPrepareRoutine.cs

@@ -185,7 +185,8 @@ namespace PunkHPX8_RT.Modules.VpwCell
             bool result = loopDoValue < _recipe.DiwLoopDoSet;
             if (!result) 
             {
-                NotifyError(eEvent.ERR_VPW, $"LoopDO value {loopDoValue} is less than {_recipe.DiwLoopDoSet}", -1);
+                //NotifyError(eEvent.ERR_VPW, $"LoopDO value {loopDoValue} is large than recipe set {_recipe.DiwLoopDoSet}", -1);
+                LOG.WriteLog(eEvent.ERR_VPW, Module, $"LoopDO value {loopDoValue} is large than recipe set {_recipe.DiwLoopDoSet}");
             }
             return result;
         }

PunkHPX8_RT/Modules/VpwCell/VpwVacuumPrewetRoutine.cs

@@ -120,7 +120,7 @@ namespace PunkHPX8_RT.Modules.VpwCell
                 .Wait(PrepareStep.CheckVacuum, CheckVacuumValue, _pumpDownTimeOut + 1000)
                 .RunIf(PrepareStep.CloseVacuumValve, _isNeedRetry, PumpValveOff, _delay_1ms)
                 .RunIf(PrepareStep.OpenVentValve, _isNeedRetry, OpenVentValve, _delay_1ms)
-                .WaitIf(PrepareStep.CheckLidReleaseVacuum, _isNeedRetry, CheckLidReleaseVacuum, _lidReleasePressureTimeout)
+                .WaitIf(PrepareStep.CheckLidReleaseVacuum, _isNeedRetry, CheckLidReleaseVacuum, _lidReleasePressureTimeout*1000)
                 .RunIf(PrepareStep.ChamberDown, _isNeedRetry, ChamberDown, CheckChamberOpened, _delay_10s)
                 .RunIf(PrepareStep.CloseVentValve, _isNeedRetry, CloseVentValve, _delay_1ms)
                 .RunIf(PrepareStep.ChamberUp, _isNeedRetry, ChamberUp, CheckChamberClosed, _delay_10s)
@@ -190,12 +190,15 @@ namespace PunkHPX8_RT.Modules.VpwCell
             }
             if (DateTime.Now.Subtract(_pumpDownTime).TotalMilliseconds >= _pumpDownWarningTime)
             {
-                AlarmListManager.Instance.AddWarn(Module, "vacuum value", $"vacuum value {vacuumValue} is less than {_recipe.VacuumTarget}");
+                LOG.WriteLog(eEvent.WARN_VPW, Module, $"vacuum value {vacuumValue} is less than {_recipe.VacuumTarget} in PumpDownWarningTime");
+                //AlarmListManager.Instance.AddWarn(Module, "vacuum value", $"vacuum value {vacuumValue} is less than {_recipe.VacuumTarget}");
             }
             if (DateTime.Now.Subtract(_pumpDownTime).TotalMilliseconds >= _pumpDownTimeOut)
             {
                 _isNeedRetry = true;
+                LOG.WriteLog(eEvent.INFO_VPW, Module, $"Check Vacuum failed, Pump down retry start!");
                 return true;
+              
             }
             return false;
         }
@@ -418,7 +421,7 @@ namespace PunkHPX8_RT.Modules.VpwCell
             _mainDevice.CellFlow = _vpwCellDevice.CommonData.DiwFlow;
             if (_stepIndex >= _recipe.VacuumRinseStep.Count)
             {
-                LOG.WriteLog(eEvent.INFO_METAL, Module, $"vacuum step {_stepIndex} is over step count {_recipe.VacuumRinseStep.Count}");
+                LOG.WriteLog(eEvent.INFO_VPW, Module, $"vacuum step {_stepIndex} is over step count {_recipe.VacuumRinseStep.Count}");
                 return true;
             }
 
@@ -429,13 +432,13 @@ namespace PunkHPX8_RT.Modules.VpwCell
                 _startStepTime = DateTime.Now;
                 if (_stepIndex >= _recipe.VacuumRinseStep.Count)
                 {
-                    LOG.WriteLog(eEvent.INFO_METAL, Module, $"vaccum step {_stepIndex} is over step count {_recipe.VacuumRinseStep.Count}");
+                    LOG.WriteLog(eEvent.INFO_VPW, Module, $"vaccum step {_stepIndex} is over step count {_recipe.VacuumRinseStep.Count}");
                     return true;
                 }
                 bool result = _vpwCellDevice.ChangeRotationSpeed(_recipe.VacuumRinseStep[_stepIndex].RotationSpeed*6);
                 if (result)
                 {
-                    LOG.WriteLog(eEvent.INFO_METAL, Module, $"vacuum step {_stepIndex} complete");
+                    LOG.WriteLog(eEvent.INFO_VPW, Module, $"vacuum step {_stepIndex} complete");
                 }
                 return result;
             }