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

MettlerToledo.Stabdard.Balance clean-up, shared static properties eliminated.

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-02 15:12:29 +02:00
parent e4da4929e4
commit 0cc21f40af
5 changed files with 50 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/MettlerToledo/Standard/BalanceOld.cs
+2 -14
View File
@@ -20,19 +20,15 @@ namespace TBF.Rig.MettlerToledo.Standard
/// </note>
public class BalanceOld : BalanceDev, IDevice, GenericDevices.IScale
{
/// <summary>
/// Info: StartMassMeasurement() and "Balnce response = .., Mass = ..."
/// Warn: Start measurement when busy is true
/// </summary>
private static readonly ILog log = LogManager.GetLogger(typeof(BalanceOld));
public override string ToString() { return string.Format("MettlerToledo.Standard.BalanceOld({0})", Cfg.ToString(-1)); }
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
public BalanceOld() { }
public BalanceOld(Generic.IComponentCfg cfg)
: base(cfg)
{
log.Warn(this.ToString());
}
@@ -52,7 +48,6 @@ namespace TBF.Rig.MettlerToledo.Standard
if (balanceCfg.DebugLevel == DebugMode.Simulate)
{
mass = 123.456;
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
msrmntTimeStamp = StateMachine.Time;
return;
@@ -105,7 +100,6 @@ namespace TBF.Rig.MettlerToledo.Standard
if (field.Length == 2 && field[1] == "A")
{
mass = 0;
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
log.InfoFormat("{0} - Balance response = {1}", Name,
received.Replace("\r", "<cr>").Replace("\n", "<lf>"));
@@ -124,7 +118,6 @@ namespace TBF.Rig.MettlerToledo.Standard
CultureInfo.InvariantCulture, out mass))
{
mass = Config.Units.ConvertFrom(ParseUnit(field[3]), mass);
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
log.InfoFormat("{0} - Balance response = {1}, Mass = {2}", Name,
received.Replace("\r", "<cr>").Replace("\n", "<lf>"), mass);
@@ -134,7 +127,6 @@ namespace TBF.Rig.MettlerToledo.Standard
CultureInfo.InvariantCulture, out mass))
{
mass = Config.Units.ConvertFrom(ParseUnit(field[3]), mass);
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
log.InfoFormat("{0} - Balance response = {1}, Mass = {2}", Name,
received.Replace("\r", "<cr>").Replace("\n", "<lf>"), mass);
@@ -142,7 +134,6 @@ namespace TBF.Rig.MettlerToledo.Standard
else if (field.Length == 2 && field[1] == "-")
{
mass = 0;
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
log.InfoFormat("{0} - Balance response = {1}, Mass = {2}", Name,
received.Replace("\r", "<cr>").Replace("\n", "<lf>"), mass);
@@ -150,7 +141,6 @@ namespace TBF.Rig.MettlerToledo.Standard
else if (field.Length == 2 && field[1] == "+")
{
mass = Capacity;
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
log.InfoFormat("{0} - Balance response = {1}, Overload", Name,
received.Replace("\r", "<cr>").Replace("\n", "<lf>"));
@@ -158,7 +148,6 @@ namespace TBF.Rig.MettlerToledo.Standard
else if (field.Length >= 2 && field[1] == "I")
{
mass = balanceCfg.Capacity;
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Overload;
log.InfoFormat("{0} - Balance response = {1}, Overload", Name,
received.Replace("\r", "<cr>").Replace("\n", "<lf>"), mass);
@@ -215,7 +204,6 @@ namespace TBF.Rig.MettlerToledo.Standard
if (field.Length >= 2 && field[1] == "I")
{
mass = balanceCfg.Capacity;
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
//msrmntState = MsrmntState.Overload;
log.WarnFormat("{0} - Balance response = \"{1}\", Overload.", Name,