Everything works OK after serious changes:
- all components, componentCfg-s and parameter providers use base classes - less boilerplate code, simpler access to test/procedure parameters from code - CreateTestParams(test), CreateProcedureParams(procedure) methods added - TestBenchSim class is made static, it is not inheritted by any device anymore
This commit is contained in:
@@ -14,28 +14,24 @@ namespace TBF.BenchControl.MettlerToledo
|
||||
/// <note>
|
||||
/// Implemented and tested on 15.10.2013 by Milan Hanajik
|
||||
/// </note>
|
||||
public class BalanceNewDev : BalanceDev, IComponent, IDevice, GenericDevices.IBalance2
|
||||
public class BalanceNewDev : BalanceDev, IDevice, GenericDevices.IBalance2
|
||||
{
|
||||
/// <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("{0} - Mettler-Toledo Balance with SN", balanceCfg.Name); }
|
||||
|
||||
public static void ResetStaticProperties() { }
|
||||
public override string ToString() { return string.Format("MettlerToledo.BalanceNew({0})", Cfg.ToString(1)); }
|
||||
|
||||
/// <summary>Serial number after GetSerialNumber() when MsrmntState == MsrmntState.Valid</summary>
|
||||
public string SerialNumber
|
||||
{
|
||||
get { return serialNumber; }
|
||||
}
|
||||
public string SerialNumber { get { return serialNumber; } }
|
||||
string serialNumber;
|
||||
|
||||
public BalanceNewDev(BalanceCfg cfg, IList<Generic.IComponent> components)
|
||||
: base(cfg, components)
|
||||
{
|
||||
}
|
||||
log.Debug(this.ToString());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the serial number
|
||||
@@ -64,7 +60,7 @@ namespace TBF.BenchControl.MettlerToledo
|
||||
{
|
||||
if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate)
|
||||
{
|
||||
mass = GetSimMass(balanceNr);
|
||||
mass = TestBenchSim.GetSimMass(balanceNr);
|
||||
Masses[balanceNr] = mass;
|
||||
serialNumber = "1234567890";
|
||||
msrmntState = MsrmntState.Valid;
|
||||
|
||||
Reference in New Issue
Block a user