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

更改了PTC PW2在CAN和CAN FD的设置

Browse Source
This commit is contained in:
Tyrone CT
2025-08-15 19:24:49 +08:00
parent f4a4078660
commit 1dd632f767
3 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CapMachine.Wpf/Services/CanDriveService.cs
View File

@@ -169,6 +169,11 @@ namespace CapMachine.Wpf.Services
/// </summary>
private CanCmdData PTCPwCanCmdData { get; set; }
/// <summary>
/// PTC功率2 指令数据 实例
/// </summary>
private CanCmdData PTCPw2CanCmdData { get; set; }
/// <summary>
/// PTC水流量 指令数据 实例
/// </summary>
@@ -212,6 +217,9 @@ namespace CapMachine.Wpf.Services
case "PTC功率":
PTCPwCanCmdData = SendCanCmdData;
break;
case "PTC功率2":
PTCPw2CanCmdData = SendCanCmdData;
break;
case "PTC水流量":
PTCFlowCanCmdData = SendCanCmdData;
break;
@@ -297,6 +305,18 @@ namespace CapMachine.Wpf.Services
}
}
/// <summary>
/// 更新 PTC功率2 信号
/// </summary>
/// <param name="IsEnable"></param>
public void UpdateCapPTCPw2CmdData(double PTCPw)
{
if (PTCPw2CanCmdData != null)
{
PTCPw2CanCmdData.SignalCmdValue = PTCPw;
}
}
/// <summary>
/// 更新 PTC水流量 信号
/// </summary>

25
CapMachine.Wpf/Services/CanFdDriveService.cs
View File

@@ -109,6 +109,11 @@ namespace CapMachine.Wpf.Services
/// </summary>
private CanCmdData PTCPwCanCmdData { get; set; }
/// <summary>
/// PTC功率2 指令数据 实例
/// </summary>
private CanCmdData PTCPw2CanCmdData { get; set; }
/// <summary>
/// PTC水流量 指令数据 实例
/// </summary>
@@ -153,6 +158,9 @@ namespace CapMachine.Wpf.Services
case "PTC功率":
PTCPwCanCmdData = SendCanCmdData;
break;
case "PTC功率2":
PTCPw2CanCmdData = SendCanCmdData;
break;
case "PTC水流量":
PTCFlowCanCmdData = SendCanCmdData;
break;
@@ -251,6 +259,23 @@ namespace CapMachine.Wpf.Services
}
}
/// <summary>
/// 更新 PTC功率2 信号
/// </summary>
/// <param name="IsEnable"></param>
public void UpdateCapPTCPw2CmdData(double PTCPw)
{
if (PTCPw2CanCmdData != null)
{
if (PTCPw2CanCmdData.LogicRuleDto == null)
{
PTCPw2CanCmdData.SignalCmdValue = PTCPw;
return;
}
PTCPw2CanCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(PTCPw, PTCPw2CanCmdData.LogicRuleDto!);
}
}
/// <summary>
/// 更新 PTC水流量 信号
/// </summary>

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

@@ -3482,10 +3482,10 @@ namespace CapMachine.Wpf.Services
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{
case CanLinEnum.Can:
CanDriveService.UpdateCapPTCPwCmdData(Valuve!);
CanDriveService.UpdateCapPTCPw2CmdData(Valuve!);
break;
case CanLinEnum.CANFD:
CanFdDriveService.UpdateCapPTCPwCmdData(Valuve!);
CanFdDriveService.UpdateCapPTCPw2CmdData(Valuve!);
break;
case CanLinEnum.Lin:
//LinDriveService.UpdateCapPTCPwCmdData((bool)ProRunChannelData.SV!);