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

Uni : MassPulsesCount is equal to TotalPulsesCount for all methods except Prolonged method, ver. 3.1.1631

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-15 11:40:33 +01:00
parent bdefc0b8fa
commit f74fff9b51
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/ControlBoard/Uni/Action.cs
+2 -2
View File
@@ -187,7 +187,7 @@ namespace TBF.Rig.ControlBoard.Uni
///----------------------------------------------------------------------------------------------
public static Action StartTest(bool isFromUI, int flowMId, int divId, int divThreshold, bool isSyncMethod,
bool isDivUsed, bool isStartStop, int totalPulsesCount, int massPulsesCount = -1)
bool isDivUsed, bool isStartStop, int totalPulsesCount, int massPulsesCount = 0)
{
return new Action
{
@@ -201,7 +201,7 @@ namespace TBF.Rig.ControlBoard.Uni
IsDivUsed = isDivUsed,
IsStartStop = isStartStop,
TotalPulsesCount = totalPulsesCount,
MassPulsesCount = (massPulsesCount == -1) ? totalPulsesCount : massPulsesCount,
MassPulsesCount = (massPulsesCount <= 0) ? totalPulsesCount : massPulsesCount,
StartStop = Command.Start,
};
}
TBF/Rig/ControlBoard/Uni/OutputMessage.cs
-8
View File
@@ -154,14 +154,6 @@ namespace TBF.Rig.ControlBoard.Uni
All = 0x9B,
}
public enum TestMethods
{
Diverter = 0x01, /// bit 0: 1=Mass method (diverters are used), 0=Volume method
FixedStart = 0x02, /// bit 1: 1=fixed start method, 0=flying start method
Synchro = 0x04, /// bit 2: 1=Synchro method, 0=Pulse counting
MassAndContinue = 0x10, /// bit 4: 1=Method with mass measurement followed by a volume method
}
public enum ValveChgFlag : byte
{
DoNotChange = 0,
TBF/Rig/ControlBoard/Uni/UniCB.cs
+1 -1
View File
@@ -607,7 +607,7 @@ namespace TBF.Rig.ControlBoard.Uni
if (IsUIBlocked && isFromUI) return;
actionQueue.Enqueue(Action.StartTest(isFromUI, flowMId, divId, divThreshold, isSyncMethod, isDivUsed, isStartStop, totalPulsesCount, massPulsesCount));
log.InfoFormat("Enqueue( StartTest(fm={0}, div={1}, Sync={2}, s/s={3}, withDiv={4}, totalPulsesCount={5}) )", flowMId, divId, isSyncMethod, isDivUsed, isStartStop, totalPulsesCount);
log.InfoFormat("Enqueue( StartTest(fm={0}, div={1}, Sync={2}, withDiv={3}, s/s={4}, totalPulsesCount={5}) )", flowMId, divId, isSyncMethod, isDivUsed, isStartStop, totalPulsesCount);
foreach (var a in actionQueue) log.DebugFormat(" {0}", a);
}