diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index 2efc7f494..062c63610 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -176,6 +176,29 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
if (cameraRoi != null) measureOperations.Add(cameraRoi.MeasureOp());
}
+ State.Create("FlyingStartCollectionMethod : Waiting before 1st mass measurement")
+ .AddOperation(checkUiOp)
+ .AddOperation(benchPath.TempIn.ReadTempOp(ref tempIn))
+ .AddOperation(benchPath.TempOut.ReadTempOp(ref tempOut))
+ .AddOperation(outPath.TempDiv.ReadTempOp(ref tempDiv))
+ .AddOperation(benchPath.PressIn.ReadPressureOp(ref pressIn))
+ .AddOperation(benchPath.PressOut.ReadPressureOp(ref pressOut))
+ .AddOperation((StateMachine.Ambient != null)
+ ? StateMachine.Ambient.ReadAmbientOp(airTemperature, airPressure, airHumidity) : null)
+ .AddOperation(outPath.Balance.ReadMassOp(ref mass))
+ .AddOperation(cBrd.UpdateTankWeightOp())
+ .AddOperation(processDataLoggingOp)
+ .AddOperation(new Operations.TimerOp(test.TimeFlow2Start))
+ .EnterState();
+ do
+ {
+ e = StateMachine.WaitRunDevsRunOps();
+ if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
+ if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; }
+ }
+ while (!e.Contains(Event.TimerExpired));
+
+
LogProcessHeader(processDataLogger, "Start mass");
//------------------------------------------------
@@ -289,7 +312,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
/// Measurement loop - end
test_completed:
- State.Create("FlyingStartCollectionMethod : Waiting before mass measurement")
+ State.Create("FlyingStartCollectionMethod : Waiting before 2nd mass measurement")
.AddOperation(checkUiOp)
.AddOperation(benchPath.TempIn.ReadTempOp(ref tempIn))
.AddOperation(benchPath.TempOut.ReadTempOp(ref tempOut))
diff --git a/TestBenchFramework/Entities/Test.cs b/TestBenchFramework/Entities/Test.cs
index 839248046..65072cc6e 100644
--- a/TestBenchFramework/Entities/Test.cs
+++ b/TestBenchFramework/Entities/Test.cs
@@ -24,7 +24,8 @@ namespace TBF.Entities
public virtual bool Emptying { get; set; }
public virtual bool Zeroing { get; set; }
public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
- public virtual int Time2MassMsrmt { get; set; } /// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
+ public virtual int TimeFlow2Start { get; set; } /// Delay time from the flow stable to the 1st mass measurement (test start) in [s]
+ public virtual int Time2MassMsrmt { get; set; } /// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
public virtual string Method { get; set; }
public virtual float ErrLimLo { get; set; } /// in [%] (usually < 0)
public virtual float ErrLimHi { get; set; } /// in [%] (usually > 0)
@@ -54,6 +55,7 @@ namespace TBF.Entities
Emptying = false;
Zeroing = false;
PumpPower = 60.0f; /// [%]
+ TimeFlow2Start = 5; /// [s] between flow stable and the 1st mass measurement (test start) in [s]
Time2MassMsrmt = 5; /// [s] between the test end and the final mass measurement
ErrLimLo = -2.0f; /// [%] lower error limit
ErrLimHi = 2.0f; /// [%] upper error limit
@@ -82,7 +84,8 @@ namespace TBF.Entities
result.Emptying = Emptying;
result.Zeroing = Zeroing;
result.PumpPower = PumpPower;
- result.Time2MassMsrmt = Time2MassMsrmt;
+ result.TimeFlow2Start = TimeFlow2Start;
+ result.Time2MassMsrmt = Time2MassMsrmt;
result.Method = Method;
result.ErrLimLo = ErrLimLo;
result.ErrLimHi = ErrLimHi;
diff --git a/TestBenchFramework/Mappings/TestMap.cs b/TestBenchFramework/Mappings/TestMap.cs
index cc1caee9f..82df6b60f 100644
--- a/TestBenchFramework/Mappings/TestMap.cs
+++ b/TestBenchFramework/Mappings/TestMap.cs
@@ -22,6 +22,7 @@ namespace TBF.Mappings
Map(x => x.Emptying);
Map(x => x.Zeroing);
Map(x => x.PumpPower);
+ Map(x => x.TimeFlow2Start);
Map(x => x.Time2MassMsrmt);
Map(x => x.Method);
Map(x => x.ErrLimLo);
diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs
index 677b7f457..941958d62 100644
--- a/TestBenchFramework/ProcedureDlg.cs
+++ b/TestBenchFramework/ProcedureDlg.cs
@@ -361,7 +361,8 @@ namespace TBF
TestTime,
Repeats,
Emptying,
- Time2Mass,
+ Time_Flow2Start,
+ Time_Stop2Mass,
Method,
MtrlgyClmnCount
}
@@ -377,6 +378,7 @@ namespace TBF
metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Repeats_nr_chdr, Width = 80 });
metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Emptying_chdr, Width = 60 });
//metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Zeroing_chdr, Width = 50 });
+ metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TimeFlow2Start_chdr, Width = 70 });
metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Time2MassMsrmt_chdr, Width = 70 });
metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Method_chdr, Width = 150 });
@@ -397,7 +399,8 @@ namespace TBF
new TextBox(), /// Test time
new TextBox(), /// Repeats #
yesNo1CBox, /// Emptying
- new TextBox(), /// Time2MassMsrmt
+ new TextBox(), /// Time_Flow2Start
+ new TextBox(), /// Time_Stop2Mass
methodCBox, /// Method
};
@@ -614,7 +617,8 @@ namespace TBF
lviMetrlg1.SubItems.Add(test.Repeats.ToString());
lviMetrlg1.SubItems.Add(test.Emptying ? Strings.yes : Strings.no);
//lviMetrlg1.SubItems.Add(test.Zeroing ? Strings.yes : Strings.no);
- lviMetrlg1.SubItems.Add(test.Time2MassMsrmt.ToString());
+ lviMetrlg1.SubItems.Add(test.TimeFlow2Start.ToString());
+ lviMetrlg1.SubItems.Add(test.Time2MassMsrmt.ToString());
lviMetrlg1.SubItems.Add((test.Method != null) ? test.Method.ToString() : string.Empty);
metrology1ListViewEx.Items.Add(lviMetrlg1);
@@ -676,7 +680,8 @@ namespace TBF
int itmp;
if (int.TryParse(lvi.SubItems[(int)MtrlgyClmn.Repeats].Text, out itmp)) entity.Repeats = itmp;
- if (int.TryParse(lvi.SubItems[(int)MtrlgyClmn.Time2Mass].Text, out itmp)) entity.Time2MassMsrmt = itmp;
+ if (int.TryParse(lvi.SubItems[(int)MtrlgyClmn.Time_Flow2Start].Text, out itmp)) entity.TimeFlow2Start = itmp;
+ if (int.TryParse(lvi.SubItems[(int)MtrlgyClmn.Time_Stop2Mass].Text, out itmp)) entity.Time2MassMsrmt = itmp;
if (lvi.SubItems[(int)MtrlgyClmn.Emptying].Text.Equals(Strings.yes)) entity.Emptying = true;
else if (lvi.SubItems[(int)MtrlgyClmn.Emptying].Text.Equals(Strings.no)) entity.Emptying = false;
diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs
index 0b9360ea8..e48eefa41 100644
--- a/TestBenchFramework/Resources/Strings.Designer.cs
+++ b/TestBenchFramework/Resources/Strings.Designer.cs
@@ -2494,7 +2494,7 @@ namespace TBF.Resources {
}
///
- /// Looks up a localized string similar to Stab.time [s].
+ /// Looks up a localized string similar to T stop - mass msrmt. [s].
///
internal static string Time2MassMsrmt_chdr {
get {
@@ -2502,6 +2502,15 @@ namespace TBF.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to T flow stab. - start [s].
+ ///
+ internal static string TimeFlow2Start_chdr {
+ get {
+ return ResourceManager.GetString("TimeFlow2Start_chdr", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Timeout.
///
diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx
index 8d34baddd..77d75f950 100644
--- a/TestBenchFramework/Resources/Strings.resx
+++ b/TestBenchFramework/Resources/Strings.resx
@@ -860,7 +860,7 @@
s
- Stab.time [s]
+ T stop - mass msrmt. [s]
Less
@@ -1024,4 +1024,7 @@
Page
+
+ T flow stab. - start [s]
+
\ No newline at end of file