diff --git a/TBF/Rig/TestMethods/GenesisCommunication/GenesisHead/GenesisHead.cs b/TBF/Rig/TestMethods/GenesisCommunication/GenesisHead/GenesisHead.cs index c507191a0..810036789 100644 --- a/TBF/Rig/TestMethods/GenesisCommunication/GenesisHead/GenesisHead.cs +++ b/TBF/Rig/TestMethods/GenesisCommunication/GenesisHead/GenesisHead.cs @@ -71,6 +71,8 @@ namespace TBF.Rig.TestMethods.GenesisCommunication.GenesisHead private readonly GenesisHeadCfg genesisHeadCfg; public int SlotNr { get { return genesisHeadCfg.SlotNr; } } + public int OptoComPortNr { get { return genesisHeadCfg.OptoComPortNr; } } + public int HeadComPortNr { get { return genesisHeadCfg.HeadComPortNr; } } public double PulsesPerLtr { get { return 1000.0; } } public double LtrsPerPulse { get { return 1 / PulsesPerLtr; } } public string QuantityUnits { get; set; } @@ -254,7 +256,22 @@ namespace TBF.Rig.TestMethods.GenesisCommunication.GenesisHead //add for gen myGenesis = new GenesisMeter(); - myGenesis.SetupFromConfigFile(SlotNr); + //myGenesis.SetupFromConfigFile(SlotNr); + //myGenesis.SetLogger(); - private, but called into basic constructor! + myGenesis.SetupGenesisMeter( + SlotNr, + new Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.PortConfig() + { + Type = "Xylem.Common.Hardware.Interfaces.Ports.SerialPorts.IrdaSerialPort", + PortName =$"COM{HeadComPortNr}" + }, + new Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.PortConfig() + { + Type = "", + PortName = $"COM{OptoComPortNr}" + } + ); + Log("Add Meter to batch"); GenesisHeadBatch.BatchHolder.Value.AddMeter(myGenesis); Log("Log Raw Data"); diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index 4647aa41e..184a40a4e 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -173,6 +173,9 @@ ..\packages\Common\Xylem.Common.CommonCore.dll + + ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll + ..\packages\Common\Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll