TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SV2功能增加

Browse Source 
一些功能的修复
This commit is contained in:
Tyrone CT
2025-05-21 12:17:46 +08:00
parent 03fd92ac86
commit 34ec76fda5
11 changed files with 507 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
CapMachine.Wpf/Services/MachineRtDataService.cs
View File

@@ -1078,13 +1078,13 @@ namespace CapMachine.Wpf.Services
RWInfo = RWInfo.PLCRead,
});
//Qcool_5K 计算
//Qcool 计算 制冷量
TagManger.AddTag(new ShortValueTag()
{
Id = 33,
Name = "Qcool_5K[W]",
NameNoUnit = "Qcool_5K",
EnName = "Qcool_5K",
Name = "制冷量[W]",
NameNoUnit = "制冷量",
EnName = "Qcool",
Group = "计算",
MinValue = 0,
MaxValue = 100,
@@ -1102,9 +1102,9 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new ShortValueTag()
{
Id = 34,
Name = "Qcool_Customer[W]",
NameNoUnit = "Qcool_Customer",
EnName = "Qcool_Customer",
Name = "制热量[W]",
NameNoUnit = "制热量",
EnName = "Qheat",
Group = "计算",
MinValue = 0,
MaxValue = 100,
@@ -1118,33 +1118,33 @@ namespace CapMachine.Wpf.Services
RWInfo = RWInfo.PCCalcu,
});
//Qheat 计算
TagManger.AddTag(new ShortValueTag()
{
Id = 35,
Name = "Qheat[W]",
NameNoUnit = "Qheat",
EnName = "Qheat",
Group = "计算",
MinValue = 0,
MaxValue = 100,
IsMeter = false,
DecimalPoint = 1,
Precision = 1,
Unit = "W",
DataType = TagDataType.Short,
PVModel = new MeterValueAttrCell() { Address = "VW212", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 1 },
////Qheat 计算
//TagManger.AddTag(new ShortValueTag()
//{
// Id = 35,
// Name = "Qheat[W]",
// NameNoUnit = "Qheat",
// EnName = "Qheat",
// Group = "计算",
// MinValue = 0,
// MaxValue = 100,
// IsMeter = false,
// DecimalPoint = 1,
// Precision = 1,
// Unit = "W",
// DataType = TagDataType.Short,
// PVModel = new MeterValueAttrCell() { Address = "VW212", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 1 },
RWInfo = RWInfo.PCCalcu,
});
// RWInfo = RWInfo.PCCalcu,
//});
//COP_Cooling_5K 计算
TagManger.AddTag(new ShortValueTag()
{
Id = 36,
Name = "COP_Cooling_5K[W]",
NameNoUnit = "COP_Cooling_5K",
EnName = "COP_Cooling_5K",
Name = "制冷性能系数[W]",
NameNoUnit = "制冷性能系数",
EnName = "COPCooling",
Group = "计算",
MinValue = 0,
MaxValue = 100,
@@ -1158,33 +1158,33 @@ namespace CapMachine.Wpf.Services
RWInfo = RWInfo.PCCalcu,
});
//COP_Cooling_Customer 计算
TagManger.AddTag(new ShortValueTag()
{
Id = 37,
Name = "COP_Cooling_Customer[W]",
NameNoUnit = "COP_Cooling_Customer",
EnName = "COP_Cooling_Customer",
Group = "计算",
MinValue = 0,
MaxValue = 100,
IsMeter = false,
DecimalPoint = 1,
Precision = 1,
Unit = "W",
DataType = TagDataType.Short,
PVModel = new MeterValueAttrCell() { Address = "VW216", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 1 },
////COP_Cooling_Customer 计算 制冷性能系数
//TagManger.AddTag(new ShortValueTag()
//{
// Id = 37,
// Name = "COP_Cooling_Customer[W]",
// NameNoUnit = "COP_Cooling_Customer",
// EnName = "COP_Cooling_Customer",
// Group = "计算",
// MinValue = 0,
// MaxValue = 100,
// IsMeter = false,
// DecimalPoint = 1,
// Precision = 1,
// Unit = "W",
// DataType = TagDataType.Short,
// PVModel = new MeterValueAttrCell() { Address = "VW216", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 1 },
RWInfo = RWInfo.PCCalcu,
});
// RWInfo = RWInfo.PCCalcu,
//});
//COP_Heating 计算
//COP_Heating 计算 制热性能系数
TagManger.AddTag(new ShortValueTag()
{
Id = 38,
Name = "COP_Heating[W]",
NameNoUnit = "COP_Heating",
EnName = "COP_Heating",
Name = "制热性能系数[W]",
NameNoUnit = "制热性能系数",
EnName = "COPHeating",
Group = "计算",
MinValue = 0,
MaxValue = 100,
@@ -1198,12 +1198,12 @@ namespace CapMachine.Wpf.Services
RWInfo = RWInfo.PCCalcu,
});
//VolumeEfficiency 计算
//VolumeEfficiency 计算 容积效率
TagManger.AddTag(new ShortValueTag()
{
Id = 39,
Name = "VolumeEfficiency[%]",
NameNoUnit = "VolumeEfficiency",
Name = "容积效率[%]",
NameNoUnit = "容积效率",
EnName = "VolumeEfficiency",
Group = "计算",
MinValue = 0,
@@ -1218,12 +1218,12 @@ namespace CapMachine.Wpf.Services
RWInfo = RWInfo.PCCalcu,
});
//IsentropyEfficiency 计算
//IsentropyEfficiency 计算 等熵效率
TagManger.AddTag(new ShortValueTag()
{
Id = 40,
Name = "IsentropyEfficiency[%]",
NameNoUnit = "IsentropyEfficiency",
Name = "等熵效率[%]",
NameNoUnit = "等熵效率",
EnName = "IsentropyEfficiency",
Group = "计算",
MinValue = 0,
@@ -1239,25 +1239,25 @@ namespace CapMachine.Wpf.Services
});
//IsentropyEfficiency 计算
TagManger.AddTag(new ShortValueTag()
{
Id = 41,
Name = "IsentropyEfficiency[%]",
NameNoUnit = "IsentropyEfficiency",
EnName = "IsentropyEfficiency",
Group = "计算",
MinValue = 0,
MaxValue = 100,
IsMeter = false,
DecimalPoint = 1,
Precision = 1,
Unit = "%",
DataType = TagDataType.Short,
PVModel = new MeterValueAttrCell() { Address = "VW222", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 1 },
////IsentropyEfficiency 计算 等熵效率
//TagManger.AddTag(new ShortValueTag()
//{
// Id = 41,
// Name = "IsentropyEfficiency[%]",
// NameNoUnit = "IsentropyEfficiency",
// EnName = "IsentropyEfficiency",
// Group = "计算",
// MinValue = 0,
// MaxValue = 100,
// IsMeter = false,
// DecimalPoint = 1,
// Precision = 1,
// Unit = "%",
// DataType = TagDataType.Short,
// PVModel = new MeterValueAttrCell() { Address = "VW222", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 1 },
RWInfo = RWInfo.PCCalcu,
});
// RWInfo = RWInfo.PCCalcu,
//});
// 过冷度 计算
@@ -2644,7 +2644,8 @@ namespace CapMachine.Wpf.Services
{
if (itemBlockReadTag.Key.Contains("转速"))
{
var dd = 1;
//转速不需要PLC读取
continue;
}
//需要从PLC读取的标签才算
if ((itemBlockReadTag.Value.RWInfo == RWInfo.PLCRead || itemBlockReadTag.Value.RWInfo == RWInfo.Control) && TagManger.TryGetPVModel(itemBlockReadTag.Key, out MeterValueAttrCell pVModel))