diff --git a/CapMachine.Wpf/Services/CanDriveService.cs b/CapMachine.Wpf/Services/CanDriveService.cs
index 10e8e89..b346634 100644
--- a/CapMachine.Wpf/Services/CanDriveService.cs
+++ b/CapMachine.Wpf/Services/CanDriveService.cs
@@ -169,6 +169,11 @@ namespace CapMachine.Wpf.Services
///
private CanCmdData PTCPwCanCmdData { get; set; }
+ ///
+ /// PTC功率2 指令数据 实例
+ ///
+ private CanCmdData PTCPw2CanCmdData { get; set; }
+
///
/// PTC水流量 指令数据 实例
///
@@ -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
}
}
+ ///
+ /// 更新 PTC功率2 信号
+ ///
+ ///
+ public void UpdateCapPTCPw2CmdData(double PTCPw)
+ {
+ if (PTCPw2CanCmdData != null)
+ {
+ PTCPw2CanCmdData.SignalCmdValue = PTCPw;
+ }
+ }
+
///
/// 更新 PTC水流量 信号
///
diff --git a/CapMachine.Wpf/Services/CanFdDriveService.cs b/CapMachine.Wpf/Services/CanFdDriveService.cs
index bb01213..97f0fc3 100644
--- a/CapMachine.Wpf/Services/CanFdDriveService.cs
+++ b/CapMachine.Wpf/Services/CanFdDriveService.cs
@@ -109,6 +109,11 @@ namespace CapMachine.Wpf.Services
///
private CanCmdData PTCPwCanCmdData { get; set; }
+ ///
+ /// PTC功率2 指令数据 实例
+ ///
+ private CanCmdData PTCPw2CanCmdData { get; set; }
+
///
/// PTC水流量 指令数据 实例
///
@@ -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
}
}
+ ///
+ /// 更新 PTC功率2 信号
+ ///
+ ///
+ public void UpdateCapPTCPw2CmdData(double PTCPw)
+ {
+ if (PTCPw2CanCmdData != null)
+ {
+ if (PTCPw2CanCmdData.LogicRuleDto == null)
+ {
+ PTCPw2CanCmdData.SignalCmdValue = PTCPw;
+ return;
+ }
+ PTCPw2CanCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(PTCPw, PTCPw2CanCmdData.LogicRuleDto!);
+ }
+ }
+
///
/// 更新 PTC水流量 信号
///
diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs
index 42b2645..be661ef 100644
--- a/CapMachine.Wpf/Services/MachineRtDataService.cs
+++ b/CapMachine.Wpf/Services/MachineRtDataService.cs
@@ -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!);