Compare commits

..
Author SHA1 Message Date
marekf 550459285b Test commit 2026-03-09 10:48:23 +01:00
michal 498fc21412 DIVERTER close valve end time - Mark Chenges 2024-11-11 14:18:39 +01:00
2 changed files with 10 additions and 8 deletions
+9 -7
View File
@@ -29,12 +29,14 @@ namespace TBF.Rig.BuiltIn
/// Relative time in [s] from the start of the operation /// Relative time in [s] from the start of the operation
int timeShift; /// Set in SetValvesOp(cb, bool open, OutputPath outPath, DateTimeBox timeStamp) int timeShift; /// Set in SetValvesOp(cb, bool open, OutputPath outPath, DateTimeBox timeStamp)
/// <summary> int waitOnCBDelay = 2; // additional wait for the correct ControlBoard response in [s]
/// Processes coupled valves and creates switch points.
/// </summary> /// <summary>
/// <param name="valvesOpen">A list of opening master valves</param> /// Processes coupled valves and creates switch points.
/// <param name="valvesClose">A list of closing master valves</param> /// </summary>
/// <returns></returns> /// <param name="valvesOpen">A list of opening master valves</param>
/// <param name="valvesClose">A list of closing master valves</param>
/// <returns></returns>
IList<SwitchPoint> AddSwitchPoints(IList<SwitchPoint> swPoints, IList<IValve> valvesOpen, IList<IValve> valvesClose, int time) IList<SwitchPoint> AddSwitchPoints(IList<SwitchPoint> swPoints, IList<IValve> valvesOpen, IList<IValve> valvesClose, int time)
{ {
int ix0 = swPoints.Count; int ix0 = swPoints.Count;
@@ -277,7 +279,7 @@ namespace TBF.Rig.BuiltIn
{ {
if (nextIx >= switchPoints.Count) if (nextIx >= switchPoints.Count)
{ {
return (StateMachine.Time >= swStartTime + maxDelayTime) ? Event.ValvesSet : Event.ValvesBusy; return (StateMachine.Time >= swStartTime + maxDelayTime + waitOnCBDelay) ? Event.ValvesSet : Event.ValvesBusy;
} }
if (StateMachine.Time >= swStartTime + switchPoints[nextIx].TimeSec) if (StateMachine.Time >= swStartTime + switchPoints[nextIx].TimeSec)