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

Event.BalanceDone --> Event.ScaleDone, EmergencyStop is route bit #81, ver. 3.1.1608

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-24 09:32:42 +01:00
parent 9bfa70d5c1
commit ebf7c97bc6
29 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/MettlerToledo/Multi/ReadMassOp.cs
+2 -2
View File
@@ -56,7 +56,7 @@ namespace TBF.Rig.MettlerToledo.Multi
if (!done)
return Event.Busy;
else
return Event.BalanceDone;
return Event.ScaleDone;
}
else if (started && scale.MsrmntState != MsrmntState.Busy)
{
@@ -65,7 +65,7 @@ namespace TBF.Rig.MettlerToledo.Multi
scale.MsrmntState, scale.Mass);
done = true;
started = false;
return Event.BalanceDone; /// Mass read OK
return Event.ScaleDone; /// Mass read OK
}
else
{
TBF/Rig/MettlerToledo/Multi/ReadStableMassOp.cs
+2 -2
View File
@@ -88,7 +88,7 @@ namespace TBF.Rig.MettlerToledo.Multi
return Event.None;
}
if (currentReadingsCount >= totalReadingsCount) return Event.BalanceDone; /// Mass has already been calculated
if (currentReadingsCount >= totalReadingsCount) return Event.ScaleDone; /// Mass has already been calculated
if (scale.MsrmntState == MsrmntState.Busy) return Event.None;
@@ -109,7 +109,7 @@ namespace TBF.Rig.MettlerToledo.Multi
calcMass = (calcMass / (totalReadingsCount - 2));
log.InfoFormat("ReadStableMassOp.Run() ... valid mass={0} ... returning Event.BalanceDone", calcMass);
result.Val = calcMass;
return Event.BalanceDone; /// Mass has just been calculated
return Event.ScaleDone; /// Mass has just been calculated
#else
double minimum = double.MaxValue;
double maximum = double.MinValue;
TBF/Rig/MettlerToledo/Multi/TaringOp.cs
+3 -3
View File
@@ -48,7 +48,7 @@ namespace TBF.Rig.MettlerToledo.Multi
/// </returns>
public Event Run()
{
if (done) return Event.BalanceDone; /// Taring has been done already
if (done) return Event.ScaleDone; /// Taring has been done already
if (balanceDev.MsrmntState == MsrmntState.Busy) return Event.Busy;
@@ -56,14 +56,14 @@ namespace TBF.Rig.MettlerToledo.Multi
{
tara.Val = balanceDev.Capacity;
done = true;
return Event.BalanceOverload;
return Event.ScaleOverload;
}
if (balanceDev.MsrmntState == MsrmntState.Valid)
{
tara.Val = balanceDev.Mass;
done = true;
return Event.BalanceDone; /// Taring completed
return Event.ScaleDone; /// Taring completed
}
return Event.Busy;
TBF/Rig/MettlerToledo/Multi/ZeroOp.cs
+3 -3
View File
@@ -41,20 +41,20 @@ namespace TBF.Rig.MettlerToledo.Multi
/// </returns>
public Event Run()
{
if (done) return Event.BalanceDone; /// Zero has been done already
if (done) return Event.ScaleDone; /// Zero has been done already
if (balanceDev.MsrmntState == MsrmntState.Busy) return Event.Busy;
if (balanceDev.MsrmntState == MsrmntState.Overload)
{
done = true;
return Event.BalanceOverload;
return Event.ScaleOverload;
}
if (balanceDev.MsrmntState == MsrmntState.Valid)
{
done = true;
return Event.BalanceDone; /// Zero completed
return Event.ScaleDone; /// Zero completed
}
return Event.Busy;
TBF/Rig/MettlerToledo/ReadMassesOp.cs
+2 -2
View File
@@ -43,7 +43,7 @@ namespace TBF.Rig.MettlerToledo
/// </returns>
public Event Run()
{
if (done) return Event.BalanceDone; /// Mass has already been read
if (done) return Event.ScaleDone; /// Mass has already been read
for (int i = 0; i < Standard.BalanceDev.BalancesCount; i++)
{
@@ -60,7 +60,7 @@ namespace TBF.Rig.MettlerToledo
}
}
done = true;
return Event.BalanceDone;
return Event.ScaleDone;
}
/// <summary>Stop this operation</summary>
TBF/Rig/MettlerToledo/Standard/GetSerNumOp.cs
+1 -1
View File
@@ -63,7 +63,7 @@ namespace TBF.Rig.MettlerToledo.Standard
if (scale.MsrmntState == MsrmntState.Valid)
{
serialNumber = scale.SerialNumber;
return Event.BalanceDone; /// S/N read successful
return Event.ScaleDone; /// S/N read successful
}
if (scale.MsrmntState == MsrmntState.Failed)
TBF/Rig/MettlerToledo/Standard/ReadMassOp.cs
+1 -1
View File
@@ -42,7 +42,7 @@ namespace TBF.Rig.MettlerToledo.Standard
public Event Run()
{
result.Val = scale.Mass;
return Event.BalanceDone;
return Event.ScaleDone;
}
/// <summary>Stop this operation</summary>
TBF/Rig/MettlerToledo/Standard/ReadStableMassOp.cs
+5 -5
View File
@@ -130,7 +130,7 @@ namespace TBF.Rig.MettlerToledo.Standard
if (measurementCompleted)
{
return Event.BalanceDone;
return Event.ScaleDone;
}
if (scale.MsrmntState == MsrmntState.Busy)
@@ -176,7 +176,7 @@ namespace TBF.Rig.MettlerToledo.Standard
log.InfoFormat("ReadStableMassOp.Run() ... valid mass={0} ... returning Event.BalanceDone", result.Val);
measurementCompleted = true;
return Event.BalanceDone; /// Mass has just been calculated
return Event.ScaleDone; /// Mass has just been calculated
}
}
else if (method == Config.Entities.MassMethod.StdDev)
@@ -195,7 +195,7 @@ namespace TBF.Rig.MettlerToledo.Standard
log.InfoFormat("ReadStableMassOp.Run() ... valid mass={0} ... returning Event.BalanceDone", result.Val);
measurementCompleted = true;
return Event.BalanceDone; /// Mass has just been calculated
return Event.ScaleDone; /// Mass has just been calculated
}
}
else
@@ -210,14 +210,14 @@ namespace TBF.Rig.MettlerToledo.Standard
log.InfoFormat("ReadStableMassOp.Run() ... valid mass={0} ... returning Event.BalanceDone", result.Val);
measurementCompleted = true;
return Event.BalanceDone; /// Mass has just been calculated
return Event.ScaleDone; /// Mass has just been calculated
}
}
if (measurementCompleted)
{
return Event.BalanceDone;
return Event.ScaleDone;
}
else
{
TBF/Rig/MettlerToledo/Standard/SetUnitsOp.cs
+1 -1
View File
@@ -65,7 +65,7 @@ namespace TBF.Rig.MettlerToledo.Standard
return Event.None;
}
if (scale.MsrmntState == MsrmntState.Valid) return Event.BalanceDone; /// Units set
if (scale.MsrmntState == MsrmntState.Valid) return Event.ScaleDone; /// Units set
if (scale.MsrmntState == MsrmntState.Failed) return Event.Error; /// Failed
return Event.None; /// No result yet
}
TBF/Rig/MettlerToledo/Standard/TaringOp.cs
+3 -3
View File
@@ -67,7 +67,7 @@ namespace TBF.Rig.MettlerToledo.Standard
return Event.Busy;
}
if (done) return Event.BalanceDone; /// Taring has been done already
if (done) return Event.ScaleDone; /// Taring has been done already
if (scale.MsrmntState == MsrmntState.Busy) return Event.Busy;
@@ -75,14 +75,14 @@ namespace TBF.Rig.MettlerToledo.Standard
{
tara.Val = scale.Capacity;
done = true;
return Event.BalanceOverload;
return Event.ScaleOverload;
}
if (scale.MsrmntState == MsrmntState.Valid)
{
tara.Val = scale.Mass;
done = true;
return Event.BalanceDone; /// Taring completed
return Event.ScaleDone; /// Taring completed
}
scale.SendTaraCmd(); /// Failed -> repeat taring
TBF/Rig/MettlerToledo/Standard/ZeroOp.cs
+3 -3
View File
@@ -64,20 +64,20 @@ namespace TBF.Rig.MettlerToledo.Standard
return Event.Busy;
}
if (done) return Event.BalanceDone; /// Zeroing has been done already
if (done) return Event.ScaleDone; /// Zeroing has been done already
if (scale.MsrmntState == MsrmntState.Busy) return Event.Busy;
if (scale.MsrmntState == MsrmntState.Overload)
{
done = true;
return Event.BalanceOverload;
return Event.ScaleOverload;
}
if (scale.MsrmntState == MsrmntState.Valid)
{
done = true;
return Event.BalanceDone; /// Zeroing completed
return Event.ScaleDone; /// Zeroing completed
}
scale.SendZeroWhenStableCmd(); /// Failed -> repeat zeroing