diff --git a/CapMachine.Wpf/Services/LinDriveService.cs b/CapMachine.Wpf/Services/LinDriveService.cs
index ecc577a..4f97a3e 100644
--- a/CapMachine.Wpf/Services/LinDriveService.cs
+++ b/CapMachine.Wpf/Services/LinDriveService.cs
@@ -239,9 +239,25 @@ namespace CapMachine.Wpf.Services
///
public void UpdateCapPTCPwCmdData(double PTCPw)
{
+ //if (PTCPwCanCmdData != null)
+ //{
+ // PTCPwCanCmdData.SignalCmdValue = PTCPw;
+ //}
+
if (PTCPwCanCmdData != null)
{
- PTCPwCanCmdData.SignalCmdValue = PTCPw;
+ //首先是否判断是有斜率
+ if (PTCPwCanCmdData.LogicRuleDto == null)
+ {
+ //没有启动逻辑规则处理
+ PTCPwCanCmdData.SignalCmdValue = PTCPw;
+ }
+ else
+ {
+ //LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto);
+ PTCPwCanCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(PTCPw, PTCPwCanCmdData.LogicRuleDto);
+ //Console.WriteLine($"实时转换后转速值:{SpeedCanCmdData.SignalCmdValue}-SV值:{SpeedData}");
+ }
}
}
@@ -251,10 +267,27 @@ namespace CapMachine.Wpf.Services
///
public void UpdateCapPTCFlowCmdData(double Flow)
{
+ //if (PTCFlowCanCmdData != null)
+ //{
+ // PTCFlowCanCmdData.SignalCmdValue = Flow;
+ //}
+
if (PTCFlowCanCmdData != null)
{
- PTCFlowCanCmdData.SignalCmdValue = Flow;
+ //首先是否判断是有斜率
+ if (PTCFlowCanCmdData.LogicRuleDto == null)
+ {
+ //没有启动逻辑规则处理
+ PTCFlowCanCmdData.SignalCmdValue = Flow;
+ }
+ else
+ {
+ //LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto);
+ PTCFlowCanCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(Flow, PTCFlowCanCmdData.LogicRuleDto);
+ //Console.WriteLine($"实时转换后转速值:{SpeedCanCmdData.SignalCmdValue}-SV值:{SpeedData}");
+ }
}
+
}
///
@@ -263,10 +296,27 @@ namespace CapMachine.Wpf.Services
///
public void UpdateCapPTCWaterTempCmdData(double WaterTemp)
{
+ //if (PTCWaterTempCanCmdData != null)
+ //{
+ // PTCWaterTempCanCmdData.SignalCmdValue = WaterTemp;
+ //}
+
if (PTCWaterTempCanCmdData != null)
{
- PTCWaterTempCanCmdData.SignalCmdValue = WaterTemp;
+ //首先是否判断是有斜率
+ if (PTCWaterTempCanCmdData.LogicRuleDto == null)
+ {
+ //没有启动逻辑规则处理
+ PTCWaterTempCanCmdData.SignalCmdValue = WaterTemp;
+ }
+ else
+ {
+ //LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto);
+ PTCWaterTempCanCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(WaterTemp, PTCWaterTempCanCmdData.LogicRuleDto);
+ //Console.WriteLine($"实时转换后转速值:{SpeedCanCmdData.SignalCmdValue}-SV值:{SpeedData}");
+ }
}
+
}
///