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

Setting the flow - an attempt to solve bug, version 1.5.116.

Browse Source
This commit is contained in:
Milan Hanajik 2015-09-18 07:46:57 +02:00
parent c45f8298ac
commit 8c796eaeee
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs
View File

@ -36,9 +36,12 @@ namespace TBF.BenchControl.Elde.RegulValve
{
Idle = 0,
ValveMoveToPosition,
Wait1, /// This is actual move to position
SettingPosition,
ValveMoveToFlow,
ValveMoveToFlow2,
Wait2, /// This is actual move to flow
Wait3,
ValveMoveToFlow2, /// This is move to flow 2
SettingFlow,
FlowReached,
}
@ -203,6 +206,11 @@ namespace TBF.BenchControl.Elde.RegulValve
regulValveNr, rvPosition.ToString("F1"), flowMtrFreq, flow, opState);
if (opState == OpState.ValveMoveToPosition)
{
opState = OpState.Wait1;
return Event.None;
}
else if (opState == OpState.Wait1) /// Move to position
{
///
/// Done once, issues an appropriate ValveMove(...) command
@ -226,6 +234,11 @@ namespace TBF.BenchControl.Elde.RegulValve
return Event.None;
}
else if (opState == OpState.ValveMoveToFlow)
{
opState = OpState.Wait2;
return Event.None;
}
else if (opState == OpState.Wait2) /// Move to flow
{
///
/// Done once, issues an appropriate ValveMove(...) command
@ -244,9 +257,14 @@ namespace TBF.BenchControl.Elde.RegulValve
new float[2] { freqLo, freqHi },
regulValve.StableTime);
opState = OpState.ValveMoveToFlow2;
opState = OpState.Wait3;
return Event.None;
}
else if (opState == OpState.Wait3)
{
opState = OpState.ValveMoveToFlow2;
return Event.None;
}
else if (opState == OpState.ValveMoveToFlow2)
{
///

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

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