|
@@ -40,9 +40,9 @@ namespace Venus_RT.Devices
|
|
|
private readonly IoValve _TMSoftPumpValve;
|
|
|
private readonly IoValve _TMFastPumpValve;
|
|
|
private readonly IoValve _TMPurgeValve;
|
|
|
- //private readonly IoValve _TMVentValve;
|
|
|
- private readonly IoValve _TMSoftVentValve;
|
|
|
- private readonly IoValve _TMFastVentValve;
|
|
|
+ private readonly IoValve _TMVentValve;
|
|
|
+ //private readonly IoValve _TMSoftVentValve;
|
|
|
+ //private readonly IoValve _TMFastVentValve;
|
|
|
|
|
|
private readonly IoValve _LLASoftPumpValve;
|
|
|
private readonly IoValve _LLAFastPumpValve;
|
|
@@ -130,9 +130,9 @@ namespace Venus_RT.Devices
|
|
|
public bool IsLLBVentValveOpen => _LLBVentValve.Status;
|
|
|
public bool IsLLBPurgeValveOpen => _LLBPurgeValve.Status;
|
|
|
|
|
|
- public bool IsTMSoftVentValveOpen => _TMSoftVentValve.Status;
|
|
|
+ public bool IsTMVentValveOpen => _TMVentValve.Status;
|
|
|
|
|
|
- public bool IsTMFastVentValveOpen => _TMFastVentValve.Status;
|
|
|
+ // public bool IsTMFastVentValveOpen => _TMFastVentValve.Status;
|
|
|
|
|
|
public bool IsTMPurgeValveOpen => _TMPurgeValve.Status;
|
|
|
public bool IsTMFastPumpOpen => _TMFastPumpValve.Status;
|
|
@@ -171,9 +171,9 @@ namespace Venus_RT.Devices
|
|
|
_TMSoftPumpValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMSoftPumpValve}");
|
|
|
_TMFastPumpValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMFastPumpValve}");
|
|
|
_TMPurgeValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMPurgeValve}");
|
|
|
- //_TMVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMVentValve}");
|
|
|
- _TMSoftVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMSoftVentValve}");
|
|
|
- _TMFastVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMFastVentValve}");
|
|
|
+ _TMVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMVentValve}");
|
|
|
+ //_TMSoftVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMSoftVentValve}");
|
|
|
+ //_TMFastVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMFastVentValve}");
|
|
|
|
|
|
_LLASoftPumpValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.LLASoftPumpValve}");
|
|
|
_LLAFastPumpValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.LLAFastPumpValve}");
|
|
@@ -323,7 +323,7 @@ namespace Venus_RT.Devices
|
|
|
switch (mod)
|
|
|
{
|
|
|
case ModuleName.TM:
|
|
|
- _TMFastVentValve.TurnValve(bOn, out string _);
|
|
|
+ _TMVentValve.TurnValve(bOn, out string _);
|
|
|
break;
|
|
|
case ModuleName.LLA:
|
|
|
_LLAVentValve.TurnValve(bOn, out string _);
|
|
@@ -334,47 +334,16 @@ namespace Venus_RT.Devices
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public void TurnFastVentValve(ModuleName mod, bool bOn)
|
|
|
- {
|
|
|
- _TMN2Valve.TurnValve(bOn, out string _);
|
|
|
- switch (mod)
|
|
|
- {
|
|
|
- case ModuleName.TM:
|
|
|
- _TMFastVentValve.TurnValve(bOn, out string _);
|
|
|
- break;
|
|
|
- case ModuleName.LLA:
|
|
|
- _LLAVentValve.TurnValve(bOn, out string _);
|
|
|
- break;
|
|
|
- case ModuleName.LLB:
|
|
|
- _LLBVentValve.TurnValve(bOn, out string _);
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- public void TurnSoftVentValve(ModuleName mod, bool bOn)
|
|
|
- {
|
|
|
- _TMN2Valve.TurnValve(bOn, out string _);
|
|
|
- switch (mod)
|
|
|
- {
|
|
|
- case ModuleName.TM:
|
|
|
- _TMSoftVentValve.TurnValve(bOn, out string _);
|
|
|
- break;
|
|
|
- case ModuleName.LLA:
|
|
|
- _LLAPurgeValve.TurnValve(bOn, out string _);
|
|
|
- break;
|
|
|
- case ModuleName.LLB:
|
|
|
- _LLBPurgeValve.TurnValve(bOn, out string _);
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
public void TurnPurgeValve(ModuleName mod, bool bOn)
|
|
|
{
|
|
|
switch(mod)
|
|
|
{
|
|
|
case ModuleName.TM:
|
|
|
- //_TMPurgeValve.TurnValve(bOn, out string _);
|
|
|
- _TMFastVentValve.TurnValve(bOn, out string _);
|
|
|
+ _TMPurgeValve.TurnValve(bOn, out string _);
|
|
|
break;
|
|
|
case ModuleName.LLA:
|
|
|
_LLAPurgeValve.TurnValve(bOn, out string _);
|
|
@@ -482,7 +451,7 @@ namespace Venus_RT.Devices
|
|
|
switch (mod)
|
|
|
{
|
|
|
case ModuleName.TM:
|
|
|
- if (IsTMSoftVentValveOpen)
|
|
|
+ if (IsTMVentValveOpen)
|
|
|
{
|
|
|
LOG.Write(eEvent.ERR_TM, ModuleName.TM, "TM Vent Valve not closed");
|
|
|
return false;
|