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

TBF : (1) flow setting timeout = 300 s = 5 min., (2) stable mass msrmnt. timeout = 300 s = 5 min., ver. 2.18.1162

Browse Source
This commit is contained in:
Milan Hanajik
2019-03-11 08:36:02 +01:00
parent 684fed8fc0
commit d45c3f96d6
25 changed files with 188 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs
+6 -4
View File
@@ -58,6 +58,7 @@ namespace TBF.BenchControl.Elde.RegulValve
float targetPositionLo;
float targetPositionHi;
int startTime;
int expireTime;
DoubleBox flowBox;
int flowWithinBoundsTime;
@@ -165,6 +166,10 @@ namespace TBF.BenchControl.Elde.RegulValve
/// <summary>Start this operation</summary>
public void Start()
{
startTime = StateMachine.Time;
expireTime = StateMachine.Time + timeout;
if (expireTime < 0) expireTime = int.MaxValue;
double flowMtrFreq = flowMeter.ReadFrequency();
double flow = flowMeter.ReadFlow();
@@ -194,9 +199,6 @@ namespace TBF.BenchControl.Elde.RegulValve
opState = OpState.ValveMoveToFlow1;
}
expireTime = StateMachine.Time + timeout;
if (expireTime < 0) expireTime = int.MaxValue;
TestMethods tm = 0;
StopDevs sd = 0;
// '_regulValve.RegulValveCfg.PidCoef' replaced by a casted operation parameter 'pidCoef'
@@ -221,7 +223,7 @@ namespace TBF.BenchControl.Elde.RegulValve
}
log.InfoFormat("SetFlowOp:Run(T={0}) rv#={1} pos={2}% freq={3} flow={4} opState={5}",
StateMachine.Time - expireTime + timeout, regulValveNr, rvPosition.ToString("F1"), flowMtrFreq, flow, opState);
StateMachine.Time - startTime, regulValveNr, rvPosition.ToString("F1"), flowMtrFreq, flow, opState);
if (StateMachine.Time > expireTime)
{