From 1dd632f76773037490c1f57c65758aaad6d87999 Mon Sep 17 00:00:00 2001
From: Tyrone CT <chongtao@yeah.net>
Date: Fri, 15 Aug 2025 19:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86PTC=20PW2=E5=9C=A8CA?=
 =?UTF-8?q?N=E5=92=8CCAN=20FD=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CapMachine.Wpf/Services/CanDriveService.cs    | 20 +++++++++++++++
 CapMachine.Wpf/Services/CanFdDriveService.cs  | 25 +++++++++++++++++++
 .../Services/MachineRtDataService.cs          |  4 +--
 3 files changed, 47 insertions(+), 2 deletions(-)

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
         /// </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>
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
         /// </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>
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!);