|
@@ -790,18 +790,33 @@ namespace JetMainframe.TMs.TM
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if (!_tm.CheckFastPumpValveIsOpen(ModuleName.TM))
|
|
|
+ if (_tm.GetModulePressure(ModuleName.TM) > SC.GetValue<double>("TM.PumpCrossingPressure"))
|
|
|
{
|
|
|
- if (!_delay_pump.IsRunning)
|
|
|
+ if (!_tm.CheckSoftPumpValveIsOpen(ModuleName.TM))
|
|
|
{
|
|
|
- _delay_pump.Restart();
|
|
|
+ _tm.SetSlowPumpValve(ModuleName.TM, true, out _);
|
|
|
+ firstonffline = true;
|
|
|
}
|
|
|
- if (_delay_pump.ElapsedMilliseconds >= 1000)
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if (_tm.CheckSoftPumpValveIsOpen(ModuleName.TM))
|
|
|
{
|
|
|
- _tm.SetFastPumpValve(ModuleName.TM, true, out _);
|
|
|
- _delay_pump.Stop();
|
|
|
- firstonffline = true;
|
|
|
- _delay_pump.Stop();
|
|
|
+ _tm.SetSlowPumpValve(ModuleName.TM, false, out _);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!_tm.CheckFastPumpValveIsOpen(ModuleName.TM))
|
|
|
+ {
|
|
|
+ if (!_delay_pump.IsRunning)
|
|
|
+ {
|
|
|
+ _delay_pump.Restart();
|
|
|
+ }
|
|
|
+ if (_delay_pump.ElapsedMilliseconds >= 1000)
|
|
|
+ {
|
|
|
+ _tm.SetFastPumpValve(ModuleName.TM, true, out _);
|
|
|
+ _delay_pump.Stop();
|
|
|
+ firstonffline = true;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -815,9 +830,10 @@ namespace JetMainframe.TMs.TM
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ if (_tm.CheckSoftPumpValveIsOpen(ModuleName.TM))
|
|
|
+ _tm.SetSlowPumpValve(ModuleName.TM, false, out _);
|
|
|
if (_tm.CheckFastPumpValveIsOpen(ModuleName.TM))
|
|
|
_tm.SetFastPumpValve(ModuleName.TM, false, out _);
|
|
|
- //firstonffline = true;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -834,10 +850,15 @@ namespace JetMainframe.TMs.TM
|
|
|
{
|
|
|
if (firstonffline)
|
|
|
{
|
|
|
- _tm.SetFastPumpValve(ModuleName.TM, false, out _);
|
|
|
+ if (_tm.CheckFastPumpValveIsOpen(ModuleName.TM))
|
|
|
+ _tm.SetFastPumpValve(ModuleName.TM, false, out _);
|
|
|
+ if (_tm.CheckSoftPumpValveIsOpen(ModuleName.TM))
|
|
|
+ _tm.SetSlowPumpValve(ModuleName.TM, false, out _);
|
|
|
|
|
|
if (SC.GetValue<bool>("TM.PressureControl.ControlWriteMode"))
|
|
|
SC.SetItemValue("TM.PressureControl.ControlWriteMode", true);
|
|
|
+ if(_delay_pump.IsRunning)
|
|
|
+ _delay_pump.Stop();
|
|
|
firstonffline = false;
|
|
|
}
|
|
|
}
|
|
@@ -846,28 +867,13 @@ namespace JetMainframe.TMs.TM
|
|
|
{
|
|
|
if(_tm.CheckFastPumpValveIsOpen(ModuleName.TM))
|
|
|
_tm.SetFastPumpValve(ModuleName.TM, false, out _);
|
|
|
+ if (_tm.CheckSoftPumpValveIsOpen(ModuleName.TM))
|
|
|
+ _tm.SetSlowPumpValve(ModuleName.TM, false, out _);
|
|
|
InitClosePump = false;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
- //if (IsOnline && _tm.PumpUseState == PumpState.Idle)
|
|
|
- //{
|
|
|
- // // control pressure not start
|
|
|
- // if (SC.GetValue<bool>("TM.PressureControl.ControlWriteMode"))
|
|
|
- // {
|
|
|
- // //start control Pressure
|
|
|
- // SC.SetItemValue("TM.PressureControl.ControlWriteMode", false);
|
|
|
- // }
|
|
|
- //}
|
|
|
- //else
|
|
|
- //{
|
|
|
- // if (!SC.GetValue<bool>("TM.PressureControl.ControlWriteMode"))
|
|
|
- // {
|
|
|
- // //end control Pressure
|
|
|
- // SC.SetItemValue("TM.PressureControl.ControlWriteMode", true);
|
|
|
- // }
|
|
|
- //}
|
|
|
+
|
|
|
|
|
|
return true;
|
|
|
}
|