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

FixedStartMassColl(Advanced) bug fix, ver. 3.1.1472

Browse Source
This commit is contained in:
Milan Hanajik
2020-05-26 14:07:27 +02:00
parent e5edb90bfd
commit 19b23ea212
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/ControlBoard/Papouch/CBoard.cs
+16 -5
View File
@@ -241,7 +241,10 @@ namespace TBF.BenchControl.ControlBoard.Papouch
benchModelRoute = (((benchModelRoute ^ valvesToInvert) | valvesToOpen) & (~valvesToClose)) ^ valvesToInvert;
foreach (var extV in extendedValves) extV.UpdateRoute(ref benchModelRoute);
log.DebugFormat("SetValves(x,x), new route = {0}", Utils.RouteToStr(benchModelRoute));
return oldRoute ^ benchModelRoute;
UInt128 retVal = oldRoute ^ benchModelRoute;
log.DebugFormat("{0}.SetValves({1}, {2}) returns {3}", Name, valvesToOpen.ToString("X"), valvesToClose.ToString("X"), retVal.ToString("X"));
return retVal;
}
/// <summary>
@@ -253,7 +256,9 @@ namespace TBF.BenchControl.ControlBoard.Papouch
/// <returns>Created operation</returns>
public IOperation SetValvesOp(IValve valveOpen, IValve valveClose)
{
return new BuiltIn.SetValvesOp(this, valveOpen, valveClose);
IOperation op = new BuiltIn.SetValvesOp(this, valveOpen, valveClose);
log.DebugFormat("{0}.SetValvesOp(vO, vC) returns {1}", Name, (op != null) ? op.ToString() : "null");
return op;
}
/// <summary>
@@ -265,7 +270,9 @@ namespace TBF.BenchControl.ControlBoard.Papouch
/// <returns>Created operation</returns>
public IOperation SetValvesOp(IList<IValve> valvesOpen, IList<IValve> valvesClose)
{
return new BuiltIn.SetValvesOp(this, valvesOpen, valvesClose);
IOperation op = new BuiltIn.SetValvesOp(this, valvesOpen, valvesClose);
log.DebugFormat("{0}.SetValvesOp(vlvsO, vlvsC) returns {1}", Name, (op != null) ? op.ToString() : "null");
return op;
}
/// <summary>
@@ -275,7 +282,9 @@ namespace TBF.BenchControl.ControlBoard.Papouch
/// <returns>Created operation</returns>
public IOperation OpenStartValveOp()
{
return new BuiltIn.SetValvesOp(this, true, devices);
IOperation op = new BuiltIn.SetValvesOp(this, true, devices);
log.DebugFormat("{0}.OpenStartValveOp({1}) returns {2}", Name, devices.StartValve1.Name, (op != null) ? op.ToString() : "null");
return op;
}
/// <summary>
@@ -285,7 +294,9 @@ namespace TBF.BenchControl.ControlBoard.Papouch
/// <returns>Created operation</returns>
public IOperation CloseStartValveOp()
{
return new BuiltIn.SetValvesOp(this, false, devices);
IOperation op = new BuiltIn.SetValvesOp(this, false, devices);
log.DebugFormat("{0}.CloseStartValveOp({1}) returns {2}", Name, devices.StartValve1.Name, (op != null) ? op.ToString() : "null");
return op;
}
public float ValveOpenCloseTime { get { return 0.1f; } }
TBF/BenchControl/TestMethods/FixedStartMassCollAdvanced/FixedStartMassCollAdvancedSeq.cs
+1 -1
View File
@@ -502,7 +502,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollAdvanced
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
}
while (!e.Contains(Event.ValvesSet) && !e.Contains(Event.MeasurementStarted));
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.MeasurementStarted));
switchTimeStart = 0.001f * cBrd.ValveOpenCloseTime;
log.WarnFormat("Start valve switch time on test start = {0} ms", cBrd.ValveOpenCloseTime);
TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+1 -1
View File
@@ -669,7 +669,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
}
while (!e.Contains(Event.ValvesSet) && !e.Contains(Event.MeasurementStarted));
while (!e.Contains(Event.ValvesSet) || !e.Contains(Event.MeasurementStarted));
switchTimeStart = 0.001f * cBrd.ValveOpenCloseTime;
log.WarnFormat("Start valve switch time on test start = {0} ms", cBrd.ValveOpenCloseTime);