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

Pump tandem, ver. 3.1.1606

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-23 16:37:47 +01:00
parent ce6896b584
commit aff25e307d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("3.1.1605.0")] [assembly: AssemblyVersion("3.1.1606.0")]
[assembly: AssemblyFileVersion("3.1.1605.0")] [assembly: AssemblyFileVersion("3.1.1606.0")]
TBF/Rig/BuiltIn/PumpTandem/Pump.cs
+7 -6
View File
@@ -53,22 +53,22 @@ namespace TBF.Rig.BuiltIn.PumpTandem
{ {
pumpCfg = cfg as PumpCfg; pumpCfg = cfg as PumpCfg;
pump1 = (GenericDevices.IPump)TbfComponents.FindComponent(pumpCfg.Pump1, components); pump1 = TbfComponents.FindComponent(pumpCfg.Pump1, components) as GenericDevices.IPump;
if (pump1 == null) throw new Exception("Cannot find component Pump 1"); if (pump1 == null) throw new Exception("Cannot find component Pump 1");
pump2 = (GenericDevices.IPump)TbfComponents.FindComponent(pumpCfg.Pump2, components); pump2 = TbfComponents.FindComponent(pumpCfg.Pump2, components) as GenericDevices.IPump;
if (pump2 == null) throw new Exception("Cannot find component Pump 2"); if (pump2 == null) throw new Exception("Cannot find component Pump 2");
pumpFm1 = pump1 as GenericDevices.IPumpFM; pumpFm1 = pump1 as GenericDevices.IPumpFM;
pumpFm2 = pump2 as GenericDevices.IPumpFM; pumpFm2 = pump2 as GenericDevices.IPumpFM;
if (pump1 is BuiltIn.Pump.Pump) { mask1 = (pump1 as BuiltIn.Pump.Pump).Mask; } 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 if (pump1 is Modbus.PumpFM.DanfossVLT.Pump) { mask1 = (pump1 as Modbus.PumpFM.DanfossVLT.Pump).Mask; }
else { mask1 = 0; } else { mask1 = 0; }
if (pump2 is BuiltIn.Pump.Pump) { mask2 = (pump2 as BuiltIn.Pump.Pump).Mask; } if (pump2 is BuiltIn.Pump.Pump) { mask2 = (pump2 as BuiltIn.Pump.Pump).Mask; }
else if (pump2 is Danfoss.VLT2800.Pump) { mask2 = (pump2 as Danfoss.VLT2800.Pump).Mask; } 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 if (pump2 is Modbus.PumpFM.DanfossVLT.Pump) { mask2 = (pump2 as Modbus.PumpFM.DanfossVLT.Pump).Mask; }
else { mask2 = 0; } else { mask2 = 0; }
@@ -157,6 +157,7 @@ namespace TBF.Rig.BuiltIn.PumpTandem
case CurrentOp.TurnOn: case CurrentOp.TurnOn:
TurnOn(powerForOp); TurnOn(powerForOp);
return; return;
case CurrentOp.TurnOff: case CurrentOp.TurnOff:
default: default:
TurnOff(); TurnOff();