huangsucan/ADP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CAN适配兼容

Browse Source
This commit is contained in:
hsc
2026-07-14 16:50:57 +08:00
parent 2fe307c142
commit aebbd88e23
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CANModule/ViewModels/ZLGCANFDViewModel.cs
View File

@@ -606,7 +606,7 @@ namespace CANModule.ViewModels
Application.Current.Dispatcher.Invoke(() => Application.Current.Dispatcher.Invoke(() =>
{ {
var msgName = System.Text.Encoding.Default.GetString(msg.strName).TrimEnd('\0'); var msgName = System.Text.Encoding.Default.GetString(msg.strName).TrimEnd('\0');
var find = CanMessageList.FirstOrDefault(s => s.报文ID == (int)msg.nID); var find = CanMessageList.FirstOrDefault(s => s.报文ID == (int)msg.nID&& s.通道==channel);
if (find != null) if (find != null)
{ {
find.通道 = (byte)channel; find.通道 = (byte)channel;

24
ZLGUSBCANFD/USBCANFD.cs
View File

@@ -151,18 +151,18 @@ namespace ZLGUSBCANFD
_receiveThreads.Clear(); _receiveThreads.Clear();
// 动态复位所有通道并释放DBC // 动态复位所有通道并释放DBC
for (uint i = 0; i < _maxChannels; i++) //for (uint i = 0; i < _maxChannels; i++)
{ //{
lock (_channelLocks[i]) // lock (_channelLocks[i])
{ // {
if (_channelHandles[i] != IntPtr.Zero) // if (_channelHandles[i] != IntPtr.Zero)
{ // {
ZLGCAN.ZCAN_ResetCAN(_channelHandles[i]); // ZLGCAN.ZCAN_ResetCAN(_channelHandles[i]);
_channelHandles[i] = IntPtr.Zero; // _channelHandles[i] = IntPtr.Zero;
} // }
释放通道DBC(i); // 释放通道DBC(i);
} // }
} //}
// 关闭设备主句柄 // 关闭设备主句柄
if (_deviceHandle != IntPtr.Zero) if (_deviceHandle != IntPtr.Zero)