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

Diverter and start/stop valve switch time logging in ms, ver. 2.17.679

Browse Source
This commit is contained in:
Milan Hanajik
2017-09-28 17:11:41 +02:00
parent b54f938bd5
commit 9fa025caa4
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+4 -2
View File
@@ -509,7 +509,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
/// Read the diverter switch time
switchTimeStart = (float)cBrd.DivTime / 1000.0f;
switchTimeStart = 0.001f * (float)cBrd.DivTime;
log.WarnFormat("Diverter switch time on test start = {0} ms", cBrd.DivTime);
/// Measurement loop - begin
while (true)
@@ -571,7 +572,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
TestEndTime = DateTime.Now;
/// Read the diverter switch time
switchTimeEnd = (float)cBrd.DivTime / 1000.0f;
switchTimeEnd = 0.001f * (float)cBrd.DivTime;
log.WarnFormat("Diverter switch time on test end = {0} ms", cBrd.DivTime);
//------------------------------------------------
Bridge.OnActivity(this, Strings.Test_completed);
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+4 -2
View File
@@ -539,7 +539,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
while (!e.Contains(Event.ValvesSet));
switchTimeStart = cBrd.ValveOpenCloseTime / 1000.0f;
switchTimeStart = 0.001f * cBrd.ValveOpenCloseTime;
log.WarnFormat("Start valve switch time on test start = {0} ms", cBrd.ValveOpenCloseTime);
/// Measurement loop - preparation
readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
@@ -648,7 +649,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
while (e.Contains(Event.ValvesBusy));
switchTimeEnd = cBrd.ValveOpenCloseTime / 1000.0f;
switchTimeEnd = 0.001f * cBrd.ValveOpenCloseTime;
log.WarnFormat("Start valve switch time on test end = {0} ms", cBrd.ValveOpenCloseTime);
State.Create(string.Format("{0}({1}) : Waiting before 2nd mass measurement", test.Method, test.Name))
.AddOperation(checkUiOp)
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+4 -4
View File
@@ -597,8 +597,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
ClearAllStatistics(StateMachine.Time);
/// Read the diverter switch time
switchTimeStart = (float)cBrd.DivTime / 1000.0f;
log.WarnFormat("Diverter switch time on test start = {0} ms", switchTimeStart);
switchTimeStart = 0.001f * (float)cBrd.DivTime;
log.WarnFormat("Diverter switch time on test start = {0} ms", cBrd.DivTime);
/// Measurement loop - begin
State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name))
@@ -724,8 +724,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
else LogProcessDataHeaderHeatMeters(processDataLogger, "End mass");
/// Read the diverter switch time
switchTimeEnd = (float)cBrd.DivTime / 1000.0f;
log.WarnFormat("Diverter switch time on test end = {0} ms", switchTimeEnd);
switchTimeEnd = 0.001f * (float)cBrd.DivTime;
log.WarnFormat("Diverter switch time on test end = {0} ms", cBrd.DivTime);
State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name))
.AddOperation(checkUiOp)
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+4 -2
View File
@@ -223,7 +223,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
ClearAllStatistics(StateMachine.Time);
/// Read the diverter switch time
switchTimeStart = (float)cBrd.DivTime / 1000.0f;
switchTimeStart = 0.001f * (float)cBrd.DivTime;
log.WarnFormat("Diverter switch time on test start = {0} ms", cBrd.DivTime);
/// Measurement loop - begin
while (true)
@@ -271,7 +272,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
while (!e.Contains(Event.TimerExpired));
/// Read the diverter switch time
switchTimeEnd = (float)cBrd.DivTime / 1000.0f;
switchTimeEnd = 0.001f * (float)cBrd.DivTime;
log.WarnFormat("Diverter switch time on test end = {0} ms", cBrd.DivTime);
//------------------------------------------------
Bridge.OnActivity(this, Strings.Measuring_the_weight);