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:
Milan Hanajik
2015-01-02 12:51:27 +01:00
parent 752719bd62
commit 94de991bf6
126 changed files with 1117 additions and 1629 deletions
@@ -4,34 +4,25 @@ using log4net;
namespace TBF.BenchControl.Elde.Diverter
{
public class Diverter : Generic.IComponent, GenericDevices.IDiverter
public class Diverter : ComponentBase, GenericDevices.IDiverter
{
/// <summary>
/// Info: StartMassMeasurement() and "Balance response = .., Mass = ..."
/// Warn: Start measurement when busy is true
/// </summary>
private static readonly ILog log = LogManager.GetLogger(typeof(Diverter));
public override string ToString()
{
return string.Format("Diverter({0},{1})", Name, diverterCfg.BitPosition);
}
public override string ToString() { return string.Format("Diverter({0})", Cfg.ToString(1)); }
public static void ResetStaticProperties() { }
private readonly DiverterCfg diverterCfg;
public Generic.IComponentCfg Cfg { get { return diverterCfg; } }
public string Name { get { return diverterCfg.Name; } }
readonly DiverterCfg diverterCfg;
readonly ControlBoardDev controlBoard;
readonly ulong mask; /// derived from bitPosition in the constructor
public bool State
{
get { return (controlBoard.Route & mask) != 0; }
}
public Diverter(DiverterCfg cfg, IList<Generic.IComponent> components)
: base(cfg)
{
if (cfg == null) throw new ArgumentNullException("cfg");
this.diverterCfg = cfg;
diverterCfg = cfg;
controlBoard = (ControlBoardDev)TbfComponents.FindComponent(cfg.ParentName, components);
if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent");
@@ -41,10 +32,5 @@ namespace TBF.BenchControl.Elde.Diverter
log.Debug(this.ToString());
}
public bool State
{
get { return (controlBoard.Route & mask) != 0; }
}
}
}