PumpFM,pumpTandem test parameter Power replaced by parameter Entities.Test.PumpPower,
all changes done except of UI changes (which can be done in more different ways)
This commit is contained in:
@@ -19,7 +19,6 @@ namespace TBF.BenchControl.Elde.PumpTandem
|
||||
|
||||
public bool State { get { return pump1.State || pump2.State; } }
|
||||
public int Delay { get { return Math.Max(pump1.Delay, pump2.Delay); } }
|
||||
public float Power { get { return pumpCfg.TestParams.Power; } }
|
||||
public ValveCategory Category { get { return ValveCategory.Feeding; } } /// Pump category is Feeding
|
||||
public GenericDevices.IValve CoupledTo { get { return null; } }
|
||||
public bool InvertCouple { get { return false; } }
|
||||
@@ -56,11 +55,6 @@ namespace TBF.BenchControl.Elde.PumpTandem
|
||||
}
|
||||
|
||||
|
||||
public void TurnOnDfltPower()
|
||||
{
|
||||
TurnOn(Power);
|
||||
}
|
||||
|
||||
public void TurnOn(float powerArg)
|
||||
{
|
||||
if ((pumpFm1 != null) && (pumpFm2 != null))
|
||||
@@ -105,7 +99,6 @@ namespace TBF.BenchControl.Elde.PumpTandem
|
||||
public enum CurrentOp
|
||||
{
|
||||
None,
|
||||
TurnOnDfltPower,
|
||||
TurnOn,
|
||||
TurnOff,
|
||||
}
|
||||
@@ -114,16 +107,6 @@ namespace TBF.BenchControl.Elde.PumpTandem
|
||||
|
||||
float powerForOp;
|
||||
|
||||
/// <summary>
|
||||
/// Turn the pump frequency inverter on.
|
||||
/// </summary>
|
||||
public IOperation TurnOnDfltPowerOp()
|
||||
{
|
||||
if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
|
||||
currentOp = CurrentOp.TurnOnDfltPower;
|
||||
return this;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Turn the pump frequency inverter on.
|
||||
/// </summary>
|
||||
@@ -150,9 +133,6 @@ namespace TBF.BenchControl.Elde.PumpTandem
|
||||
{
|
||||
switch (currentOp)
|
||||
{
|
||||
case CurrentOp.TurnOnDfltPower:
|
||||
TurnOnDfltPower();
|
||||
return;
|
||||
case CurrentOp.TurnOn:
|
||||
TurnOn(powerForOp);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user