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

修改已知的问题

Browse Source
This commit is contained in:
Tyrone CT
2025-10-28 20:29:09 +08:00
parent b52e9f7857
commit 3b0eb86eb2
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ namespace CapMachine.Wpf.CanDrive
HighSpeedDataService = ContainerProvider.Resolve<HighSpeedDataService>();
LoggerService = logService;
monitorValueLog = new MonitorValueLog(logService, "SetSignalValue", "SyncValueToCanMsg", "ret", "CanNum", "SyncCANMsgToValue");
//monitorValueLog = new MonitorValueLog(logService, "SetSignalValue", "SyncValueToCanMsg", "ret", "CanNum", "SyncCANMsgToValue");
//Stopwatch.Frequency表示高精度计时器每秒的计数次数（ticks/秒）每毫秒的ticks数 = 每秒的ticks数 ÷ 1000
TicksPerMs = Stopwatch.Frequency / 1000.0;
@@ -1102,8 +1102,9 @@ namespace CapMachine.Wpf.CanDrive
/// <summary>
/// 监控数据
/// 查找问题用，平时不用
/// </summary>
public MonitorValueLog monitorValueLog { get; set; }
//public MonitorValueLog monitorValueLog { get; set; }
/// <summary>
/// 更新数据 测试用废弃了
@@ -1456,10 +1457,10 @@ namespace CapMachine.Wpf.CanDrive
{
//itemSignal.SignalCmdValue = random.Next(0, 100); //仿真测试数据使用
var SetSignalValue = CAN_DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder(itemMsg.Key), new StringBuilder(itemSignal.SignalName), itemSignal.SignalCmdValue);
monitorValueLog.UpdateValue1(SetSignalValue);
//monitorValueLog.UpdateValue1(SetSignalValue);
}
var SyncValueToCanMsg = CAN_DBCParser.DBC_SyncValueToCANMsg(DBCHandle, new StringBuilder(itemMsg.Key), msgPtSend);
monitorValueLog.UpdateValue2(SyncValueToCanMsg);
//monitorValueLog.UpdateValue2(SyncValueToCanMsg);
SchCanMsg[CycleUpdateIndex] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPtSend, typeof(USB2CAN.CAN_MSG));
CycleUpdateIndex++;
}
@@ -1484,13 +1485,13 @@ namespace CapMachine.Wpf.CanDrive
{
IsSendOk = true;
//Console.WriteLine($"Update CAN Schedule Success -- SchTabIndex：{(byte)0} -- MsgIndex：{(byte)(0)} ");
monitorValueLog.UpdateValue3(ret);
//monitorValueLog.UpdateValue3(ret);
}
else
{
IsSendOk = false;
//Console.WriteLine($"Update CAN Schedule Error ret = {ret} -- SchTabIndex：{(byte)0} -- MsgIndex：{(byte)(0)}");
monitorValueLog.UpdateValue3(ret);
//monitorValueLog.UpdateValue3(ret);
LoggerService.Info($"更新调度表失败，错误码：{ret}");
//return;
}
@@ -1542,7 +1543,7 @@ namespace CapMachine.Wpf.CanDrive
msgPtRead = RecvMsgBufferPtr;
CanNum = USB2CAN.CAN_GetMsgWithSize(DevHandle, ReadCANIndex, msgPtRead, RecvMsgBufferCapacity);
//int CanNum = USB2CAN.CAN_GetMsgWithSize(DevHandle, 1, msgPtRead, RecvMsgBufferCapacity);//测试用，CAN卡 CAN1和CAN2 短接时测试用
monitorValueLog.UpdateValue4(CanNum);
//monitorValueLog.UpdateValue4(CanNum);
if (CanNum > 0)
{
IsReviceOk = true;
@@ -1586,7 +1587,7 @@ namespace CapMachine.Wpf.CanDrive
}
// 将CAN消息数据填充到信号里面，用DBC解析数据（仍在锁内，避免指针被并发释放）
var SyncCANMsgToValue = CAN_DBCParser.DBC_SyncCANMsgToValue(DBCHandle, msgPtRead, CanNum);
monitorValueLog.UpdateValue5(SyncCANMsgToValue);
//monitorValueLog.UpdateValue5(SyncCANMsgToValue);
}
//循环获取消息的数据

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

@@ -143,7 +143,7 @@ namespace CapMachine.Wpf.Services
SuperHeatCoolConfig.FluidsPath = ConfigHelper.GetValue("FluidsPath");
SuperHeatCoolConfig.Cryogen = ConfigHelper.GetValue("Cryogen");
RtScanDeviceStart();
//RtScanDeviceStart();
}