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

After a cycle or a test stop serial numbers are not queried for the 2nd time. Version = 1.3.24

Browse Source
This commit is contained in:
Milan Hanajik 2015-04-29 13:51:24 +02:00
parent b7bc5659e6
commit 6a11980d69
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
View File

@ -239,7 +239,7 @@ namespace TBF.BenchControl.Sequences
cycle_or_test_selected:
if (WaitBeginFormClosed()) goto stop; /// Make sure the entry form is closed
if (WaitBeginFormClosed()) goto stop_within_cycle; /// Make sure the entry form is closed
Bridge.Bench2UI(ButtonsEtc.StopBtnEn); /// Hide buttons
@ -290,7 +290,7 @@ namespace TBF.BenchControl.Sequences
if (e.Contains(Event.ConfigurationError)) goto select_cycle_or_test;
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.OpArgumentError)) goto config_error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stop_within_cycle;
}
else
{
@ -332,7 +332,7 @@ namespace TBF.BenchControl.Sequences
if (e.Contains(Event.Error)) goto error;
if (e.Contains(Event.OpArgumentError)) goto config_error;
if (e.Contains(Event.UiCmdStop)) goto stop;
if (e.Contains(Event.UiCmdStop)) goto stop_within_cycle;
}
else
{
@ -449,6 +449,22 @@ namespace TBF.BenchControl.Sequences
goto select_procedure;
stop_within_cycle:
//--------------------------------
State.Create("MainSeq : Turning IDLE -> Closing the valves")
.AddOperation(checkUiOp)
.AddOperation(StateMachine.ControlBoard.SetValvesOp(StateMachine.DefaultValvesOpen,
StateMachine.DefaultValvesClose))
.EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
if (e.Contains(Event.Error)) goto error;
}
while (!e.Contains(Event.ValvesSet));
goto select_cycle_or_test;
stop:
//--------------------------------
State.Create("MainSeq : Turning IDLE -> Closing the valves")

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

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