TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场更改3

Browse Source
This commit is contained in:
Tyrone CT
2026-05-14 14:05:17 +08:00
parent 4f5c6949f4
commit 53ca705ab0
3 changed files with 229 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
CapMachine.Wpf/CanDrive/ToomossCan.cs
View File

@@ -25,6 +25,7 @@ namespace CapMachine.Wpf.CanDrive
public class ToomossCan : BindableBase public class ToomossCan : BindableBase
{ {
private readonly IContainerProvider ContainerProvider; private readonly IContainerProvider ContainerProvider;
private readonly object _dbcParserLock = new object();
/// <summary> /// <summary>
/// 实例化函数 /// 实例化函数
@@ -331,6 +332,8 @@ namespace CapMachine.Wpf.CanDrive
/// DBC解析 /// DBC解析
/// </summary> /// </summary>
public void DBC_Parser(string Path) public void DBC_Parser(string Path)
{
lock (_dbcParserLock)
{ {
//解析DBC文件 //解析DBC文件
DBCHandle = CAN_DBCParser.DBC_ParserFile(DevHandle, new StringBuilder(Path)); DBCHandle = CAN_DBCParser.DBC_ParserFile(DevHandle, new StringBuilder(Path));
@@ -385,6 +388,7 @@ namespace CapMachine.Wpf.CanDrive
//Dbc解析成功 //Dbc解析成功
DbcParserState = true; DbcParserState = true;
} }
}
/// <summary> /// <summary>
/// 发送CAN数据 /// 发送CAN数据
@@ -397,11 +401,16 @@ namespace CapMachine.Wpf.CanDrive
for (int i = 0; i < GroupMsg.Count(); i++) for (int i = 0; i < GroupMsg.Count(); i++)
{ {
CanMsg[i] = new USB2CAN.CAN_MSG(); CanMsg[i] = new USB2CAN.CAN_MSG();
CanMsg[i].Data = new Byte[64]; CanMsg[i].Data = new Byte[8];
} }
IntPtr msgPt = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))); IntPtr msgPt = IntPtr.Zero;
try
{
msgPt = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)));
int Index = 0; int Index = 0;
lock (_dbcParserLock)
{
//循环给MSG赋值数据 //循环给MSG赋值数据
foreach (var itemMsg in GroupMsg) foreach (var itemMsg in GroupMsg)
{ {
@@ -413,17 +422,15 @@ namespace CapMachine.Wpf.CanDrive
CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPt, typeof(USB2CAN.CAN_MSG)); CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPt, typeof(USB2CAN.CAN_MSG));
Index++; Index++;
} }
}
//设置信号值 }
//DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder("msg_moto_speed"), new StringBuilder("moto_speed"), 2412); finally
//DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder("msg_oil_pressure"), new StringBuilder("oil_pressure"), 980); {
//DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder("msg_speed_can"), new StringBuilder("speed_can"), 120); if (msgPt != IntPtr.Zero)
{
//通过DBC写入数据后生成CanMsg
//将信号值填入CAN消息里面
//释放申请的临时缓冲区
Marshal.FreeHGlobal(msgPt); Marshal.FreeHGlobal(msgPt);
}
}
Console.WriteLine(""); Console.WriteLine("");
//发送CAN数据 //发送CAN数据
int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length); int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length);
@@ -492,6 +499,11 @@ namespace CapMachine.Wpf.CanDrive
/// </summary> /// </summary>
public void StartCycleSendMsg() public void StartCycleSendMsg()
{ {
if (CycleSendTask != null && !CycleSendTask.IsCompleted)
{
return;
}
CycleSendTask = Task.Run(async () => CycleSendTask = Task.Run(async () =>
{ {
while (IsCycleSend) while (IsCycleSend)
@@ -504,11 +516,16 @@ namespace CapMachine.Wpf.CanDrive
for (int i = 0; i < GroupMsg.Count(); i++) for (int i = 0; i < GroupMsg.Count(); i++)
{ {
CanMsg[i] = new USB2CAN.CAN_MSG(); CanMsg[i] = new USB2CAN.CAN_MSG();
CanMsg[i].Data = new Byte[64]; CanMsg[i].Data = new Byte[8];
} }
IntPtr msgPtSend = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))); IntPtr msgPtSend = IntPtr.Zero;
try
{
msgPtSend = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)));
int Index = 0; int Index = 0;
lock (_dbcParserLock)
{
//循环给MSG赋值数据 //循环给MSG赋值数据
foreach (var itemMsg in GroupMsg) foreach (var itemMsg in GroupMsg)
{ {
@@ -520,11 +537,15 @@ namespace CapMachine.Wpf.CanDrive
CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPtSend, typeof(USB2CAN.CAN_MSG)); CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPtSend, typeof(USB2CAN.CAN_MSG));
Index++; Index++;
} }
//通过DBC写入数据后生成CanMsg }
//将信号值填入CAN消息里面 }
finally
//释放申请的临时缓冲区 {
if (msgPtSend != IntPtr.Zero)
{
Marshal.FreeHGlobal(msgPtSend); Marshal.FreeHGlobal(msgPtSend);
}
}
Console.WriteLine(""); Console.WriteLine("");
//发送CAN数据 //发送CAN数据
int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length); int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length);
@@ -551,17 +572,25 @@ namespace CapMachine.Wpf.CanDrive
/// </summary> /// </summary>
public void StartCycleReviceCanMsg() public void StartCycleReviceCanMsg()
{ {
if (CycleReviceTask != null && !CycleReviceTask.IsCompleted)
{
return;
}
CycleReviceTask = Task.Run(async () => CycleReviceTask = Task.Run(async () =>
{ {
while (IsCycleRevice) while (IsCycleRevice)
{ {
await Task.Delay(ReviceCycle); await Task.Delay(ReviceCycle);
try try
{
IntPtr msgPtRead = IntPtr.Zero;
try
{ {
//另外一个CAN通道读取数据 //另外一个CAN通道读取数据
USB2CAN.CAN_MSG[] CanMsgBuffer = new USB2CAN.CAN_MSG[128]; USB2CAN.CAN_MSG[] CanMsgBuffer = new USB2CAN.CAN_MSG[128];
//申请数据缓冲区 //申请数据缓冲区
IntPtr msgPtRead = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)) * CanMsgBuffer.Length); msgPtRead = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)) * CanMsgBuffer.Length);
int CanNum = USB2CAN.CAN_GetMsgWithSize(DevHandle, ReadCANIndex, msgPtRead, CanMsgBuffer.Length); int CanNum = USB2CAN.CAN_GetMsgWithSize(DevHandle, ReadCANIndex, msgPtRead, CanMsgBuffer.Length);
if (CanNum > 0) if (CanNum > 0)
{ {
@@ -600,6 +629,10 @@ namespace CapMachine.Wpf.CanDrive
} }
Console.WriteLine(""); Console.WriteLine("");
if (CanNum > 0)
{
lock (_dbcParserLock)
{
//将CAN消息数据填充到信号里面，用DBC解析数据 //将CAN消息数据填充到信号里面，用DBC解析数据
CAN_DBCParser.DBC_SyncCANMsgToValue(DBCHandle, msgPtRead, CanNum); CAN_DBCParser.DBC_SyncCANMsgToValue(DBCHandle, msgPtRead, CanNum);
@@ -609,14 +642,23 @@ namespace CapMachine.Wpf.CanDrive
//有配置的名称的，认为是有用的，则需要读取数据 //有配置的名称的，认为是有用的，则需要读取数据
//if (!string.IsNullOrEmpty(item.Name)) //if (!string.IsNullOrEmpty(item.Name))
//{ //{
CAN_DBCParser.DBC_GetSignalValueStr(DBCHandle, new StringBuilder(item.MsgName), new StringBuilder(item.SignalName), ValueSb); var valueSb = new StringBuilder(64);
item.SignalRtValueSb = ValueSb; CAN_DBCParser.DBC_GetSignalValueStr(DBCHandle, new StringBuilder(item.MsgName), new StringBuilder(item.SignalName), valueSb);
Console.Write(ValueSb.ToString()); item.SignalRtValueSb = valueSb;
Console.Write(valueSb.ToString());
//} //}
} }
}
}
}
finally
{
if (msgPtRead != IntPtr.Zero)
{
//释放数据缓冲区，必须释放，否则程序运行一段时间后会报内存不足 //释放数据缓冲区，必须释放，否则程序运行一段时间后会报内存不足
Marshal.FreeHGlobal(msgPtRead); Marshal.FreeHGlobal(msgPtRead);
}
}
Thread.Sleep(10); Thread.Sleep(10);
////获取信号值并打印出来 ////获取信号值并打印出来
@@ -662,6 +704,11 @@ namespace CapMachine.Wpf.CanDrive
/// </summary> /// </summary>
public void StartPrecisionCycleSendMsg() public void StartPrecisionCycleSendMsg()
{ {
if (CycleSendTask != null && !CycleSendTask.IsCompleted)
{
return;
}
// 创建取消标记源 用于控制任务的取消 允许在需要时通过取消令牌来优雅停止任务 // 创建取消标记源 用于控制任务的取消 允许在需要时通过取消令牌来优雅停止任务
var cancellationTokenSource = new CancellationTokenSource(); var cancellationTokenSource = new CancellationTokenSource();
var token = cancellationTokenSource.Token; var token = cancellationTokenSource.Token;
@@ -742,11 +789,16 @@ namespace CapMachine.Wpf.CanDrive
for (int i = 0; i < GroupMsg.Count(); i++) for (int i = 0; i < GroupMsg.Count(); i++)
{ {
CanMsg[i] = new USB2CAN.CAN_MSG(); CanMsg[i] = new USB2CAN.CAN_MSG();
CanMsg[i].Data = new Byte[64]; CanMsg[i].Data = new Byte[8];
} }
IntPtr msgPtSend = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))); IntPtr msgPtSend = IntPtr.Zero;
try
{
msgPtSend = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)));
int Index = 0; int Index = 0;
lock (_dbcParserLock)
{
//循环给MSG赋值数据 //循环给MSG赋值数据
foreach (var itemMsg in GroupMsg) foreach (var itemMsg in GroupMsg)
{ {
@@ -758,12 +810,15 @@ namespace CapMachine.Wpf.CanDrive
CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPtSend, typeof(USB2CAN.CAN_MSG)); CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPtSend, typeof(USB2CAN.CAN_MSG));
Index++; Index++;
} }
}
//通过DBC写入数据后生成CanMsg }
//将信号值填入CAN消息里面 finally
{
//释放申请的临时缓冲区 if (msgPtSend != IntPtr.Zero)
{
Marshal.FreeHGlobal(msgPtSend); Marshal.FreeHGlobal(msgPtSend);
}
}
//发送CAN数据 //发送CAN数据
int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length); int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length);
@@ -878,12 +933,32 @@ namespace CapMachine.Wpf.CanDrive
/// </summary> /// </summary>
public void CloseDevice() public void CloseDevice()
{ {
IsCycleRevice = false;
IsCycleSend = false;
try
{
StopCycleSendMsg();
}
catch
{
}
try
{
var task = CycleReviceTask;
if (task != null && !task.IsCompleted)
{
task.Wait(TimeSpan.FromMilliseconds(ReviceCycle + 500));
}
}
catch
{
}
//关闭设备 //关闭设备
USB_DEVICE.USB_CloseDevice(DevHandle); USB_DEVICE.USB_CloseDevice(DevHandle);
OpenState = false; OpenState = false;
DbcParserState = false; DbcParserState = false;
IsCycleRevice = false;
IsCycleSend = false;
} }
} }

