Sic-Software
/
Sic.Framework
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[RT.Equipment] 

修正IoSensorWaterFlowTemp注册数据的路径和名称，使DataLog\Data History视图的左侧列表中的名称更加直观。
This commit is contained in:
SL 2023-09-14 09:20:45 +08:00
parent 2b0a7771e6
commit 41202afbaa
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorAnalog.cs
View File

@ -149,7 +149,7 @@ namespace Aitex.Core.RT.Device.Devices
public virtual bool Initialize()
{
DATA.Subscribe($"{Module}.{Name}.Value", () => Value);
// DATA.Subscribe($"{Module}.{Name}.Value", () => Value);
return true;
}

3
MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorWaterFlowTemp.cs
View File

@ -24,7 +24,6 @@ namespace Aitex.Core.RT.Device.Devices
: base(module, node, ioModule)
{
_devData = new AITWaterFlowData();
_diFlowSW = ParseDiNode("diFlowSW", node, ioModule);
LoadConfig();
@ -79,6 +78,8 @@ namespace Aitex.Core.RT.Device.Devices
public override bool Initialize()
{
DATA.Subscribe($"{Module}.{Name}.DeviceData", () => DeviceData);
DATA.Subscribe($"{Module}.CoolingWater.{Display}.Value", () => Value);
DATA.Subscribe($"{Module}.CoolingWater.{Display}.FlowSensor", () => IsFlowSw);
return base.Initialize();
}

23
MECF.Framework.RT.EquipmentLibrary/Devices/IoWaterFlow.cs
View File

@ -1,16 +1,10 @@
using Aitex.Core.Common.DeviceData;
using Aitex.Core.RT.DataCenter;
using Aitex.Core.RT.Device;
using Aitex.Core.RT.IOCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml;
using Aitex.Core.Util;
using Aitex.Core.RT.Event;
using Aitex.Core.RT.Log;
namespace Aitex.Core.RT.Device.Devices
@ -65,13 +59,8 @@ namespace Aitex.Core.RT.Device.Devices
return false;
}
}
public IoWaterFlow(string module, XmlElement node, string ioModule = "")
public IoWaterFlow(string module, XmlElement node, string ioModule = "") : base (module, node, ioModule)
{
var attrModule = node.GetAttribute("module");
base.Module = string.IsNullOrEmpty(attrModule) ? module : attrModule;
base.Name = node.GetAttribute("id");
base.Display = node.GetAttribute("display");
base.DeviceID = node.GetAttribute("schematicId");
_isFloatAioType = !string.IsNullOrEmpty(node.GetAttribute("aioType")) && (node.GetAttribute("aioType") == "float");
_aiFeedBack = ParseAiNode("aiFeedback", node, ioModule);
@ -84,18 +73,16 @@ namespace Aitex.Core.RT.Device.Devices
//{
// _alarmText = "Alarm9 TMPump2 Water Low Flow -U6 [DI-19]";
//}
UniqueName = Module + "." + Name;
}
public bool Initialize()
{
DATA.Subscribe($"{Module}.{Name}.DeviceData", () => DeviceData);
DATA.Subscribe($"{Module}.{Name}.FeedBack", () => FeedBack);
DATA.Subscribe($"{Module}.{Name}.FlowSW", () => FlowSW);
DATA.Subscribe($"{Module}.{Display}.DeviceData", () => DeviceData);
DATA.Subscribe($"{Module}.{Display}.FeedBack", () => FeedBack);
DATA.Subscribe($"{Module}.{Display}.FlowSW", () => FlowSW);
return false;
}
public void Monitor()
protected override void HandleMonitor()
{
try
{