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

DiverterTest changes reverted back (Luxemburg: root cause of the isssue was in CB firmware), ver. 2.26.1554

Browse Source
This commit is contained in:
Milan Hanajik 2020-12-07 11:42:37 +01:00
parent c72fb29f36
commit b32329cdf7
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
View File

@ -518,32 +518,10 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test)); Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
if (e.Contains(Event.MeasurementCompleted)) break;
} }
while (!e.Contains(Event.MeasurementCompleted) && !e.Contains(Event.Next)); /// 'Next' button can be used in Debug version while (!e.Contains(Event.Next)); /// 'Next' button can be used in Debug version
State.Create(string.Format("{0}({1}) : Stopping the diverter", test.Method, test.Name))
.AddOperation(checkUiOp)
.AddOperations(readTempPressOps)
.AddOperations(measureOperations)
.AddOperation(readRegistersOp)
.AddOperation(scale.ReadMassOp(ref Mass))
.AddOperation(cBrd.StopPreviousOp())
.AddOperation(processDataLoggingOp)
.EnterState();
do {
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
RefFreq.Val = cBrd.ReferenceFreq;
RefFlow.Val = cBrd.ReferenceFlow;
UpdateAllStatistics(StateMachine.Time);
Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
}
while (!e.Contains(Event.PreviousStopped) && !e.Contains(Event.Next)); /// 'Next' button can be used in Debug version
LogProcessDataHeader(processDataLogger, string.Format("Delay {0}", divRepetNr)); LogProcessDataHeader(processDataLogger, string.Format("Delay {0}", divRepetNr));

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.26.1553.0")] [assembly: AssemblyVersion("2.26.1554.0")]
[assembly: AssemblyFileVersion("2.26.1553.0")] [assembly: AssemblyFileVersion("2.26.1554.0")]