2
CapMachine.Wpf/Services/CanDriveService.cs
View File

@@ -230,7 +230,7 @@ namespace CapMachine.Wpf.Services
if (ListCanDbcModel.Count > 0) if (ListCanDbcModel.Count > 0)
{ {
ToomossCanDrive.IsCycleRevice = true; ToomossCanDrive.IsCycleRevice = true;
ToomossCanDrive.StartPrecisionCycleSendMsg(); ToomossCanDrive.StartCycleReviceCanMsg();
} }
else else
{ {

13
CapMachine.Wpf/Services/MachineRtDataService.cs
View File

@@ -1119,18 +1119,16 @@ namespace CapMachine.Wpf.Services
while (ThreadEnable) while (ThreadEnable)
{ {
cycleCount++; cycleCount++;
if (cycleCount % 20 == 0) // 每10秒记录一次 if (cycleCount % 100 == 0)
{ {
LogService.Info($"RtScanDeviceStart 循环计数: {cycleCount}"); LogService.Info($"RtScanDeviceStart 循环计数: {cycleCount}");
} }
//await Task.Delay(5); await Task.Delay(50);
await Task.CompletedTask;
DiagnosticsTime.Reset(); DiagnosticsTime.Reset();
DiagnosticsTime.Start(); DiagnosticsTime.Start();
try try
{ {
LogService.Debug($"RtScanDeviceStart 开始扫描周期 {cycleCount}");
//TagInfo.RtValue.Value++; //TagInfo.RtValue.Value++;
//var data = TagManger.DicTags["转速"].ValueType.Name; //var data = TagManger.DicTags["转速"].ValueType.Name;
@@ -1186,7 +1184,6 @@ namespace CapMachine.Wpf.Services
try try
{ {
var speedValue = CanDriveService.GetDbcSpeedValueBySpeedName("通讯转速"); var speedValue = CanDriveService.GetDbcSpeedValueBySpeedName("通讯转速");
LogService.Debug($"RtScanDeviceStart 读取CAN通讯转速: {speedValue}");
SiemensDrive.Write(itemTag.Value.PVAddress, (short)speedValue); SiemensDrive.Write(itemTag.Value.PVAddress, (short)speedValue);
} }
catch (Exception ex) catch (Exception ex)
@@ -1213,7 +1210,6 @@ namespace CapMachine.Wpf.Services
try try
{ {
var voltageValue = CanDriveService.GetDbcValueByName("通讯母线电压"); var voltageValue = CanDriveService.GetDbcValueByName("通讯母线电压");
LogService.Debug($"RtScanDeviceStart 读取CAN通讯母线电压: {voltageValue}");
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(voltageValue * itemTag.Value.Precision)); SiemensDrive.Write(itemTag.Value.PVAddress, (short)(voltageValue * itemTag.Value.Precision));
} }
catch (Exception ex) catch (Exception ex)
@@ -1240,7 +1236,6 @@ namespace CapMachine.Wpf.Services
try try
{ {
var currentValue = CanDriveService.GetDbcValueByName("通讯母线电流"); var currentValue = CanDriveService.GetDbcValueByName("通讯母线电流");
LogService.Debug($"RtScanDeviceStart 读取CAN通讯母线电流: {currentValue}");
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(currentValue * itemTag.Value.Precision)); SiemensDrive.Write(itemTag.Value.PVAddress, (short)(currentValue * itemTag.Value.Precision));
} }
catch (Exception ex) catch (Exception ex)
@@ -1267,7 +1262,6 @@ namespace CapMachine.Wpf.Services
try try
{ {
var phaseCurrentValue = CanDriveService.GetDbcValueByName("通讯相电流"); var phaseCurrentValue = CanDriveService.GetDbcValueByName("通讯相电流");
LogService.Debug($"RtScanDeviceStart 读取CAN通讯相电流: {phaseCurrentValue}");
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(phaseCurrentValue * itemTag.Value.Precision)); SiemensDrive.Write(itemTag.Value.PVAddress, (short)(phaseCurrentValue * itemTag.Value.Precision));
} }
catch (Exception ex) catch (Exception ex)
@@ -1294,7 +1288,6 @@ namespace CapMachine.Wpf.Services
try try
{ {
var powerValue = CanDriveService.GetDbcValueByName("通讯功率"); var powerValue = CanDriveService.GetDbcValueByName("通讯功率");
LogService.Debug($"RtScanDeviceStart 读取CAN通讯功率: {powerValue}");
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(powerValue * itemTag.Value.Precision)); SiemensDrive.Write(itemTag.Value.PVAddress, (short)(powerValue * itemTag.Value.Precision));
} }
catch (Exception ex) catch (Exception ex)
@@ -1321,7 +1314,6 @@ namespace CapMachine.Wpf.Services
try try
{ {
var tempValue = CanDriveService.GetDbcValueByName("通讯芯片温度"); var tempValue = CanDriveService.GetDbcValueByName("通讯芯片温度");
LogService.Debug($"RtScanDeviceStart 读取CAN通讯芯片温度: {tempValue}");
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(tempValue * itemTag.Value.Precision)); SiemensDrive.Write(itemTag.Value.PVAddress, (short)(tempValue * itemTag.Value.Precision));
} }
catch (Exception ex) catch (Exception ex)
@@ -1365,7 +1357,6 @@ namespace CapMachine.Wpf.Services
{ {
var dbcValue = CanDriveService.GetDbcValueByName(itemTag.Value.NameNoUnit); var dbcValue = CanDriveService.GetDbcValueByName(itemTag.Value.NameNoUnit);
itemTag.Value.EngPvValue = dbcValue; itemTag.Value.EngPvValue = dbcValue;
LogService.Debug($"RtScanDeviceStart 回读CAN数据 {itemTag.Value.NameNoUnit}: {dbcValue}");
} }
catch (Exception ex) catch (Exception ex)
{ {