diff --git a/CapMachine.Wpf/CanDrive/CanDbcModel.cs b/CapMachine.Wpf/CanDrive/CanDbcModel.cs
index 8f24363..1a3541c 100644
--- a/CapMachine.Wpf/CanDrive/CanDbcModel.cs
+++ b/CapMachine.Wpf/CanDrive/CanDbcModel.cs
@@ -52,7 +52,14 @@ namespace CapMachine.Wpf.CanDrive
public string? SignalRtValue
{
get { return _SignalRtValue; }
- set { _SignalRtValue = value; RaisePropertyChanged(); }
+ set
+ {
+ if (_SignalRtValue != value)
+ {
+ _SignalRtValue = value;
+ RaisePropertyChanged();
+ }
+ }
}
private StringBuilder _SignalRtValueSb = new StringBuilder(10);
@@ -64,11 +71,11 @@ namespace CapMachine.Wpf.CanDrive
get { return _SignalRtValueSb; }
set
{
- if (_SignalRtValueSb != value)
- {
- SignalRtValue = value.ToString();
- _SignalRtValueSb = value;
- }
+ //if (_SignalRtValueSb != value)
+ //{
+ SignalRtValue = value.ToString();
+ _SignalRtValueSb = value;
+ //}
}
}
diff --git a/CapMachine.Wpf/Services/CanDriveService.cs b/CapMachine.Wpf/Services/CanDriveService.cs
index 49535db..85602b9 100644
--- a/CapMachine.Wpf/Services/CanDriveService.cs
+++ b/CapMachine.Wpf/Services/CanDriveService.cs
@@ -17,10 +17,7 @@ namespace CapMachine.Wpf.Services
///
public class CanDriveService : BindableBase
{
- ///
- /// 当前选中的CanLinConfigPro 程序
- ///
- public CanLinConfigPro SelectedCanLinConfigPro { get; set; }
+
public HighSpeedDataService HighSpeedDataService { get; }
///
@@ -35,6 +32,12 @@ namespace CapMachine.Wpf.Services
//ToomossCanDrive.StartCanDrive();
}
+ ///
+ /// 当前选中的CanLinConfigPro 程序
+ ///
+ public CanLinConfigPro SelectedCanLinConfigPro { get; set; }
+
+
///
/// 图莫斯 CAN Drive
/// ToomossCanDrive
diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs
index d3b4540..89c7151 100644
--- a/CapMachine.Wpf/Services/MachineRtDataService.cs
+++ b/CapMachine.Wpf/Services/MachineRtDataService.cs
@@ -181,6 +181,9 @@ namespace CapMachine.Wpf.Services
//TagManger.AddTag(new Tag("通讯PTC模块温度", "通讯PTC模块温度[℃]", "ComPTCMdTemp", "程序", "VW15082", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
//【SongZhi】
+
+ #region SongZhi
+
TagManger.AddTag(new Tag(new ShortTagValue())
{
Name = "转速[rpm]",//名称带单位
@@ -762,6 +765,8 @@ namespace CapMachine.Wpf.Services
Index = "",
});
+ #region
+
//TagManger.AddTag(new Tag("OCR", "OCR[%]", "OCR", "程序", "VW15014", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
//TagManger.AddTag(new Tag("HV[V]", "HV[V]", "HV", "程序", "VW15016", 100, 0, 10, "V", new ShortTagValue(), true) { DecimalPoint = 1 });
//TagManger.AddTag(new Tag("HV[A]", "HV[A]", "HVCur", "程序", "VW15018", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
diff --git a/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs b/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs
index 3c5feee..4915069 100644
--- a/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs
+++ b/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs
@@ -58,14 +58,15 @@ namespace CapMachine.Wpf.ViewModels
new CbxItems(){ Key="使能",Text="使能"},
new CbxItems(){ Key="Anti_Sleep",Text="Anti_Sleep"},
};
+
ReadNameCbxItems = new ObservableCollection()
{
- new CbxItems(){ Key="实际转速",Text="实际转速"},
- new CbxItems(){ Key="输入电压",Text="输入电压"},
- new CbxItems(){ Key="输入电流",Text="输入电流"},
- new CbxItems(){ Key="输入功率",Text="输入功率"},
- new CbxItems(){ Key="相电流",Text="相电流"},
- new CbxItems(){ Key="ECU温度",Text="ECU温度"},
+ new CbxItems(){ Key="通讯转速",Text="通讯转速"},
+ new CbxItems(){ Key="通讯母线电压",Text="通讯母线电压"},
+ new CbxItems(){ Key="通讯母线电流",Text="通讯母线电流"},
+ new CbxItems(){ Key="通讯相电流",Text="通讯相电流"},
+ new CbxItems(){ Key="通信功率",Text="通信功率"},
+ new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"},
};
InitLoadCanConfigPro();
diff --git a/CapMachine.Wpf/Views/CANConfigView.xaml b/CapMachine.Wpf/Views/CANConfigView.xaml
index 93c4e44..66edb7f 100644
--- a/CapMachine.Wpf/Views/CANConfigView.xaml
+++ b/CapMachine.Wpf/Views/CANConfigView.xaml
@@ -485,8 +485,7 @@