Bug fix: SetFlowOp for coaxial regulation valve.

This commit is contained in:
Milan Hanajik 2016-05-31 11:32:02 +02:00
parent 19dff40664
commit b34b031fcf

View File

@ -347,8 +347,8 @@ namespace TBF.BenchControl.Elde.RegulValve
} }
else if (opState == OpState.ValveMoveToFlow4) /// Verify the flow setting else if (opState == OpState.ValveMoveToFlow4) /// Verify the flow setting
{ {
if (((ulong)controlBoard.StatusP & (ulong)StatusP.RefPulsesMsrmnt) == 0 || if (regulValveNr != CoaxValveNr && (((ulong)controlBoard.StatusP & (ulong)StatusP.RefPulsesMsrmnt) == 0 ||
(controlBoard.RegulValveState(regulValveNr) & RegulValveState.PwOrFreqRegul) != RegulValveState.PwOrFreqRegul) (controlBoard.RegulValveState(regulValveNr) & RegulValveState.PwOrFreqRegul) != RegulValveState.PwOrFreqRegul))
{ {
opState = OpState.SendCommandAgain; opState = OpState.SendCommandAgain;
return Event.None; return Event.None;