diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 53099d64d..83d50c13a 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.1.1642.0")] -[assembly: AssemblyFileVersion("3.1.1642.0")] +[assembly: AssemblyVersion("3.1.1643.0")] +[assembly: AssemblyFileVersion("3.1.1643.0")] diff --git a/TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs b/TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs index 42d3dd3e6..757c499cb 100644 --- a/TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs +++ b/TBF/Rig/RegisterReaders/PulsesFromUniCB/RegisterReader.cs @@ -9,46 +9,40 @@ using TBF.Boxes; namespace TBF.Rig.RegisterReaders.PulsesFromUniCB { - public class RegisterReader : ComponentBase, GenericDevices.IRegReader, IOperation + public class RegisterReader : ComponentBase, GenericDevices.IRegReader { private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader)); public override string ToString() { return string.Format("RegisterReader({0})", Cfg.ToString(-1)); } - readonly RRCfg registerReaderCfg; + readonly RRCfg rrCfg; - public int Position { get { return registerReaderCfg.Position; } } /// 1 .. Config.Data.WMsCount + public int Position { get { return rrCfg.Position; } } /// 1 .. Config.Data.WMsCount public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Pulses; } } - public double PulsesPerLtr { get { return registerReaderCfg.ProcParams.PulsesPerLtr; } } + public double PulsesPerLtr { get { return rrCfg.ProcParams.PulsesPerLtr; } } public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); ; } } - public int Filter { get { return registerReaderCfg.ProcParams.Filter; } } + public int Filter { get { return rrCfg.ProcParams.Filter; } } - public int WMPulses { get { return wmPulses; } } - public int WMRefPulses { get { return wmRefPulses; } } - public double WMVolume { get { return LtrsPerPulse * (double)wmPulses; } } + public int WMPulses { get { return cb.PulsesWM(Position); } } + public int WMRefPulses { get { return cb.RefPulsesWM(Position); } } + public double WMVolume { get { return LtrsPerPulse * Convert.ToDouble(WMPulses); } } public double BeginWMState { get { return 0; } } /// Always 0 public double EndWMState { get { return WMVolume; } } /// Derived from WMVolume - int wmPulses; - int wmRefPulses; + readonly TBF.Rig.ControlBoard.IControlBoard cb; - readonly TBF.Rig.ControlBoard.IControlBoard controlBoard; - - - public RegisterReader() - { - } + public RegisterReader() { } public RegisterReader(Generic.IComponentCfg cfg, IList components) : base(cfg) { - registerReaderCfg = cfg as RRCfg; + rrCfg = cfg as RRCfg; - controlBoard = TbfComponents.FindComponent(cfg.ParentName, components) as TBF.Rig.ControlBoard.IControlBoard; - if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent"); + cb = TbfComponents.FindComponent(cfg.ParentName, components) as TBF.Rig.ControlBoard.IControlBoard; + if (cb == null) throw new Exception("Cannot find " + Name + " parent"); /// Prepare data for SendCalibData() control board component method @@ -61,33 +55,7 @@ namespace TBF.Rig.RegisterReaders.PulsesFromUniCB /// ReadWaterMeter instance reference casted to IOperaton public IOperation ReadRegisterOp() { - return this; + return null; } - - private void ReadPulses() - { - wmPulses = controlBoard.PulsesWM(Position); - wmRefPulses = controlBoard.RefPulsesWM(Position); - } - - /// Start this operation - public void Start() - { - ReadPulses(); - } - - /// Run this operation - /// eventDone - public Event Run() - { - ReadPulses(); - return Event.ReadRegisterDone; - } - - /// Stop this operation - public void Stop() - { - ReadPulses(); - } } }