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

Modbus.Easytherm --> Modbus.TempControl.Easytherm

Browse Source
This commit is contained in:
Milan Hanajik 2022-05-16 14:03:23 +02:00
parent 6d3ed2799b
commit 80d347ef54
16 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DeviceTest/DeviceTestDlg.cs
View File

@ -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)
{

20
TBF/Rig/Modbus/TankSelector/TankSelector.cs
View File

@ -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));

2
TBF/Rig/Modbus/TankSelector/TankSelectorCfgCtrl.cs
View File

@ -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);

4
TBF/Rig/Modbus/Easytherm/Easytherm.cs → TBF/Rig/Modbus/TempControl/Easytherm/Easytherm.cs
View File

@ -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
{

4
TBF/Rig/Modbus/Easytherm/EasythermCfg.cs → TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfg.cs
View File

@ -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
{

4
TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.cs → TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.cs
View File

@ -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
{

4
TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.designer.cs → TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.designer.cs generated
View File

@ -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
{

0
TBF/Rig/Modbus/Easytherm/EasythermCfgCtrl.resx → TBF/Rig/Modbus/TempControl/Easytherm/EasythermCfgCtrl.resx
View File

4
TBF/Rig/Modbus/Easytherm/Factory.cs → TBF/Rig/Modbus/TempControl/Easytherm/Factory.cs
View File

@ -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
{

4
TBF/Rig/Modbus/Easytherm/ProcParams.cs → TBF/Rig/Modbus/TempControl/Easytherm/ProcParams.cs
View File

@ -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
{

4
TBF/Rig/Modbus/Easytherm/ReadTempOp.cs → TBF/Rig/Modbus/TempControl/Easytherm/ReadTempOp.cs
View File

@ -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
{

4
TBF/Rig/Modbus/Easytherm/SetRequiredTemperatureOp.cs → TBF/Rig/Modbus/TempControl/Easytherm/SetRequiredTemperatureOp.cs
View File

@ -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
{

4
TBF/Rig/Modbus/Easytherm/SetTemperatureOp.cs → TBF/Rig/Modbus/TempControl/Easytherm/SetTemperatureOp.cs
View File

@ -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
{

4
TBF/Rig/TbfComponents.cs
View File

@ -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());

33
TBF/TBF.csproj
View File

@ -808,19 +808,6 @@
<DependentUpon>AmbientCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="Rig\Modbus\CometAmbient\Factory.cs" />
<Compile Include="Rig\Modbus\Easytherm\Factory.cs" />
<Compile Include="Rig\Modbus\Easytherm\Easytherm.cs" />
<Compile Include="Rig\Modbus\Easytherm\EasythermCfg.cs" />
<Compile Include="Rig\Modbus\Easytherm\EasythermCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Rig\Modbus\Easytherm\EasythermCfgCtrl.designer.cs">
<DependentUpon>EasythermCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="Rig\Modbus\Easytherm\ProcParams.cs" />
<Compile Include="Rig\Modbus\Easytherm\ReadTempOp.cs" />
<Compile Include="Rig\Modbus\Easytherm\SetRequiredTemperatureOp.cs" />
<Compile Include="Rig\Modbus\Easytherm\SetTemperatureOp.cs" />
<Compile Include="Rig\Modbus\Enums.cs" />
<Compile Include="Rig\Modbus\Common\Modbus.cs" />
<Compile Include="Rig\Modbus\Common\ModbusCfg.cs" />
@ -884,6 +871,19 @@
<DependentUpon>TankSelectorCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="Rig\Modbus\TankSelector\UnselectTankOp.cs" />
<Compile Include="Rig\Modbus\TempControl\Easytherm\Easytherm.cs" />
<Compile Include="Rig\Modbus\TempControl\Easytherm\EasythermCfg.cs" />
<Compile Include="Rig\Modbus\TempControl\Easytherm\EasythermCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Rig\Modbus\TempControl\Easytherm\EasythermCfgCtrl.designer.cs">
<DependentUpon>EasythermCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="Rig\Modbus\TempControl\Easytherm\Factory.cs" />
<Compile Include="Rig\Modbus\TempControl\Easytherm\ProcParams.cs" />
<Compile Include="Rig\Modbus\TempControl\Easytherm\ReadTempOp.cs" />
<Compile Include="Rig\Modbus\TempControl\Easytherm\SetRequiredTemperatureOp.cs" />
<Compile Include="Rig\Modbus\TempControl\Easytherm\SetTemperatureOp.cs" />
<Compile Include="Rig\Modbus\UltrasoundLevelMeter\Factory.cs" />
<Compile Include="Rig\Modbus\UltrasoundLevelMeter\LevelMeter.cs" />
<Compile Include="Rig\Modbus\UltrasoundLevelMeter\LevelMeterCfg.cs" />
@ -3047,9 +3047,6 @@
<EmbeddedResource Include="Rig\Modbus\Common\ModbusCfgCtrl.resx">
<DependentUpon>ModbusCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Rig\Modbus\Easytherm\EasythermCfgCtrl.resx">
<DependentUpon>EasythermCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Rig\Modbus\Novus\NovusCfgCtrl.resx">
<DependentUpon>NovusCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
@ -3065,6 +3062,9 @@
<EmbeddedResource Include="Rig\Modbus\TankSelector\TankSelectorCfgCtrl.resx">
<DependentUpon>TankSelectorCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Rig\Modbus\TempControl\Easytherm\EasythermCfgCtrl.resx">
<DependentUpon>EasythermCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Rig\Network\Adapter\NetadapterCfgCtrl.resx">
<DependentUpon>NetadapterCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
@ -3802,6 +3802,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Rig\Modbus\TempControl\Novus\" />
<Folder Include="Rig\Sirt\V2012_868MHz\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

2
TBF/UI/Procedures/ProcedureDlg.cs
View File

@ -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);
}