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

Changes for Xylem Nanjing, ver. 3.1.1676

Browse Source
This commit is contained in:
Milan Hanajik
2021-06-18 15:35:46 +02:00
parent f1ef16e1a3
commit 827a9f7c58
837 changed files with 46518 additions and 5851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Modbus/UltrasoundLevelMeter/LevelMeter.cs
+8 -8
View File
@@ -3,11 +3,11 @@
///
using System;
using System.Collections.Generic;
using log4net;
using TBF.Rig.Generic;
using TBF.Boxes;
using Config.Entities;
using System.Diagnostics;
using log4net;
using Common;
using TBF.Boxes;
using TBF.Rig.Generic;
namespace TBF.Rig.Modbus.UltrasoundLevelMeter
{
@@ -83,8 +83,8 @@ namespace TBF.Rig.Modbus.UltrasoundLevelMeter
/// <summary>Run this device</summary>
public void RunDeviceBefore()
{
if (myCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
myCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
if (myCfg.DebugLevel == DebugMode.Simulate ||
myCfg.DebugLevel == DebugMode.FailureDuringOperation)
{
msrmntTimeStamp = StateMachine.Time;
return;
@@ -121,8 +121,8 @@ namespace TBF.Rig.Modbus.UltrasoundLevelMeter
public void RunDeviceAfter()
{
if (myCfg.DebugLevel != Config.Entities.DebugMode.Simulate &&
myCfg.DebugLevel != Config.Entities.DebugMode.FailureDuringOperation &&
if (myCfg.DebugLevel != DebugMode.Simulate &&
myCfg.DebugLevel != DebugMode.FailureDuringOperation &&
modbus.IsMyTurn(ticketNumber))
{
///
TBF/Rig/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs
+3 -2
View File
@@ -6,12 +6,13 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml.Serialization;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
namespace TBF.Rig.Modbus.UltrasoundLevelMeter
{
public class LevelMeterCfg : ComponentCfgBase, Generic.IChildComponentCfg, Config.Entities.IParamsProvider
public class LevelMeterCfg : ComponentCfgBase, Generic.IChildComponentCfg, IParamsProvider
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(LevelMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -115,7 +116,7 @@ namespace TBF.Rig.Modbus.UltrasoundLevelMeter
}
public Config.Entities.IParamsProvider Clone()
public IParamsProvider Clone()
{
LevelMeterCfg pars = new LevelMeterCfg();
CopyContentTo(pars);