michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BuiltIn components clean-up.

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-02 20:27:02 +02:00
parent ce0b8af4a0
commit bb3a6ff4f3
5 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/BuiltIn/PumpTandem/Pump.cs
+13 -10
View File
@@ -19,8 +19,8 @@ namespace TBF.Rig.BuiltIn.PumpTandem
readonly GenericDevices.IPump pump1;
readonly GenericDevices.IPump pump2;
readonly GenericDevices.IPumpFM pumpFm1;
readonly GenericDevices.IPumpFM pumpFm2;
GenericDevices.IPumpFM pumpFm1;
GenericDevices.IPumpFM pumpFm2;
public bool State { get { return pump1.State || pump2.State; } }
@@ -38,8 +38,8 @@ namespace TBF.Rig.BuiltIn.PumpTandem
public int LagClosing { get { return 0; } }
readonly UInt128 mask1;
readonly UInt128 mask2;
UInt128 mask1;
UInt128 mask2;
public UInt128 Mask { get { return mask1 | mask2; } } /// derived from masks of two pumps
@@ -56,11 +56,16 @@ namespace TBF.Rig.BuiltIn.PumpTandem
pump2 = TbfComponents.FindComponent(pumpCfg.Pump2, components) as GenericDevices.IPump;
if (pump2 == null) throw new Exception("Cannot find component Pump 2");
pumpFm1 = pump1 as GenericDevices.IPumpFM;
pumpFm2 = pump2 as GenericDevices.IPumpFM;
log.Warn(this.ToString());
}
public override void Initialize()
{
pumpFm1 = pump1 as GenericDevices.IPumpFM;
pumpFm2 = pump2 as GenericDevices.IPumpFM;
if (pump1 is BuiltIn.Pump.Pump) { mask1 = (pump1 as BuiltIn.Pump.Pump).Mask; }
else if (pump1 is Danfoss.VLT2800.Pump) { mask1 = (pump1 as Danfoss.VLT2800.Pump).Mask; }
else if (pump1 is Danfoss.VLT2800.Pump) { mask1 = (pump1 as Danfoss.VLT2800.Pump).Mask; }
else if (pump1 is Modbus.PumpFM.DanfossVLT.Pump) { mask1 = (pump1 as Modbus.PumpFM.DanfossVLT.Pump).Mask; }
else { mask1 = 0; }
@@ -68,9 +73,7 @@ namespace TBF.Rig.BuiltIn.PumpTandem
else if (pump2 is Danfoss.VLT2800.Pump) { mask2 = (pump2 as Danfoss.VLT2800.Pump).Mask; }
else if (pump2 is Modbus.PumpFM.DanfossVLT.Pump) { mask2 = (pump2 as Modbus.PumpFM.DanfossVLT.Pump).Mask; }
else { mask2 = 0; }
log.Warn(this.ToString());
}
}
public void TurnOn(double powerArg)