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/BalanceNewDev.cs
+3 -13
View File
@@ -17,25 +17,19 @@ namespace TBF.Rig.MettlerToledo.Standard
/// </note>
public class BalanceNewDev : 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(BalanceNewDev));
public override string ToString() { return string.Format("MettlerToledo.Standard.BalanceNew({0})", Cfg.ToString(-1)); }
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
/// <summary>Serial number after GetSerialNumber() when MsrmntState == MsrmntState.Valid</summary>
public string SerialNumber { get { return serialNumber; } }
string serialNumber;
public BalanceNewDev()
{
}
public BalanceNewDev() { }
public BalanceNewDev(Generic.IComponentCfg cfg)
: base(cfg)
{
log.Warn(this.ToString());
}
/// <summary>
@@ -68,7 +62,6 @@ namespace TBF.Rig.MettlerToledo.Standard
if (balanceCfg.DebugLevel == DebugMode.Simulate)
{
mass = 0.456;
Masses[balanceNr] = mass;
serialNumber = "1234567890";
msrmntState = MsrmntState.Valid;
msrmntTimeStamp = StateMachine.Time;
@@ -140,7 +133,6 @@ namespace TBF.Rig.MettlerToledo.Standard
if (field.Length == 2 && field[1] == "A")
{
mass = 0;
Masses[balanceNr] = mass;
msrmntState = MsrmntState.Valid;
log.WarnFormat("{0} - Balance response = {1}", Name,
received.Replace("\r", "<cr>").Replace("\n", "<lf>"));
@@ -159,7 +151,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);
@@ -240,7 +231,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,