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

SequencBase : ReadRegistersTempPressAmbient( ) fixed - works OK without an IScale - start/stop method works with a tank, ver.2.18.1045

Browse Source
This commit is contained in:
Milan Hanajik
2018-10-25 17:02:12 +02:00
parent 845c66b511
commit 025fa81941
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Sequences/MainSeq.cs
+9 -9
View File
@@ -211,22 +211,22 @@ namespace TBF.BenchControl.Sequences
if (StateMachine.DrainValve3 != null) allDrainValves.Add(StateMachine.DrainValve3);
// Determine the tank emptying time (the maximum for all balances)
int scaleDrainTime = 0;
if (StateMachine.Tank1 != null && StateMachine.Tank1.EmptyTimeSec > scaleDrainTime)
int maxTankDrainTime = 0;
if (StateMachine.Tank1 != null && StateMachine.Tank1.EmptyTimeSec > maxTankDrainTime)
{
scaleDrainTime = StateMachine.Tank1.EmptyTimeSec;
maxTankDrainTime = StateMachine.Tank1.EmptyTimeSec;
}
if (StateMachine.Tank2 != null && StateMachine.Tank2.EmptyTimeSec > scaleDrainTime)
if (StateMachine.Tank2 != null && StateMachine.Tank2.EmptyTimeSec > maxTankDrainTime)
{
scaleDrainTime = StateMachine.Tank2.EmptyTimeSec;
maxTankDrainTime = StateMachine.Tank2.EmptyTimeSec;
}
if (StateMachine.Tank3 != null && StateMachine.Tank3.EmptyTimeSec > scaleDrainTime)
if (StateMachine.Tank3 != null && StateMachine.Tank3.EmptyTimeSec > maxTankDrainTime)
{
scaleDrainTime = StateMachine.Tank3.EmptyTimeSec;
maxTankDrainTime = StateMachine.Tank3.EmptyTimeSec;
}
if (scaleDrainTime > 0)
if (maxTankDrainTime > 0)
{
startNew.AddOperation(new TimerOp(scaleDrainTime, remainingTime))
startNew.AddOperation(new TimerOp(maxTankDrainTime, remainingTime))
.AddOperation(StateMachine.ControlBoard.SetValvesOp(allDrainValves, null));
}
TBF/BenchControl/Sequences/SequenceBase.cs
+1 -1
View File
@@ -788,7 +788,7 @@ namespace TBF.BenchControl.Sequences
if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
if (e.Contains(Event.MeasurementCompleted) || e.Contains(Event.Next)) return Event.MeasurementCompleted;
}
while ( (realTest && !e.Contains(Event.BalanceDone)) ||
while ( (realTest && (outPath.Scale is IScale) && !e.Contains(Event.BalanceDone)) ||
!e.Contains(Event.ReadAllRegistersDone));
return Event.Done;
TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+1 -1
View File
@@ -405,7 +405,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
.AddOperation(benchPath.PressMtrDown == null ? null : benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
.AddOperation(benchPath.PressMtrDelta == null ? null : benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
.AddOperation(cBrd.StartMeasurementOp(outPath, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro,
test.Qfrom, test.Qto, 2 * totalPulses, new int[] { (int)test.TolerRed, }))
test.Qfrom, test.Qto, (totalPulses * 5 / 4), new int[] { (int)test.TolerRed, }))
.EnterState();
do
{
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.1044.0")]
[assembly: AssemblyFileVersion("2.18.1044.0")]
[assembly: AssemblyVersion("2.18.1045.0")]
[assembly: AssemblyFileVersion("2.18.1045.0")]