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

FlyingStarMassCollComparative : Mass updated when comparative measurement done, ver. 2.18.1072

Browse Source
This commit is contained in:
Milan Hanajik
2018-11-20 17:49:58 +01:00
parent afea809b97
commit 7bdb7f99d4
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
+4
View File
@@ -465,6 +465,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
State.Create(string.Format("{0}({1}) : Activate ref. mass valve", test.Method, test.Name)) State.Create(string.Format("{0}({1}) : Activate ref. mass valve", test.Method, test.Name))
.AddOperation(checkUiOp) .AddOperation(checkUiOp)
.AddOperation(StateMachine.ControlBoard.SetValvesOp(compareValve, null)) .AddOperation(StateMachine.ControlBoard.SetValvesOp(compareValve, null))
.AddOperation(scale.ReadMassOp(ref Mass))
.EnterState(); .EnterState();
do do
{ {
@@ -483,6 +484,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
.AddOperation(scale.ReadMassOp(ref Mass))
.AddOperation(new Operations.TimerOp(stabTime)) .AddOperation(new Operations.TimerOp(stabTime))
.EnterState(); .EnterState();
do do
@@ -538,6 +540,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
State.Create(string.Format("{0}({1}) : Deactivate ref. mass valve", test.Method, test.Name)) State.Create(string.Format("{0}({1}) : Deactivate ref. mass valve", test.Method, test.Name))
.AddOperation(checkUiOp) .AddOperation(checkUiOp)
.AddOperation(StateMachine.ControlBoard.SetValvesOp(null, compareValve)) .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, compareValve))
.AddOperation(scale.ReadMassOp(ref Mass))
.EnterState(); .EnterState();
do do
{ {
@@ -556,6 +559,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefHi2))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefLo1))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2)) .AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefLo2))
.AddOperation(scale.ReadMassOp(ref Mass))
.AddOperation(new Operations.TimerOp(stabTime)) .AddOperation(new Operations.TimerOp(stabTime))
.EnterState(); .EnterState();
do do
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.1071.0")] [assembly: AssemblyVersion("2.18.1072.0")]
[assembly: AssemblyFileVersion("2.18.1071.0")] [assembly: AssemblyFileVersion("2.18.1072.0")]