diff --git a/DeviceTest/DeviceTestDlg.cs b/DeviceTest/DeviceTestDlg.cs
index fde52179d..7628cd03c 100644
--- a/DeviceTest/DeviceTestDlg.cs
+++ b/DeviceTest/DeviceTestDlg.cs
@@ -677,10 +677,10 @@ namespace DeviceTest
{
operation1 = (tbfComponent1forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
}
- else if (tbfComponent1forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+ else if (tbfComponent1forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
{
- operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
- operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+ operation1 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
+ operation2 = (tbfComponent1forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
}
else if (tbfComponent1forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
{
@@ -716,10 +716,10 @@ namespace DeviceTest
{
operation21 = (tbfComponent2forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
}
- else if (tbfComponent2forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+ else if (tbfComponent2forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
{
- operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
- operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+ operation21 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
+ operation22 = (tbfComponent2forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
}
else if (tbfComponent2forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
{
@@ -755,10 +755,10 @@ namespace DeviceTest
{
operation31 = (tbfComponent3forOp as TBF.Rig.Network.Camera.Roi.Roi).RoiDetectionOp();
}
- else if (tbfComponent3forOp is TBF.Rig.Modbus.Easytherm.Easytherm)
+ else if (tbfComponent3forOp is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm)
{
- operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
- operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
+ operation31 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(10);
+ operation32 = (tbfComponent3forOp as TBF.Rig.Modbus.TempControl.Easytherm.Easytherm).SetTemperatureOp(20);
}
else if (tbfComponent3forOp is TBF.Rig.Modbus.UltrasoundLevelMeter.LevelMeter)
{
diff --git a/TBF/Rig/Modbus/TankSelector/TankSelector.cs b/TBF/Rig/Modbus/TankSelector/TankSelector.cs
index 4a24210fd..268635d4b 100644
--- a/TBF/Rig/Modbus/TankSelector/TankSelector.cs
+++ b/TBF/Rig/Modbus/TankSelector/TankSelector.cs
@@ -82,11 +82,11 @@ namespace TBF.Rig.Modbus.TankSelector
readonly TankSelectorCfg tankSelectorCfg;
readonly QuidoRS.QuidoRS quidoRS;
- Easytherm.Easytherm hotHeating;
- Easytherm.Easytherm hotCooling;
- Easytherm.Easytherm warmHeating;
- Easytherm.Easytherm warmCooling;
- Easytherm.Easytherm coldCooling;
+ TempControl.Easytherm.Easytherm hotHeating;
+ TempControl.Easytherm.Easytherm hotCooling;
+ TempControl.Easytherm.Easytherm warmHeating;
+ TempControl.Easytherm.Easytherm warmCooling;
+ TempControl.Easytherm.Easytherm coldCooling;
public State State;
@@ -168,11 +168,11 @@ namespace TBF.Rig.Modbus.TankSelector
public override void Initialize()
{
- hotHeating = (TBF.Rig.Modbus.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.HotWaterHeating);
- hotCooling = (TBF.Rig.Modbus.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.HotWaterCooling);
- warmHeating = (TBF.Rig.Modbus.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.WarmWaterHeating);
- warmCooling = (TBF.Rig.Modbus.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.WarmWaterCooling);
- coldCooling = (TBF.Rig.Modbus.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.ColdWaterCooling);
+ hotHeating = (TempControl.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.HotWaterHeating);
+ hotCooling = (TempControl.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.HotWaterCooling);
+ warmHeating = (TempControl.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.WarmWaterHeating);
+ warmCooling = (TempControl.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.WarmWaterCooling);
+ coldCooling = (TempControl.Easytherm.Easytherm)TbfComponents.FindComponent(tankSelectorCfg.ColdWaterCooling);
if (hotHeating == null) throw new Exception(string.Format("Component '{0}' cannot find temperature controller '{1}'", Name, tankSelectorCfg.HotWaterHeating));
if (hotCooling == null) throw new Exception(string.Format("Component '{0}' cannot find temperature controller '{1}'", Name, tankSelectorCfg.HotWaterCooling));
diff --git a/TBF/Rig/Modbus/TankSelector/TankSelectorCfgCtrl.cs b/TBF/Rig/Modbus/TankSelector/TankSelectorCfgCtrl.cs
index aa2bf5c64..ccffea4ec 100644
--- a/TBF/Rig/Modbus/TankSelector/TankSelectorCfgCtrl.cs
+++ b/TBF/Rig/Modbus/TankSelector/TankSelectorCfgCtrl.cs
@@ -49,7 +49,7 @@ namespace TBF.Rig.Modbus.TankSelector
{
parentNameComboBox.Items.Add(cmpnt.Name);
}
- if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.Easytherm.Factory)
+ if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.TempControl.Easytherm.Factory)
{
hotHeatingComboBox.Items.Add(cmpnt.Name);
hotCoolingComboBox.Items.Add(cmpnt.Name);
diff --git a/TBF/Rig/Modbus/Easytherm/Easytherm.cs b/TBF/Rig/Modbus/TempControl/Easytherm/Easytherm.cs
similarity index 98%
rename from TBF/Rig/Modbus/Easytherm/Easytherm.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/Easytherm.cs
index e6ae28d42..27245bc60 100644
--- a/TBF/Rig/Modbus/Easytherm/Easytherm.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/Easytherm.cs
@@ -1,5 +1,5 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TBF.Rig.Generic;
using TBF.Boxes;
using Config.Entities;
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
public class Easytherm : ComponentBase, IDevice, GenericDevices.ITempMeter
{
diff --git a/TBF/Rig/Modbus/Easytherm/EasythermCfg.cs b/TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfg.cs
similarity index 94%
rename from TBF/Rig/Modbus/Easytherm/EasythermCfg.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfg.cs
index 2d9ed16da..2b1603b19 100644
--- a/TBF/Rig/Modbus/Easytherm/EasythermCfg.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfg.cs
@@ -1,12 +1,12 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using System.Xml.Serialization;
using Common;
using TBF.Rig.Generic;
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
public class EasythermCfg : ComponentCfgBase, Generic.IChildComponentCfg
{
diff --git a/TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.cs b/TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.cs
similarity index 97%
rename from TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.cs
index 84b535433..c83492e67 100644
--- a/TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.cs
@@ -1,5 +1,5 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
@@ -8,7 +8,7 @@ using Config.Entities;
using TBF.Rig.Generic;
using TBF.UI.Bench.Components;
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
public partial class EasythermCfgCtrl : UserControl, IComponentCfgCtrl
{
diff --git a/TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.designer.cs b/TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.designer.cs
similarity index 98%
rename from TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.designer.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.designer.cs
index 09272e1b3..ff71e2be0 100644
--- a/TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.designer.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.designer.cs
@@ -1,7 +1,7 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
partial class EasythermCfgCtrl
{
diff --git a/TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.resx b/TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.resx
similarity index 100%
rename from TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.resx
rename to TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.resx
diff --git a/TBF/Rig/Modbus/Easytherm/Factory.cs b/TBF/Rig/Modbus/TempControl/Easytherm/Factory.cs
similarity index 87%
rename from TBF/Rig/Modbus/Easytherm/Factory.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/Factory.cs
index f72ad9981..00f397c78 100644
--- a/TBF/Rig/Modbus/Easytherm/Factory.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/Factory.cs
@@ -1,10 +1,10 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using TBF.Rig.Generic;
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
public class Factory : IComponentFactory
{
diff --git a/TBF/Rig/Modbus/Easytherm/ProcParams.cs b/TBF/Rig/Modbus/TempControl/Easytherm/ProcParams.cs
similarity index 97%
rename from TBF/Rig/Modbus/Easytherm/ProcParams.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/ProcParams.cs
index f60b2821d..d4e1ad859 100644
--- a/TBF/Rig/Modbus/Easytherm/ProcParams.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/ProcParams.cs
@@ -1,5 +1,5 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System.IO;
using System.Xml.Serialization;
@@ -8,7 +8,7 @@ using Config.Entities;
using TBF.Rig.Generic;
using TBF.Resources;
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
public class ProcParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
{
diff --git a/TBF/Rig/Modbus/Easytherm/ReadTempOp.cs b/TBF/Rig/Modbus/TempControl/Easytherm/ReadTempOp.cs
similarity index 94%
rename from TBF/Rig/Modbus/Easytherm/ReadTempOp.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/ReadTempOp.cs
index 98cd9f295..882dfba1b 100644
--- a/TBF/Rig/Modbus/Easytherm/ReadTempOp.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/ReadTempOp.cs
@@ -1,11 +1,11 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System;
using log4net;
using TBF.Boxes;
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
public class ReadTempOp : IOperation
{
diff --git a/TBF/Rig/Modbus/Easytherm/SetRequiredTemperatureOp.cs b/TBF/Rig/Modbus/TempControl/Easytherm/SetRequiredTemperatureOp.cs
similarity index 93%
rename from TBF/Rig/Modbus/Easytherm/SetRequiredTemperatureOp.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/SetRequiredTemperatureOp.cs
index 363a9a4ea..1964e96be 100644
--- a/TBF/Rig/Modbus/Easytherm/SetRequiredTemperatureOp.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/SetRequiredTemperatureOp.cs
@@ -1,11 +1,11 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System;
using log4net;
using TBF.Boxes;
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
public class SetRequiredTemperatureOp : IOperation
{
diff --git a/TBF/Rig/Modbus/Easytherm/SetTemperatureOp.cs b/TBF/Rig/Modbus/TempControl/Easytherm/SetTemperatureOp.cs
similarity index 94%
rename from TBF/Rig/Modbus/Easytherm/SetTemperatureOp.cs
rename to TBF/Rig/Modbus/TempControl/Easytherm/SetTemperatureOp.cs
index ecd6fd6e2..d2ef0c096 100644
--- a/TBF/Rig/Modbus/Easytherm/SetTemperatureOp.cs
+++ b/TBF/Rig/Modbus/TempControl/Easytherm/SetTemperatureOp.cs
@@ -1,11 +1,11 @@
///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
///
using System;
using log4net;
using TBF.Boxes;
-namespace TBF.Rig.Modbus.Easytherm
+namespace TBF.Rig.Modbus.TempControl.Easytherm
{
public class SetTemperatureOp : IOperation
{
diff --git a/TBF/Rig/TbfComponents.cs b/TBF/Rig/TbfComponents.cs
index 297a297cd..bc37e124f 100644
--- a/TBF/Rig/TbfComponents.cs
+++ b/TBF/Rig/TbfComponents.cs
@@ -122,12 +122,12 @@ namespace TBF.Rig
Factories.Add(new MettlerToledo.Multi.BalanceFactory()); /// MettlerToledo-Multi
Factories.Add(new Modbus.CometAmbient.Factory()); /// Modbus.CometAmbient.Ambient
Factories.Add(new Modbus.Common.Factory()); /// Modbus
- Factories.Add(new Modbus.Easytherm.Factory()); /// Modbus.Easytherm
Factories.Add(new Modbus.Novus.Factory()); /// Modbus.Novus
Factories.Add(new Modbus.PressureMeter.Meret.Factory()); /// Modbus.PressureMeter.Meret - Meret pressure meter connected via modbus
Factories.Add(new Modbus.QuidoRS.Factory()); /// Modbus.QuidoRS
Factories.Add(new Modbus.TankSelector.Factory()); /// Modbus.TankSelector
- Factories.Add(new Modbus.UltrasoundLevelMeter.Factory());
+ Factories.Add(new Modbus.TempControl.Easytherm.Factory()); /// Modbus.TempControl.Easytherm
+ Factories.Add(new Modbus.UltrasoundLevelMeter.Factory());
Factories.Add(new Modbus.WaterAnalyzer.Factory());
Factories.Add(new Modbus.WaterAnalyzer2.Factory());
Factories.Add(new Network.Adapter.Factory());
diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj
index ecab51a94..6057d30e6 100644
--- a/TBF/TBF.csproj
+++ b/TBF/TBF.csproj
@@ -808,19 +808,6 @@
AmbientCfgCtrl.cs
-
-
-
-
- UserControl
-
-
- EasythermCfgCtrl.cs
-
-
-
-
-
@@ -884,6 +871,19 @@
TankSelectorCfgCtrl.cs
+
+
+
+ UserControl
+
+
+ EasythermCfgCtrl.cs
+
+
+
+
+
+
@@ -3047,9 +3047,6 @@
ModbusCfgCtrl.cs
-
- EasythermCfgCtrl.cs
-
NovusCfgCtrl.cs
@@ -3065,6 +3062,9 @@
TankSelectorCfgCtrl.cs
+
+ EasythermCfgCtrl.cs
+
NetadapterCfgCtrl.cs
@@ -3802,6 +3802,7 @@
+
diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs
index 3dfd5cf41..6a3b09c9d 100644
--- a/TBF/UI/Procedures/ProcedureDlg.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.cs
@@ -333,7 +333,7 @@ namespace TBF.UI.Procedures
if (cmpnt is TBF.Rig.Output.DB.SensusOracle.Database) other.Add(cmpnt);
if (cmpnt is TBF.Rig.TestMethods.S640Communication.S640Start) other.Add(cmpnt);
if (cmpnt is TBF.Rig.TestMethods.S640Communication.S640End) other.Add(cmpnt);
- if (cmpnt is TBF.Rig.Modbus.Easytherm.Easytherm) other.Add(cmpnt);
+ if (cmpnt is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm) other.Add(cmpnt);
if (cmpnt is TBF.Rig.Modbus.Novus.Novus) other.Add(cmpnt);
}