CAN和LIN增加报文标记

CapMachine.Wpf/ViewModels/CANConfigViewModel.cs

@@ -58,6 +58,29 @@ namespace CapMachine.Wpf.ViewModels
 
             EventAggregator.GetEvent<LogicRuleChangeEvent>().Subscribe(LogicRuleChangeEventCall);
 
+            //数据波特率
+            DataBaudRateCbxItems = new ObservableCollection<CbxItems>()
+            {
+                new CbxItems(){ Key="100000",Text="100 Kbps"},
+                new CbxItems(){ Key="125000",Text="125 Kbps"},
+                new CbxItems(){ Key="200000",Text="200 Kbps"},
+                new CbxItems(){ Key="250000",Text="250 Kbps"},
+                new CbxItems(){ Key="400000",Text="400 Kbps"},
+                new CbxItems(){ Key="500000",Text="500 Kbps"},
+                new CbxItems(){ Key="666000",Text="666 Kbps"},
+                new CbxItems(){ Key="800000",Text="800 Kbps"},
+                new CbxItems(){ Key="1000000",Text="1.0 Mbps"},
+
+                new CbxItems(){ Key="1500000",Text="1.5 Mbps"},
+                new CbxItems(){ Key="2000000",Text="2.0 Mbps"},
+                new CbxItems(){ Key="3000000",Text="3.0 Mbps"},
+                new CbxItems(){ Key="4000000",Text="4.0 Mbps"},
+                new CbxItems(){ Key="5000000",Text="5.0 Mbps"},
+                new CbxItems(){ Key="6700000",Text="6.7 Mbps"},
+                new CbxItems(){ Key="8000000",Text="8.0 Mbps"},
+                new CbxItems(){ Key="10000000",Text="10.0 Mbps"},
+            };
+
             WriteNameCbxItems = new ObservableCollection<CbxItems>()
             {
                 new CbxItems(){ Key="转速",Text="转速"},
@@ -843,6 +866,16 @@ namespace CapMachine.Wpf.ViewModels
             set { _SelectedCANConfigExdDto = value; RaisePropertyChanged(); }
         }
 
+        private ObservableCollection<CbxItems> _DataBaudRateCbxItems;
+        /// <summary>
+        /// CAN FD 数据波特率 
+        /// </summary>
+        public ObservableCollection<CbxItems> DataBaudRateCbxItems
+        {
+            get { return _DataBaudRateCbxItems; }
+            set { _DataBaudRateCbxItems = value; RaisePropertyChanged(); }
+        }
+
         private DelegateCommand<string> _CanOpCmd;
         /// <summary>
         /// CAN操作的指令