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

UiCmdStop in CombinedWithDetectionSeq when flow is not reached (timeout), German error message, ver. 2.18.954

Browse Source
This commit is contained in:
Milan Hanajik 2018-06-27 10:31:22 +02:00
parent 79fea707f3
commit 9543de4170
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
View File

@ -31,9 +31,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
if (test.Part < 1 || test.Part > Config.Data.CompoundWMsCount)
{
UiBridge.Bridge.OnError(this, string.Format("Test 'Part' should be 1 .. {0}", Config.Data.CompoundWMsCount));
IList<Event> retval = new List<Event>(1);
retval.Add(Event.ConfigurationError);
return retval;
IList<Event> retv = new List<Event>(1);
retv.Add(Event.ConfigurationError);
return retv;
}
if (debugLevel == Config.Entities.DebugMode.Simulate)
@ -78,12 +78,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
.EnterState();
e = StateMachine.WaitRunDevsRunOps();
Event retVal = Event.Done;
if (TestAndLogUiCmdStop(test, e)) retVal = Event.UiCmdStop;
/// Create a list with one item 'retVal' (default is Event.Done) and return it
IList<Event> retListSim = new List<Event>(1);
retListSim.Add(retVal);
retListSim.Add(TestAndLogUiCmdStop(test, e) ? Event.UiCmdStop : Event.Done);
return retListSim;
}
@ -234,7 +231,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
goto error;
goto stopTest;
}
}
while (!e.Contains(Event.FlowReached));
@ -421,7 +418,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
if (e.Contains(Event.RegulValveTimeOut))
{
Bridge.OnError(this, Strings.Flow_adjustment_failed);
goto error;
goto stopTest;
}
}
while (!e.Contains(Event.FlowReached));

4
TBF/Properties/AssemblyInfo.cs
View File

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

3
TBF/Resources/Strings.de.resx
View File

@ -1443,4 +1443,7 @@
<data name="Pressure" xml:space="preserve">
<value>Druck</value>
</data>
<data name="Flow_adjustment_failed" xml:space="preserve">
<value>Durchfluss nicht erreicht</value>
</data>
</root>