CAN的定时发送的更改和一些其他的改动

CapMachine.Wpf/Services/CanDriveService.cs

@@ -86,6 +86,45 @@ namespace CapMachine.Wpf.Services
         #region 程序驱动CAN
 
 
+
+        private bool _CanAutoHand;
+        /// <summary>
+        /// CAN 手自动 模式，自动代表接受程序步骤的数据，手动代表接受手动输入的数据
+        /// True代表自动，False代表手动
+        /// </summary>
+        public bool CanAutoHand
+        {
+            get { return _CanAutoHand; }
+            set
+            {
+                if (_CanAutoHand != value)
+                {
+                    RaisePropertyChanged();
+                    _CanAutoHand = value;
+                }
+            }
+        }
+
+
+        private bool _CanHandEnable;
+        /// <summary>
+        /// CAN 手动 模式，是否使能，用于报文的使能和非使能的数据
+        /// True代表使能，False代表禁用
+        /// </summary>
+        public bool CanHandEnable
+        {
+            get { return _CanHandEnable; }
+            set
+            {
+                if (_CanHandEnable != value)
+                {
+                    RaisePropertyChanged();
+                    _CanHandEnable = value;
+                }
+            }
+        }
+
+
         private int _AutoSpeedSv;
         /// <summary>
         /// 转速SV
@@ -93,7 +132,15 @@ namespace CapMachine.Wpf.Services
         public int AutoSpeedSv
         {
             get { return _AutoSpeedSv; }
-            set { _AutoSpeedSv = value; RaisePropertyChanged(); }
+            set
+            {
+                if (value!= _AutoSpeedSv)
+                {
+                    _AutoSpeedSv = value;
+                    RaisePropertyChanged();
+                }
+              
+            }
         }
 
 
@@ -167,7 +214,7 @@ namespace CapMachine.Wpf.Services
                 {
                     //LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto);
                     SpeedCanCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto);
-                    Console.WriteLine($"实时转换后转速值：{SpeedCanCmdData.SignalCmdValue}-SV值:{SpeedData}");
+                    //Console.WriteLine($"实时转换后转速值：{SpeedCanCmdData.SignalCmdValue}-SV值:{SpeedData}");
                 }
 
             }
@@ -184,7 +231,7 @@ namespace CapMachine.Wpf.Services
         public void UpdateCapEnableCmdData(bool IsEnable)
         {
             if (!ToomossCanDrive.IsCycleSend) return;
-
+            if (!CanAutoHand) return;
             if (EnableCanCmdData != null)
             {
                 EnableCanCmdData.SignalCmdValue = IsEnable ? 1 : 0;
@@ -194,6 +241,7 @@ namespace CapMachine.Wpf.Services
 
         /// <summary>
         /// 发送消息给CAN 驱动
+        /// 手动发送时使用
         /// </summary>
         public void SendMsgToCanDrive(double SpeedData)
         {