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

更改了部分地址和精度信息

Browse Source
This commit is contained in:
Tyrone CT
2025-06-27 11:43:19 +08:00
parent 1685d76cd3
commit fb03d1ae30
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CapMachine.Wpf/Services/AlarmService.cs
View File

@@ -43,12 +43,12 @@ namespace CapMachine.Wpf.Services
}}, }},
new AlarmRunCell(FreeSql){Index=1,CurAlarmConfig=new AlarmConfig() new AlarmRunCell(FreeSql){Index=1,CurAlarmConfig=new AlarmConfig()
{ {
Name="地压报警", Name="低压报警",
ActiveType=ActiveType.Bool, ActiveType=ActiveType.Bool,
Address="V0.2", Address="V0.2",
AlarmLevel=AlarmLevel.Level1, AlarmLevel=AlarmLevel.Level1,
Category="一般报警", Category="一般报警",
Message="地压报警", Message="低压报警",
ThresholdDown=1, ThresholdDown=1,
ThresholdUp=1, ThresholdUp=1,
BoolActiveValue=true BoolActiveValue=true

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

@@ -616,8 +616,8 @@ namespace CapMachine.Wpf.Services
MinValue = -50, MinValue = -50,
MaxValue = 150, MaxValue = 150,
IsMeter = true, IsMeter = true,
DecimalPoint = 1, DecimalPoint = 2,
Precision = 10, Precision = 100,
Unit = "℃", Unit = "℃",
DataType = TagDataType.Short, DataType = TagDataType.Short,
PVModel = new MeterValueAttrCell() { Address = "VW126", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 26 }, PVModel = new MeterValueAttrCell() { Address = "VW126", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 26 },
@@ -647,7 +647,7 @@ namespace CapMachine.Wpf.Services
MaxValue = 100, MaxValue = 100,
IsMeter = true, IsMeter = true,
DecimalPoint = 1, DecimalPoint = 1,
Precision = 10, Precision = 100,
Unit = "%", Unit = "%",
DataType = TagDataType.Short, DataType = TagDataType.Short,
PVModel = new MeterValueAttrCell() { Address = "VW128", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 28 }, PVModel = new MeterValueAttrCell() { Address = "VW128", EngValue = 0, EngValueStr = "", Block = "PV", BlockIndex = 28 },
@@ -2270,7 +2270,7 @@ namespace CapMachine.Wpf.Services
new HandSwitchData(){Name="EV4",ActionAddress="M3.2",StateAddress="Q2.1" ,StateAddressType=HandSwitchStateType.Bool }, new HandSwitchData(){Name="EV4",ActionAddress="M3.2",StateAddress="Q2.1" ,StateAddressType=HandSwitchStateType.Bool },
new HandSwitchData(){Name="试验箱",ActionAddress="M3.3",StateAddress="VW32" ,StateAddressType=HandSwitchStateType.Word },//VW32=1 new HandSwitchData(){Name="试验箱",ActionAddress="M3.3",StateAddress="VW32" ,StateAddressType=HandSwitchStateType.Word },//VW32=1
new HandSwitchData(){Name="吸排气球阀",ActionAddress="M3.4",StateAddress="Q2.3" ,StateAddressType=HandSwitchStateType.Bool }, new HandSwitchData(){Name="吸排气球阀",ActionAddress="M3.4",StateAddress="Q2.3" ,StateAddressType=HandSwitchStateType.Bool },
new HandSwitchData(){Name="使能",ActionAddress="M3.5",StateAddress="V9.1" ,StateAddressType=HandSwitchStateType.Bool }, //new HandSwitchData(){Name="使能",ActionAddress="M3.5",StateAddress="V9.1" ,StateAddressType=HandSwitchStateType.Bool },
}; };
ListPlcExdConfigCell = new List<PlcExdConfigCell>() ListPlcExdConfigCell = new List<PlcExdConfigCell>()
@@ -2363,6 +2363,7 @@ namespace CapMachine.Wpf.Services
//取消XXX //取消XXX
var Result = SiemensDrive.Write("M0.4", true); var Result = SiemensDrive.Write("M0.4", true);
var Result1 = SiemensDrive.Write("V99.0", true);
if (Result.IsSuccess) if (Result.IsSuccess)
{ {
return true; return true;
@@ -2384,6 +2385,7 @@ namespace CapMachine.Wpf.Services
//取消XXX //取消XXX
var Result = SiemensDrive.Write("M0.7", true); var Result = SiemensDrive.Write("M0.7", true);
var Result1 = SiemensDrive.Write("V99.0", false);
if (Result.IsSuccess) if (Result.IsSuccess)
{ {
return true; return true;
@@ -2629,13 +2631,13 @@ namespace CapMachine.Wpf.Services
//取得压缩机的CANLIN数据到数据集合中 //取得压缩机的CANLIN数据到数据集合中
pVModel!.EngValue = CanDriveService.GetDbcValueByName(itemCanLinGroup.Value.NameNoUnit); pVModel!.EngValue = CanDriveService.GetDbcValueByName(itemCanLinGroup.Value.NameNoUnit);
//写入到PLC中 //写入到PLC中
SiemensDrive.Write(pVModel!.Address!.Replace("W", ""), (short)(CanDriveService.GetDbcValueByName(itemCanLinGroup.Value.NameNoUnit))); SiemensDrive.Write(pVModel!.Address!.Replace("W", ""), (short)(CanDriveService.GetDbcValueByName(itemCanLinGroup.Value.NameNoUnit) * itemCanLinGroup.Value.Precision));
break; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//取得压缩机的CANLIN数据 //取得压缩机的CANLIN数据
pVModel!.EngValue = LinDriveService.GetLdfValueByName(itemCanLinGroup.Value.NameNoUnit); pVModel!.EngValue = LinDriveService.GetLdfValueByName(itemCanLinGroup.Value.NameNoUnit);
//写入到PLC中 //写入到PLC中
SiemensDrive.Write(pVModel!.Address!.Replace("W", ""), (short)(LinDriveService.GetLdfValueByName(itemCanLinGroup.Value.NameNoUnit))); SiemensDrive.Write(pVModel!.Address!.Replace("W", ""), (short)(LinDriveService.GetLdfValueByName(itemCanLinGroup.Value.NameNoUnit) * itemCanLinGroup.Value.Precision));
break; break;
case CanLinEnum.No: case CanLinEnum.No:
break; break;

6
CapMachine.Wpf/ViewModels/MonitorViewModel.cs
View File

@@ -62,7 +62,7 @@ namespace CapMachine.Wpf.ViewModels
InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[BarA]"); InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[BarA]");
InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]"); InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]");
Cond1TempT4Tag = TagManager.DicTags.GetValueOrDefault("COND1入口温度T4[℃]"); Cond1TempTag = TagManager.DicTags.GetValueOrDefault("COND1温度[℃]");
VRVTag = TagManager.DicTags.GetValueOrDefault("冷媒流量[kg/h]"); VRVTag = TagManager.DicTags.GetValueOrDefault("冷媒流量[kg/h]");
LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[kg/h]"); LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[kg/h]");
Cond2TempTag = TagManager.DicTags.GetValueOrDefault("COND2温度[℃]"); Cond2TempTag = TagManager.DicTags.GetValueOrDefault("COND2温度[℃]");
@@ -231,7 +231,7 @@ namespace CapMachine.Wpf.ViewModels
/// <summary> /// <summary>
/// 冷凝器出口水温 /// 冷凝器出口水温
/// </summary> /// </summary>
public ITag Cond1TempT4Tag { get; set; } public ITag Cond1TempTag { get; set; }
/// <summary> /// <summary>
/// 冷媒流量 /// 冷媒流量
@@ -341,11 +341,13 @@ namespace CapMachine.Wpf.ViewModels
case CanLinEnum.Can: case CanLinEnum.Can:
//获取PLC的SV数据 更新SV的速度值到压缩机 //获取PLC的SV数据 更新SV的速度值到压缩机
CanDriveService.UpdateSpeedCmdData(0); CanDriveService.UpdateSpeedCmdData(0);
CanDriveService.UpdateCapEnableCmdData(false);
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//获取PLC的SV数据 更新SV的速度值到压缩机 //获取PLC的SV数据 更新SV的速度值到压缩机
LinDriveService.UpdateSpeedCmdData(0); LinDriveService.UpdateSpeedCmdData(0);
LinDriveService.UpdateCapEnableCmdData(false);
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
default: default:

6
CapMachine.Wpf/Views/MonitorView.xaml
View File

@@ -1292,9 +1292,9 @@
Canvas.Top="147" Canvas.Top="147"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Top"
CellTitle="COND1入口温度T4" CellTitle="COND1温度"
CellUnit="{Binding Cond1TempT4Tag.Unit}" CellUnit="{Binding Cond1TempTag.Unit}"
CellValue="{Binding Cond1TempT4Tag.PVModel.EngValueStr}" /> CellValue="{Binding Cond1TempTag.PVModel.EngValueStr}" />
</Canvas> </Canvas>