michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

string Test.TempControl and string TestData.TempControl added and used in sequences.

Browse Source
This commit is contained in:
Milan Hanajik
2022-05-13 13:47:53 +02:00
parent 2bae912fa0
commit a8ba5d5113
22 changed files with 115 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs
+1 -1
View File
@@ -262,7 +262,7 @@ namespace TBF.Rig.TestMethods.Adjustment
flowSetTime = StateMachine.Time - flowSetTime0;
if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
+1 -1
View File
@@ -291,7 +291,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
int flowSetTime = StateMachine.Time - flowSetTime0;
double currentFlow = RefFlow.Val;
if (test.DoControlWaterTemp && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
if (!string.IsNullOrEmpty(test.TempControl) && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs
+1 -1
View File
@@ -199,7 +199,7 @@ namespace TBF.Rig.TestMethods.Endurance
double currentFlow = RefFlow.Val;
if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs
+1 -1
View File
@@ -330,7 +330,7 @@ namespace TBF.Rig.TestMethods.FixedStart
}
while (true);
}
else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
+1 -1
View File
@@ -349,7 +349,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval
}
while (true);
}
else if (test.DoControlWaterTemp && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
else if (!string.IsNullOrEmpty(test.TempControl) && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
+1 -1
View File
@@ -410,7 +410,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
}
while (true);
}
else if (test.DoControlWaterTemp && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
else if (!string.IsNullOrEmpty(test.TempControl) && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+1 -1
View File
@@ -305,7 +305,7 @@ namespace TBF.Rig.TestMethods.FixedStartTankCollection
int flowSetTime = StateMachine.Time - flowSetTime0;
if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs
+1 -1
View File
@@ -233,7 +233,7 @@ namespace TBF.Rig.TestMethods.FlowAdjustment
TestEndTime = DateTime.Now;
double currentFlow = RefFlow.Val;
if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs
+1 -1
View File
@@ -294,7 +294,7 @@ namespace TBF.Rig.TestMethods.FlyingStart
}
while (true);
}
else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
+1 -1
View File
@@ -372,7 +372,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
}
while (true);
}
else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
+1 -1
View File
@@ -393,7 +393,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
}
while (true);
}
else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+1 -1
View File
@@ -372,7 +372,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
}
while (true);
}
else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+1 -1
View File
@@ -372,7 +372,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection
}
while (true);
}
else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
+1 -1
View File
@@ -287,7 +287,7 @@ namespace TBF.Rig.TestMethods.FlyingStartTankCollection
int flowSetTime = StateMachine.Time - flowSetTime0;
double currentFlow = RefFlow.Val;
if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs
+1 -1
View File
@@ -222,7 +222,7 @@ namespace TBF.Rig.TestMethods.PulsesTest
int flowSetTime = StateMachine.Time - flowSetTime0;
if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
+1 -1
View File
@@ -222,7 +222,7 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
int flowSetTime = StateMachine.Time - flowSetTime0;
if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
+1 -1
View File
@@ -339,7 +339,7 @@ namespace TBF.Rig.TestMethods.StandingStart
}
while (true);
}
else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
+1 -1
View File
@@ -390,7 +390,7 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
}
while (true);
}
else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);