diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
index ad73d26df..af79433c5 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
@@ -252,6 +252,28 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
/// Measurement loop - end
test_completed:
+ State.Create("FlyingStartCollectionMethod : Waiting before 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(readRegisters1)
+ .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.Time2MassMsrmt))
+ .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));
//------------------------------------------------
Bridge.OnActivity(this, Strings.Measuring_the_weight);
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index 8806d3a0f..55d90a228 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -258,7 +258,29 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
/// Measurement loop - end
test_completed:
-
+ State.Create("FlyingStartCollectionMethod : Waiting before 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(readRegisters1)
+ .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.Time2MassMsrmt))
+ .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, "End mass");
//------------------------------------------------
diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
index 7ef1a3f67..270789a27 100644
--- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
@@ -244,6 +244,28 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
/// Measurement loop - end
test_completed:
+ State.Create("FlyingStartCollectionMethod : Waiting before 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(readRegisters1)
+ .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.Time2MassMsrmt))
+ .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));
//------------------------------------------------
Bridge.OnActivity(this, Strings.Measuring_the_weight);
diff --git a/TestBenchFramework/Entities/Test.cs b/TestBenchFramework/Entities/Test.cs
index fdffe7c47..17442498c 100644
--- a/TestBenchFramework/Entities/Test.cs
+++ b/TestBenchFramework/Entities/Test.cs
@@ -18,7 +18,8 @@ namespace TBF.Entities
public virtual int Repeats { get; set; }
public virtual bool Emptying { get; set; }
public virtual bool Zeroing { get; set; }
- public virtual string Method { get; set; }
+ 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)
public virtual double TolerRed { get; set; } /// in [%] (always > 0)
@@ -61,6 +62,7 @@ namespace TBF.Entities
result.Repeats = Repeats;
result.Emptying = Emptying;
result.Zeroing = Zeroing;
+ result.Time2MassMsrmt = Time2MassMsrmt;
result.Method = Method;
result.ErrLimLo = ErrLimLo;
result.ErrLimHi = ErrLimHi;
diff --git a/TestBenchFramework/Entities/TestResult.cs b/TestBenchFramework/Entities/TestResult.cs
index 5abb6e41b..38e3fb862 100644
--- a/TestBenchFramework/Entities/TestResult.cs
+++ b/TestBenchFramework/Entities/TestResult.cs
@@ -25,6 +25,7 @@ namespace TBF.Entities
public virtual int Repeats { get; set; }
public virtual bool Emptying { get; set; }
public virtual bool Zeroing { get; set; }
+ public virtual int Time2MassMsrmt { get; set; }
public virtual string Method { get; set; }
public virtual float ErrLimLo { get; set; } /// in [%] (usually < 0)
public virtual float ErrLimHi { get; set; } /// in [%] (usually > 0)
@@ -136,6 +137,7 @@ namespace TBF.Entities
Repeats = test.Repeats;
Emptying = test.Emptying;
Zeroing = test.Zeroing;
+ Time2MassMsrmt = test.Time2MassMsrmt;
Method = test.Method;
ErrLimLo = test.ErrLimLo;
ErrLimHi = test.ErrLimHi;
diff --git a/TestBenchFramework/Mappings/TestMap.cs b/TestBenchFramework/Mappings/TestMap.cs
index 199eac46b..2cea9eb45 100644
--- a/TestBenchFramework/Mappings/TestMap.cs
+++ b/TestBenchFramework/Mappings/TestMap.cs
@@ -17,6 +17,7 @@ namespace TBF.Mappings
Map(x => x.Repeats);
Map(x => x.Emptying);
Map(x => x.Zeroing);
+ Map(x => x.Time2MassMsrmt);
Map(x => x.Method);
Map(x => x.ErrLimLo);
Map(x => x.ErrLimHi);
diff --git a/TestBenchFramework/Mappings/TestResultMap.cs b/TestBenchFramework/Mappings/TestResultMap.cs
index 3c7852374..cff1c2599 100644
--- a/TestBenchFramework/Mappings/TestResultMap.cs
+++ b/TestBenchFramework/Mappings/TestResultMap.cs
@@ -25,7 +25,8 @@ namespace TBF.Mappings
Map(x => x.Repeats);
Map(x => x.Emptying);
Map(x => x.Zeroing);
- Map(x => x.Method);
+ Map(x => x.Time2MassMsrmt);
+ Map(x => x.Method);
Map(x => x.ErrLimLo);
Map(x => x.ErrLimHi);
diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs
index b49c6d644..35abd8626 100644
--- a/TestBenchFramework/ProcedureDlg.cs
+++ b/TestBenchFramework/ProcedureDlg.cs
@@ -338,8 +338,9 @@ namespace TBF
metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Test_time_s_chdr, Width = 70 });
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.Method_chdr, Width = 150 });
+ //metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Zeroing_chdr, Width = 50 });
+ metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Time2MassMsrmt_chdr, Width = 70 });
+ metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Method_chdr, Width = 150 });
//metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_set_method_chdr, Width = 100 });
//metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Method1_chdr, Width = 100 });
//metrology1ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Method2_chdr, Width = 110 });
@@ -364,11 +365,11 @@ namespace TBF
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TransitionStart_chdr, Width = 100 });
processListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TransitionEnd_chdr, Width = 100 });
- ComboBox yesNo1CBox = new ComboBox();
+ ComboBox yesNo1CBox = new ComboBox(); /// control for Emptying
yesNo1CBox.Items.Add(Strings.yes);
yesNo1CBox.Items.Add(Strings.no);
- ComboBox yesNo2CBox = new ComboBox();
+ ComboBox yesNo2CBox = new ComboBox(); /// control for Zeroing
yesNo2CBox.Items.Add(Strings.yes);
yesNo2CBox.Items.Add(Strings.no);
@@ -391,7 +392,7 @@ namespace TBF
new TextBox(), /// 4 Test time
new TextBox(), /// 5 Repeats #
yesNo1CBox, /// 6 Emptying
- yesNo2CBox, /// 7 Zeroing
+ new TextBox(), /// 7 Time2MassMsrmt
methodCBox,
};
@@ -468,8 +469,9 @@ namespace TBF
lviMetrlg1.SubItems.Add(test.TstTime.ToString()); /// SubItem 4
lviMetrlg1.SubItems.Add(test.Repeats.ToString()); /// SubItem 5
lviMetrlg1.SubItems.Add(test.Emptying ? Strings.yes : Strings.no); /// SubItem 6
- lviMetrlg1.SubItems.Add(test.Zeroing ? Strings.yes : Strings.no); /// SubItem 7
- lviMetrlg1.SubItems.Add((test.Method != null) ? test.Method.ToString() : string.Empty); /// SubItem 8
+ //lviMetrlg1.SubItems.Add(test.Zeroing ? Strings.yes : Strings.no); /// SubItem 7
+ lviMetrlg1.SubItems.Add(test.Time2MassMsrmt.ToString()); /// SubItem 7
+ lviMetrlg1.SubItems.Add((test.Method != null) ? test.Method.ToString() : string.Empty); /// SubItem 8
lviMetrlg2.SubItems.Add(test.ErrLimLo.ToString()); /// SubItem 3
lviMetrlg2.SubItems.Add(test.ErrLimHi.ToString()); /// SubItem 4
@@ -519,8 +521,12 @@ namespace TBF
if (lvi.SubItems[6].Text.Equals(Strings.yes)) entity.Emptying = true;
else if (lvi.SubItems[6].Text.Equals(Strings.no)) entity.Emptying = false;
- if (lvi.SubItems[7].Text.Equals(Strings.yes)) entity.Zeroing = true;
- else if (lvi.SubItems[7].Text.Equals(Strings.no)) entity.Zeroing = false;
+ //if (lvi.SubItems[7].Text.Equals(Strings.yes)) entity.Zeroing = true;
+ //else if (lvi.SubItems[7].Text.Equals(Strings.no)) entity.Zeroing = false;
+
+ int time2MassMsrmt;
+ allOk &= int.TryParse(lvi.SubItems[7].Text, out time2MassMsrmt);
+ entity.Time2MassMsrmt = time2MassMsrmt;
if (methodCBox.Items.Contains(lvi.SubItems[8].Text))
{
diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs
index ad202db68..70363f534 100644
--- a/TestBenchFramework/Resources/Strings.Designer.cs
+++ b/TestBenchFramework/Resources/Strings.Designer.cs
@@ -2016,6 +2016,15 @@ namespace TBF.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Stab.time [s].
+ ///
+ internal static string Time2MassMsrmt_chdr {
+ get {
+ return ResourceManager.GetString("Time2MassMsrmt_chdr", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Toler. red. [%].
///
diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx
index d9924fc82..82693ddc2 100644
--- a/TestBenchFramework/Resources/Strings.de.resx
+++ b/TestBenchFramework/Resources/Strings.de.resx
@@ -771,4 +771,7 @@
s
+
+ Stab.Zeit [s]
+
\ No newline at end of file
diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx
index 687f2c34c..3956d4f51 100644
--- a/TestBenchFramework/Resources/Strings.resx
+++ b/TestBenchFramework/Resources/Strings.resx
@@ -859,4 +859,7 @@
s
+
+ Stab.time [s]
+
\ No newline at end of file