PulsesFromUniCB.RegisterReader modified, ReadRegisterOp( ) returns null, ver. 3.1.1643

This commit is contained in:
Milan Hanajik
2021-03-17 17:15:43 +01:00
parent 1c093caff3
commit e201c0ea66
2 changed files with 16 additions and 48 deletions
@@ -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<Generic.IComponent> 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
/// <returns>ReadWaterMeter instance reference casted to IOperaton</returns>
public IOperation ReadRegisterOp()
{
return this;
return null;
}
private void ReadPulses()
{
wmPulses = controlBoard.PulsesWM(Position);
wmRefPulses = controlBoard.RefPulsesWM(Position);
}
/// <summary>Start this operation</summary>
public void Start()
{
ReadPulses();
}
/// <summary>Run this operation</summary>
/// <returns>eventDone</returns>
public Event Run()
{
ReadPulses();
return Event.ReadRegisterDone;
}
/// <summary>Stop this operation</summary>
public void Stop()
{
ReadPulses();
}
}
}