Compare commits
13 Commits
af337fc6f3
...
SongZhi_Pr
| Author | SHA1 | Date | |
|---|---|---|---|
| 0fb230079b | |||
| 196df6b181 | |||
| 873f6ced0a | |||
| 985ad12d63 | |||
| 53ca705ab0 | |||
| 4f5c6949f4 | |||
| 1dfcf5f77a | |||
| 4cdda056b4 | |||
| e954988fb5 | |||
| c1df40ac4c | |||
| 8b96c482f7 | |||
| d0aca2cbdb | |||
| f02e336f34 |
7
.claude/settings.local.json
Normal file
7
.claude/settings.local.json
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"permissions": {
|
||||
"allow": [
|
||||
"mcp__filesystem__directory_tree"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -261,7 +261,7 @@ namespace CapMachine.Wpf
|
||||
|
||||
//给当前的全局异常捕捉服务使用
|
||||
LogService = ContainerLocator.Container.Resolve<ILogService>();
|
||||
LogService.Error("Start-->OnInitialized");
|
||||
LogService.Info("程序启动");
|
||||
base.OnInitialized();
|
||||
|
||||
//#endregion
|
||||
@@ -289,7 +289,7 @@ namespace CapMachine.Wpf
|
||||
void App_Exit(object sender, ExitEventArgs e)
|
||||
{
|
||||
//程序退出时需要处理的业务
|
||||
LogService.Error("程序退出");
|
||||
LogService.Info("App-程序退出");
|
||||
}
|
||||
|
||||
|
||||
@@ -304,12 +304,14 @@ namespace CapMachine.Wpf
|
||||
try
|
||||
{
|
||||
HandleException(e.Exception);
|
||||
MessageBox.Show("UI线程异常:" + e.Exception.Message);
|
||||
//MessageBox.Show("UI线程异常:" + e.Exception.Message);
|
||||
LogService.Error("UI线程异常:" + e.Exception.Message);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
HandleException(ex);
|
||||
MessageBox.Show("UI线程发生致命错误！");
|
||||
//MessageBox.Show("UI线程发生致命错误！");
|
||||
LogService.Error("UI线程发生致命错误！");
|
||||
}
|
||||
finally
|
||||
{
|
||||
@@ -346,8 +348,8 @@ namespace CapMachine.Wpf
|
||||
{
|
||||
sbEx.Append(e.ExceptionObject);
|
||||
}
|
||||
MessageBox.Show(sbEx.ToString());
|
||||
|
||||
//MessageBox.Show(sbEx.ToString());
|
||||
LogService.Error(sbEx.ToString());
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -374,7 +376,8 @@ namespace CapMachine.Wpf
|
||||
{
|
||||
HandleException(exception);
|
||||
//task线程内未处理捕获
|
||||
MessageBox.Show("Task线程异常：" + e.Exception.Message);
|
||||
//MessageBox.Show("Task线程异常：" + e.Exception.Message);
|
||||
LogService.Error($"Task线程异常");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -395,7 +398,7 @@ namespace CapMachine.Wpf
|
||||
private void HandleException(Exception ex)
|
||||
{
|
||||
//记录日志
|
||||
LogService.Error(ex.ToString());
|
||||
LogService.Error($"App捕捉HandleException-{ex.ToString()}");
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,9 @@ namespace CapMachine.Wpf.CanDrive
|
||||
public class ToomossCan : BindableBase
|
||||
{
|
||||
private readonly IContainerProvider ContainerProvider;
|
||||
private readonly object _dbcParserLock = new object();
|
||||
private readonly object _canSendLock = new object();
|
||||
private const int DbcStringBufferCapacity = 256;
|
||||
|
||||
/// <summary>
|
||||
/// 实例化函数
|
||||
@@ -33,6 +36,9 @@ namespace CapMachine.Wpf.CanDrive
|
||||
{
|
||||
ContainerProvider = containerProvider;
|
||||
HighSpeedDataService = ContainerProvider.Resolve<HighSpeedDataService>();
|
||||
|
||||
//Stopwatch.Frequency表示高精度计时器每秒的计数次数（ticks/秒）每毫秒的ticks数 = 每秒的ticks数 ÷ 1000
|
||||
TicksPerMs = Stopwatch.Frequency / 1000.0;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -329,58 +335,61 @@ namespace CapMachine.Wpf.CanDrive
|
||||
/// </summary>
|
||||
public void DBC_Parser(string Path)
|
||||
{
|
||||
//解析DBC文件
|
||||
DBCHandle = CAN_DBCParser.DBC_ParserFile(DevHandle, new StringBuilder(Path));
|
||||
if (DBCHandle == 0)
|
||||
lock (_dbcParserLock)
|
||||
{
|
||||
Console.WriteLine("Parser DBC File error!");
|
||||
DbcParserState = false;
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine("Parser DBC File success!");
|
||||
}
|
||||
|
||||
ListCanDbcModel.Clear();
|
||||
|
||||
//打印DBC里面报文和信号相关信息
|
||||
int DBCMsgNum = CAN_DBCParser.DBC_GetMsgQuantity(DBCHandle);
|
||||
for (int i = 0; i < DBCMsgNum; i++)
|
||||
{
|
||||
StringBuilder MsgName = new StringBuilder(32);
|
||||
CAN_DBCParser.DBC_GetMsgName(DBCHandle, i, MsgName);
|
||||
Console.WriteLine("Msg.Name = {0}", MsgName);
|
||||
int DBCSigNum = CAN_DBCParser.DBC_GetMsgSignalQuantity(DBCHandle, MsgName);
|
||||
StringBuilder Publisher = new StringBuilder(32);
|
||||
CAN_DBCParser.DBC_GetMsgPublisher(DBCHandle, MsgName, Publisher);
|
||||
long MsgId;
|
||||
MsgId = CAN_DBCParser.DBC_GetMsgIDByName(DBCHandle, MsgName);
|
||||
|
||||
Console.Write("Signals:");
|
||||
for (int j = 0; j < DBCSigNum; j++)
|
||||
//解析DBC文件
|
||||
DBCHandle = CAN_DBCParser.DBC_ParserFile(DevHandle, new StringBuilder(Path));
|
||||
if (DBCHandle == 0)
|
||||
{
|
||||
StringBuilder SigName = new StringBuilder(32);
|
||||
CAN_DBCParser.DBC_GetMsgSignalName(DBCHandle, MsgName, j, SigName);
|
||||
Console.Write("{0} ", SigName);
|
||||
|
||||
//增加信息数据
|
||||
ListCanDbcModel.Add(new CanDbcModel()
|
||||
{
|
||||
MsgName = MsgName.ToString(),
|
||||
MsgId = "0x" + MsgId.ToString("X8"),
|
||||
SignalName = SigName.ToString(),
|
||||
SignalDesc = "",
|
||||
SignalUnit = "",
|
||||
SignalRtValue = "",
|
||||
Publisher = Publisher.ToString()
|
||||
});
|
||||
Console.WriteLine("Parser DBC File error!");
|
||||
DbcParserState = false;
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine("Parser DBC File success!");
|
||||
}
|
||||
Console.WriteLine("");
|
||||
}
|
||||
|
||||
//Dbc解析成功
|
||||
DbcParserState = true;
|
||||
ListCanDbcModel.Clear();
|
||||
|
||||
//打印DBC里面报文和信号相关信息
|
||||
int DBCMsgNum = CAN_DBCParser.DBC_GetMsgQuantity(DBCHandle);
|
||||
for (int i = 0; i < DBCMsgNum; i++)
|
||||
{
|
||||
StringBuilder MsgName = new StringBuilder(DbcStringBufferCapacity);
|
||||
CAN_DBCParser.DBC_GetMsgName(DBCHandle, i, MsgName);
|
||||
//Console.WriteLine("Msg.Name = {0}", MsgName);
|
||||
int DBCSigNum = CAN_DBCParser.DBC_GetMsgSignalQuantity(DBCHandle, MsgName);
|
||||
StringBuilder Publisher = new StringBuilder(DbcStringBufferCapacity);
|
||||
CAN_DBCParser.DBC_GetMsgPublisher(DBCHandle, MsgName, Publisher);
|
||||
long MsgId;
|
||||
MsgId = CAN_DBCParser.DBC_GetMsgIDByName(DBCHandle, MsgName);
|
||||
|
||||
//Console.Write("Signals:");
|
||||
for (int j = 0; j < DBCSigNum; j++)
|
||||
{
|
||||
StringBuilder SigName = new StringBuilder(DbcStringBufferCapacity);
|
||||
CAN_DBCParser.DBC_GetMsgSignalName(DBCHandle, MsgName, j, SigName);
|
||||
//Console.Write("{0} ", SigName);
|
||||
|
||||
//增加信息数据
|
||||
ListCanDbcModel.Add(new CanDbcModel()
|
||||
{
|
||||
MsgName = MsgName.ToString(),
|
||||
MsgId = "0x" + MsgId.ToString("X8"),
|
||||
SignalName = SigName.ToString(),
|
||||
SignalDesc = "",
|
||||
SignalUnit = "",
|
||||
SignalRtValue = "",
|
||||
Publisher = Publisher.ToString()
|
||||
});
|
||||
}
|
||||
//Console.WriteLine("");
|
||||
}
|
||||
|
||||
//Dbc解析成功
|
||||
DbcParserState = true;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -389,48 +398,77 @@ namespace CapMachine.Wpf.CanDrive
|
||||
/// </summary>
|
||||
public void SendCanMsg(List<CanCmdData> CmdData)
|
||||
{
|
||||
var GroupMsg = CmdData.GroupBy(x => x.MsgName);
|
||||
USB2CAN.CAN_MSG[] CanMsg = new USB2CAN.CAN_MSG[GroupMsg.Count()];
|
||||
for (int i = 0; i < GroupMsg.Count(); i++)
|
||||
{
|
||||
CanMsg[i] = new USB2CAN.CAN_MSG();
|
||||
CanMsg[i].Data = new Byte[64];
|
||||
}
|
||||
SendCanMessagesByDbc(CmdData);
|
||||
}
|
||||
|
||||
IntPtr msgPt = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)));
|
||||
int Index = 0;
|
||||
//循环给MSG赋值数据
|
||||
foreach (var itemMsg in GroupMsg)
|
||||
{
|
||||
foreach (var itemSignal in itemMsg)
|
||||
private void SendCanMessagesByDbc(IEnumerable<CanCmdData> sourceCmdData)
|
||||
{
|
||||
var cmdDataSnapshot = sourceCmdData
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x.MsgName) && !string.IsNullOrWhiteSpace(x.SignalName))
|
||||
.Select(x => new CanCmdData
|
||||
{
|
||||
CAN_DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder(itemMsg.Key), new StringBuilder(itemSignal.SignalName), itemSignal.SignalCmdValue);
|
||||
ConfigName = x.ConfigName,
|
||||
MsgName = x.MsgName,
|
||||
SignalName = x.SignalName,
|
||||
SignalCmdValue = x.SignalCmdValue
|
||||
})
|
||||
.ToList();
|
||||
if (cmdDataSnapshot.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var groupMsg = cmdDataSnapshot.GroupBy(x => x.MsgName).ToList();
|
||||
int msgCount = groupMsg.Count;
|
||||
|
||||
IntPtr msgPt = IntPtr.Zero;
|
||||
IntPtr sendBufferPtr = IntPtr.Zero;
|
||||
try
|
||||
{
|
||||
int canMsgSize = Marshal.SizeOf(typeof(USB2CAN.CAN_MSG));
|
||||
msgPt = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)));
|
||||
sendBufferPtr = Marshal.AllocHGlobal(canMsgSize * msgCount);
|
||||
byte[] frameBytes = new byte[canMsgSize];
|
||||
int index = 0;
|
||||
lock (_canSendLock)
|
||||
{
|
||||
lock (_dbcParserLock)
|
||||
{
|
||||
//循环给MSG赋值数据
|
||||
foreach (var itemMsg in groupMsg)
|
||||
{
|
||||
foreach (var itemSignal in itemMsg)
|
||||
{
|
||||
int setResult = CAN_DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder(itemMsg.Key), new StringBuilder(itemSignal.SignalName), itemSignal.SignalCmdValue);
|
||||
if (setResult != CAN_DBCParser.DBC_PARSER_OK)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
int syncResult = CAN_DBCParser.DBC_SyncValueToCANMsg(DBCHandle, new StringBuilder(itemMsg.Key), msgPt);
|
||||
if (syncResult != CAN_DBCParser.DBC_PARSER_OK)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var targetPtr = IntPtr.Add(sendBufferPtr, index * canMsgSize);
|
||||
Marshal.Copy(msgPt, frameBytes, 0, canMsgSize);
|
||||
Marshal.Copy(frameBytes, 0, targetPtr, canMsgSize);
|
||||
index++;
|
||||
}
|
||||
}
|
||||
USB2CAN.CAN_SendMsgByPtr(DevHandle, WriteCANIndex, sendBufferPtr, (uint)msgCount);
|
||||
}
|
||||
CAN_DBCParser.DBC_SyncValueToCANMsg(DBCHandle, new StringBuilder(itemMsg.Key), msgPt);
|
||||
CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPt, typeof(USB2CAN.CAN_MSG));
|
||||
Index++;
|
||||
}
|
||||
|
||||
//设置信号值
|
||||
//DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder("msg_moto_speed"), new StringBuilder("moto_speed"), 2412);
|
||||
//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);
|
||||
|
||||
//通过DBC写入数据后生成CanMsg
|
||||
//将信号值填入CAN消息里面
|
||||
|
||||
//释放申请的临时缓冲区
|
||||
Marshal.FreeHGlobal(msgPt);
|
||||
Console.WriteLine("");
|
||||
//发送CAN数据
|
||||
int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length);
|
||||
if (SendedNum >= 0)
|
||||
finally
|
||||
{
|
||||
Console.WriteLine("Success send frames:{0}", SendedNum);
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine("Send CAN data failed! {0}", SendedNum);
|
||||
if (msgPt != IntPtr.Zero)
|
||||
{
|
||||
Marshal.FreeHGlobal(msgPt);
|
||||
}
|
||||
if (sendBufferPtr != IntPtr.Zero)
|
||||
{
|
||||
Marshal.FreeHGlobal(sendBufferPtr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -489,6 +527,11 @@ namespace CapMachine.Wpf.CanDrive
|
||||
/// </summary>
|
||||
public void StartCycleSendMsg()
|
||||
{
|
||||
if (CycleSendTask != null && !CycleSendTask.IsCompleted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
CycleSendTask = Task.Run(async () =>
|
||||
{
|
||||
while (IsCycleSend)
|
||||
@@ -496,43 +539,7 @@ namespace CapMachine.Wpf.CanDrive
|
||||
await Task.Delay(SendCycle);
|
||||
try
|
||||
{
|
||||
var GroupMsg = CmdData.GroupBy(x => x.MsgName);
|
||||
USB2CAN.CAN_MSG[] CanMsg = new USB2CAN.CAN_MSG[GroupMsg.Count()];
|
||||
for (int i = 0; i < GroupMsg.Count(); i++)
|
||||
{
|
||||
CanMsg[i] = new USB2CAN.CAN_MSG();
|
||||
CanMsg[i].Data = new Byte[64];
|
||||
}
|
||||
|
||||
IntPtr msgPtSend = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)));
|
||||
int Index = 0;
|
||||
//循环给MSG赋值数据
|
||||
foreach (var itemMsg in GroupMsg)
|
||||
{
|
||||
foreach (var itemSignal in itemMsg)
|
||||
{
|
||||
CAN_DBCParser.DBC_SetSignalValue(DBCHandle, new StringBuilder(itemMsg.Key), new StringBuilder(itemSignal.SignalName), itemSignal.SignalCmdValue);
|
||||
}
|
||||
CAN_DBCParser.DBC_SyncValueToCANMsg(DBCHandle, new StringBuilder(itemMsg.Key), msgPtSend);
|
||||
CanMsg[Index] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure(msgPtSend, typeof(USB2CAN.CAN_MSG));
|
||||
Index++;
|
||||
}
|
||||
//通过DBC写入数据后生成CanMsg
|
||||
//将信号值填入CAN消息里面
|
||||
|
||||
//释放申请的临时缓冲区
|
||||
Marshal.FreeHGlobal(msgPtSend);
|
||||
Console.WriteLine("");
|
||||
//发送CAN数据
|
||||
int SendedNum = USB2CAN.CAN_SendMsg(DevHandle, WriteCANIndex, CanMsg, (uint)CanMsg.Length);
|
||||
if (SendedNum >= 0)
|
||||
{
|
||||
Console.WriteLine("Success send frames:{0}", SendedNum);
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine("Send CAN data failed! {0}", SendedNum);
|
||||
}
|
||||
SendCanMessagesByDbc(CmdData);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -548,6 +555,11 @@ namespace CapMachine.Wpf.CanDrive
|
||||
/// </summary>
|
||||
public void StartCycleReviceCanMsg()
|
||||
{
|
||||
if (CycleReviceTask != null && !CycleReviceTask.IsCompleted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
CycleReviceTask = Task.Run(async () =>
|
||||
{
|
||||
while (IsCycleRevice)
|
||||
@@ -555,65 +567,74 @@ namespace CapMachine.Wpf.CanDrive
|
||||
await Task.Delay(ReviceCycle);
|
||||
try
|
||||
{
|
||||
//另外一个CAN通道读取数据
|
||||
USB2CAN.CAN_MSG[] CanMsgBuffer = new USB2CAN.CAN_MSG[128];
|
||||
//申请数据缓冲区
|
||||
IntPtr msgPtRead = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)) * CanMsgBuffer.Length);
|
||||
int CanNum = USB2CAN.CAN_GetMsgWithSize(DevHandle, ReadCANIndex, msgPtRead, CanMsgBuffer.Length);
|
||||
if (CanNum > 0)
|
||||
IntPtr msgPtRead = IntPtr.Zero;
|
||||
try
|
||||
{
|
||||
Console.WriteLine("Read CanMsgNum = {0}", CanNum);
|
||||
for (int i = 0; i < CanNum; i++)
|
||||
//另外一个CAN通道读取数据
|
||||
USB2CAN.CAN_MSG[] CanMsgBuffer = new USB2CAN.CAN_MSG[128];
|
||||
//申请数据缓冲区
|
||||
msgPtRead = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(USB2CAN.CAN_MSG)) * CanMsgBuffer.Length);
|
||||
int CanNum = USB2CAN.CAN_GetMsgWithSize(DevHandle, ReadCANIndex, msgPtRead, CanMsgBuffer.Length);
|
||||
if (CanNum > 0)
|
||||
{
|
||||
//CanMsgBuffer[i] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure((IntPtr)((UInt32)msgPtRead + i * Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))), typeof(USB2CAN.CAN_MSG)); //有溢出报错
|
||||
CanMsgBuffer[i] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure((IntPtr)(msgPtRead + i * Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))), typeof(USB2CAN.CAN_MSG));
|
||||
|
||||
Console.WriteLine("CanMsg[{0}].ID = 0x{1}", i, CanMsgBuffer[i].ID.ToString("X8"));
|
||||
Console.WriteLine("CanMsg[{0}].TimeStamp = {1}", i, CanMsgBuffer[i].TimeStamp);
|
||||
Console.Write("CanMsg[{0}].Data = ", i);
|
||||
for (int j = 0; j < CanMsgBuffer[i].DataLen; j++)
|
||||
for (int i = 0; i < CanNum; i++)
|
||||
{
|
||||
Console.Write("{0} ", CanMsgBuffer[i].Data[j].ToString("X2"));
|
||||
//CanMsgBuffer[i] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure((IntPtr)((UInt32)msgPtRead + i * Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))), typeof(USB2CAN.CAN_MSG)); //有溢出报错
|
||||
CanMsgBuffer[i] = (USB2CAN.CAN_MSG)Marshal.PtrToStructure((IntPtr)(msgPtRead + i * Marshal.SizeOf(typeof(USB2CAN.CAN_MSG))), typeof(USB2CAN.CAN_MSG));
|
||||
|
||||
//Console.WriteLine("CanMsg[{0}].ID = 0x{1}", i, CanMsgBuffer[i].ID.ToString("X8"));
|
||||
//Console.WriteLine("CanMsg[{0}].TimeStamp = {1}", i, CanMsgBuffer[i].TimeStamp);
|
||||
//Console.Write("CanMsg[{0}].Data = ", i);
|
||||
//Console.WriteLine("");
|
||||
|
||||
//报文给高速记录的服务
|
||||
HighSpeedDataService.AppendOrUpdateMsg(new Models.HighSpeed.CommMsg()
|
||||
{
|
||||
Category = "CAN",
|
||||
MsgInfo = "0x" + CanMsgBuffer[i].ID.ToString("X8"),
|
||||
MsgData = BitConverter.ToString(CanMsgBuffer[i].Data),
|
||||
Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")
|
||||
});
|
||||
}
|
||||
Console.WriteLine("");
|
||||
|
||||
//报文给高速记录的服务
|
||||
HighSpeedDataService.AppendOrUpdateMsg(new Models.HighSpeed.CommMsg()
|
||||
}
|
||||
else if (CanNum == 0)
|
||||
{
|
||||
//Console.WriteLine("No CAN data!");
|
||||
}
|
||||
else
|
||||
{
|
||||
//Console.WriteLine("Get CAN data error!");
|
||||
}
|
||||
if (CanNum > 0)
|
||||
{
|
||||
lock (_dbcParserLock)
|
||||
{
|
||||
Category = "CAN",
|
||||
MsgInfo = "0x" + CanMsgBuffer[i].ID.ToString("X8"),
|
||||
MsgData = BitConverter.ToString(CanMsgBuffer[i].Data),
|
||||
Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")
|
||||
});
|
||||
//将CAN消息数据填充到信号里面，用DBC解析数据
|
||||
CAN_DBCParser.DBC_SyncCANMsgToValue(DBCHandle, msgPtRead, CanNum);
|
||||
|
||||
double[] valueDouble = new double[1];
|
||||
//循环获取消息的数据
|
||||
foreach (var item in ListCanDbcModel)
|
||||
{
|
||||
//有配置的名称的，认为是有用的，则需要读取数据
|
||||
//if (!string.IsNullOrEmpty(item.Name))
|
||||
//{
|
||||
valueDouble[0] = 0;
|
||||
CAN_DBCParser.DBC_GetSignalValue(DBCHandle, new StringBuilder(item.MsgName), new StringBuilder(item.SignalName), valueDouble);
|
||||
item.SignalRtValue = valueDouble[0].ToString();
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (CanNum == 0)
|
||||
finally
|
||||
{
|
||||
Console.WriteLine("No CAN data!");
|
||||
if (msgPtRead != IntPtr.Zero)
|
||||
{
|
||||
//释放数据缓冲区，必须释放，否则程序运行一段时间后会报内存不足
|
||||
Marshal.FreeHGlobal(msgPtRead);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine("Get CAN data error!");
|
||||
}
|
||||
Console.WriteLine("");
|
||||
|
||||
//将CAN消息数据填充到信号里面，用DBC解析数据
|
||||
CAN_DBCParser.DBC_SyncCANMsgToValue(DBCHandle, msgPtRead, CanNum);
|
||||
|
||||
//循环获取消息的数据
|
||||
foreach (var item in ListCanDbcModel)
|
||||
{
|
||||
//有配置的名称的，认为是有用的，则需要读取数据
|
||||
//if (!string.IsNullOrEmpty(item.Name))
|
||||
//{
|
||||
CAN_DBCParser.DBC_GetSignalValueStr(DBCHandle, new StringBuilder(item.MsgName), new StringBuilder(item.SignalName), ValueSb);
|
||||
item.SignalRtValueSb = ValueSb;
|
||||
Console.Write(ValueSb.ToString());
|
||||
//}
|
||||
}
|
||||
|
||||
//释放数据缓冲区，必须释放，否则程序运行一段时间后会报内存不足
|
||||
Marshal.FreeHGlobal(msgPtRead);
|
||||
Thread.Sleep(10);
|
||||
|
||||
////获取信号值并打印出来
|
||||
@@ -633,6 +654,159 @@ namespace CapMachine.Wpf.CanDrive
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#region 精确发送报文数据
|
||||
|
||||
// 添加取消标记源字段用于停止任务
|
||||
private CancellationTokenSource CycleSendCts;
|
||||
|
||||
/// <summary>
|
||||
/// 计算每毫秒对应的ticks数（只需计算一次）
|
||||
/// </summary>
|
||||
private double TicksPerMs;
|
||||
|
||||
// 类成员变量定义 精确记时用
|
||||
private readonly Stopwatch Stopwatcher = new Stopwatch();
|
||||
private long NextExecutionTime;
|
||||
// 计算需要等待的时间
|
||||
private long CurrentTime;
|
||||
private long DelayTicks;
|
||||
private int DelayMs;
|
||||
|
||||
private static readonly Random _random = new Random();
|
||||
|
||||
/// <summary>
|
||||
/// 精确周期发送CAN数据
|
||||
/// </summary>
|
||||
public void StartPrecisionCycleSendMsg()
|
||||
{
|
||||
if (CycleSendTask != null && !CycleSendTask.IsCompleted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// 创建取消标记源 用于控制任务的取消 允许在需要时通过取消令牌来优雅停止任务
|
||||
var cancellationTokenSource = new CancellationTokenSource();
|
||||
var token = cancellationTokenSource.Token;
|
||||
|
||||
// 保存取消标记，以便在停止时使用
|
||||
CycleSendCts = cancellationTokenSource;//将取消标记源保存到类的成员变量CycleSendCts，这样在外部调用停止方法时可以访问它
|
||||
NextExecutionTime = 0;//初始化NextExecutionTime为0，这个变量用于记录下一次执行的目标时间点
|
||||
|
||||
CycleSendTask = Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
// 设置当前线程为高优先级
|
||||
Thread.CurrentThread.Priority = ThreadPriority.AboveNormal;
|
||||
|
||||
// 初始化完成后开始计时
|
||||
Stopwatcher.Restart();
|
||||
// 预先计算固定值
|
||||
long CycleInTicks = (long)(SendCycle * TicksPerMs);
|
||||
//临时测试用
|
||||
//long lastTicks = Stopwatcher.ElapsedTicks;
|
||||
//IsCycleSend
|
||||
while (IsCycleSend && !token.IsCancellationRequested)
|
||||
{
|
||||
try
|
||||
{
|
||||
// 计算下一次执行时间点 ，将当前设置的发送周期SendCycle(毫秒)转换为Stopwatch的计时单位(tick)，累加到NextExecutionTime上
|
||||
NextExecutionTime += CycleInTicks; // 转换为Stopwatch计时单位
|
||||
|
||||
// 获取当前时间点，以Stopwatch的tick为单位
|
||||
CurrentTime = Stopwatcher.ElapsedTicks;
|
||||
//计算需要等待的时间，即目标时间点(NextExecutionTime)与当前时间点(CurrentTime)的差值
|
||||
DelayTicks = NextExecutionTime - CurrentTime;
|
||||
|
||||
// 如果还有等待时间，则等待，只有在目标时间点还未到达时才执行等待
|
||||
if (DelayTicks > 0)
|
||||
{
|
||||
////此时是需要等待的，那么需要等待多久呢， 将需等待的tick数转换回毫秒
|
||||
DelayMs = (int)(DelayTicks / TicksPerMs);
|
||||
//20这个数据是预估和测试的，可能跟Windows抖动误差就是20ms左右，当然可以不用这个IF()判断，直接SpinWait.SpinUntil(() => Stopwatcher.ElapsedTicks >= NextExecutionTime);但是会导致当前独占一个CPU核心线程
|
||||
//所以设置一个20的阈值，20ms以下的延迟使用SpinWait.SpinUntil进行自旋等待，20ms以上的延迟使用Task.Delay进行异步等待，让CPU不至于一直的独占
|
||||
if (DelayMs <= 20)
|
||||
{
|
||||
SpinWait.SpinUntil(() => Stopwatcher.ElapsedTicks >= NextExecutionTime);
|
||||
}
|
||||
else
|
||||
{
|
||||
////使用Task.Delay进行异步等待，大部分等待时间通过这种方式完成，避免线程阻塞
|
||||
await Task.Delay(DelayMs - 20, token);
|
||||
//// 使用SpinWait.SpinUntil进行精确的微调等待。自旋等待会占用CPU资源，但能提供更高的定时精度，确保在精确的时间点执行
|
||||
////上面的Task.Delay可能会因为系统调度等原因导致实际执行时间稍晚于预期，因此在这里使用SpinWait.SpinUntil来确保在精确的时间点执行
|
||||
SpinWait.SpinUntil(() => Stopwatcher.ElapsedTicks >= NextExecutionTime);
|
||||
}
|
||||
}
|
||||
|
||||
// 如果已经超过了计划时间，立即执行并重新校准
|
||||
if (Stopwatcher.ElapsedTicks >= NextExecutionTime + CycleInTicks)
|
||||
{
|
||||
//检测是否发生了严重延迟(超过一个周期)。如果当前时间已经超过了下一次计划时间，则说明系统负载过高或其他原因导致无法按时执行，
|
||||
//此时重置NextExecutionTime为当前时间，避免连续的延迟累积
|
||||
// 严重延迟，重新校准
|
||||
NextExecutionTime = Stopwatcher.ElapsedTicks;
|
||||
Console.WriteLine("定时发送延迟过大，重新校准时间");
|
||||
}
|
||||
|
||||
// 使用Stopwatch记录实际的执行间隔，而不是DateTime
|
||||
//Console.WriteLine($"--实际间隔(ms): {(Stopwatcher.ElapsedTicks - lastTicks) / TicksPerMs:F3}, 目标: {SendCycle}");
|
||||
//lastTicks = Stopwatcher.ElapsedTicks;
|
||||
|
||||
//Console.WriteLine($"--当前时间(毫秒): {DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}");
|
||||
|
||||
|
||||
// 执行发送CAN逻辑
|
||||
{
|
||||
SendCanMessagesByDbc(CmdData);
|
||||
}
|
||||
|
||||
}
|
||||
catch (TaskCanceledException)
|
||||
{
|
||||
// 任务被取消，正常退出
|
||||
break;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"CAN周期发送异常: {ex.Message}");
|
||||
// 短暂暂停避免异常情况下CPU占用过高
|
||||
await Task.Delay(10, token);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 确保在任何情况下（正常退出、异常、取消）都会停止计时器
|
||||
Stopwatcher.Stop();
|
||||
|
||||
// 清理其他可能的资源
|
||||
Console.WriteLine("CAN周期发送任务已结束，资源已清理");
|
||||
}
|
||||
finally
|
||||
{
|
||||
// 确保在任何情况下（正常退出、异常、取消）都会停止计时器
|
||||
Stopwatcher.Stop();
|
||||
}
|
||||
|
||||
}, token);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 修改停止发送的方法
|
||||
/// </summary>
|
||||
public void StopCycleSendMsg()
|
||||
{
|
||||
IsCycleSend = false;
|
||||
CycleSendCts?.Cancel();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 接受CAN消息
|
||||
/// </summary>
|
||||
@@ -686,12 +860,32 @@ namespace CapMachine.Wpf.CanDrive
|
||||
/// </summary>
|
||||
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);
|
||||
OpenState = false;
|
||||
DbcParserState = false;
|
||||
IsCycleRevice = false;
|
||||
IsCycleSend = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -108,6 +108,8 @@ namespace CapMachine.Wpf.CanDrive
|
||||
public static extern Int32 CAN_StopGetMsg(Int32 DevHandle, Byte CANIndex);
|
||||
[DllImport("USB2XXX.dll")]
|
||||
public static extern Int32 CAN_SendMsg(Int32 DevHandle, Byte CANIndex, CAN_MSG[] pCanSendMsg, UInt32 SendMsgNum);
|
||||
[DllImport("USB2XXX.dll", EntryPoint = "CAN_SendMsg")]
|
||||
public static extern Int32 CAN_SendMsgByPtr(Int32 DevHandle, Byte CANIndex, IntPtr pCanSendMsg, UInt32 SendMsgNum);
|
||||
[DllImport("USB2XXX.dll")]
|
||||
public static extern Int32 CAN_GetMsg(Int32 DevHandle, Byte CANIndex, IntPtr pCanGetMsg);
|
||||
[DllImport("USB2XXX.dll")]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net6.0-windows</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
@@ -15,6 +15,7 @@
|
||||
<None Remove="Assets\Images\favicon.ico" />
|
||||
<None Remove="Assets\Images\Logo.png" />
|
||||
<None Remove="Assets\Images\参考工艺图.png" />
|
||||
<None Remove="NLog.config" />
|
||||
<None Remove="PPCalculation\REFPROP\FLUIDS\13BUTADIENE.FLD" />
|
||||
<None Remove="PPCalculation\REFPROP\FLUIDS\1BUTENE.FLD" />
|
||||
<None Remove="PPCalculation\REFPROP\FLUIDS\1BUTYNE.FLD" />
|
||||
@@ -184,6 +185,9 @@
|
||||
<Content Include="Assets\Images\Logo.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="NLog.config">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="PPCalculation\REFPROP\FLUIDS\13BUTADIENE.FLD">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
||||
@@ -43,10 +43,22 @@ namespace CapMachine.Wpf.Converts
|
||||
//int second = TotalSec % 60;
|
||||
|
||||
//return string.Format("{0}:{1}:{2}", hour, minute, second);
|
||||
////Console.WriteLine(result);
|
||||
//////Console.WriteLine(result);
|
||||
|
||||
TimeSpan TimeInfo = TimeSpan.FromSeconds(TotalSec);
|
||||
return TimeInfo.ToString();
|
||||
//TimeSpan TimeInfo = TimeSpan.FromSeconds(TotalSec);
|
||||
//return TimeInfo.ToString();
|
||||
|
||||
return ConvertSecToTimeStr(TotalSec);
|
||||
}
|
||||
|
||||
private string ConvertSecToTimeStr(int totalSeconds)
|
||||
{
|
||||
int hours = totalSeconds / 3600;
|
||||
int remainingSeconds = totalSeconds % 3600;
|
||||
int minutes = remainingSeconds / 60;
|
||||
int seconds = remainingSeconds % 60;
|
||||
|
||||
return $"{hours}:{minutes:D2}:{seconds:D2}";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -57,8 +69,9 @@ namespace CapMachine.Wpf.Converts
|
||||
{
|
||||
try
|
||||
{
|
||||
TimeSpan TimeInfo = TimeSpan.Parse(timeString);
|
||||
return (int)TimeInfo.TotalSeconds;
|
||||
//TimeSpan TimeInfo = TimeSpan.Parse(timeString);
|
||||
//return (int)TimeInfo.TotalSeconds;
|
||||
return ConvertTimeStrToSecs(timeString);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -68,5 +81,23 @@ namespace CapMachine.Wpf.Converts
|
||||
|
||||
|
||||
}
|
||||
|
||||
public int ConvertTimeStrToSecs(string timeString)
|
||||
{
|
||||
string[] parts = timeString.Split(':');
|
||||
if (parts.Length != 3) return 0;
|
||||
//throw new FormatException("Invalid time format. Use 'hh:mm:ss'");
|
||||
|
||||
if (!int.TryParse(parts[0], out int hours) || hours < 0) return 0;
|
||||
//throw new ArgumentException("小時必須為非負整數");
|
||||
|
||||
if (!int.TryParse(parts[1], out int minutes) || minutes < 0 || minutes >= 60) return 0;
|
||||
//throw new ArgumentException("分鐘必須為 0-59 的整數");
|
||||
|
||||
if (!int.TryParse(parts[2], out int seconds) || seconds < 0 || seconds >= 60) return 0;
|
||||
//throw new ArgumentException("秒必須為 0-59 的整數");
|
||||
|
||||
return hours * 3600 + minutes * 60 + seconds;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,6 +72,8 @@ namespace CapMachine.Wpf.Models.Tag
|
||||
get { return _OperateResultSource; }
|
||||
set
|
||||
{
|
||||
if (value!.Content == null) return;
|
||||
|
||||
switch (ValueType)
|
||||
{
|
||||
case DataType.Short:
|
||||
|
||||
@@ -102,6 +102,7 @@ namespace CapMachine.Wpf.Services
|
||||
/// 在程序配置好后就确定要发送哪些数据
|
||||
/// </summary>
|
||||
public List<CanCmdData> CmdData { get; set; } = new List<CanCmdData>();
|
||||
private readonly object _cmdDataLock = new object();
|
||||
|
||||
/// <summary>
|
||||
/// 增加发送的指令数据
|
||||
@@ -128,7 +129,10 @@ namespace CapMachine.Wpf.Services
|
||||
break;
|
||||
}
|
||||
//添加到发送数据集合
|
||||
CmdData.Add(SendCanCmdData);
|
||||
lock (_cmdDataLock)
|
||||
{
|
||||
CmdData.Add(SendCanCmdData);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -141,7 +145,10 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
if (SpeedCanCmdData != null)
|
||||
{
|
||||
SpeedCanCmdData.SignalCmdValue = SpeedData;
|
||||
lock (_cmdDataLock)
|
||||
{
|
||||
SpeedCanCmdData.SignalCmdValue = SpeedData;
|
||||
}
|
||||
}
|
||||
//if (EnableCanCmdData != null)
|
||||
//{
|
||||
@@ -157,7 +164,10 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
if (EnableCanCmdData != null)
|
||||
{
|
||||
EnableCanCmdData.SignalCmdValue = IsEnable ? 1 : 0;
|
||||
lock (_cmdDataLock)
|
||||
{
|
||||
EnableCanCmdData.SignalCmdValue = IsEnable ? 1 : 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,7 +184,18 @@ namespace CapMachine.Wpf.Services
|
||||
//更新速度信息
|
||||
UpdateSpeedCmdData(SpeedData);
|
||||
|
||||
ToomossCanDrive.SendCanMsg(CmdData);
|
||||
List<CanCmdData> cmdDataSnapshot;
|
||||
lock (_cmdDataLock)
|
||||
{
|
||||
cmdDataSnapshot = CmdData.Select(x => new CanCmdData
|
||||
{
|
||||
ConfigName = x.ConfigName,
|
||||
MsgName = x.MsgName,
|
||||
SignalName = x.SignalName,
|
||||
SignalCmdValue = x.SignalCmdValue
|
||||
}).ToList();
|
||||
}
|
||||
ToomossCanDrive.SendCanMsg(cmdDataSnapshot);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -255,10 +276,10 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
if (!ToomossCanDrive.IsCycleRevice) return 0;
|
||||
|
||||
if (ListCanDbcModel.Any(a => a.Name == Name))
|
||||
var dbcModel = ListCanDbcModel.FindFirst(a => a.Name == Name);
|
||||
if (dbcModel != null && !string.IsNullOrWhiteSpace(dbcModel.SignalRtValue))
|
||||
{
|
||||
//double.TryParse(ListCanDbcModel.FindFirst(a => a.Name == Name).SignalRtValue, out double Result1);
|
||||
return double.TryParse(ListCanDbcModel.FindFirst(a => a.Name == Name).SignalRtValue.Split(" ")[0], out double Result) == true ? Result : 0;
|
||||
return double.TryParse(dbcModel.SignalRtValue.Split(" ")[0], out double Result) == true ? Result : 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -274,10 +295,10 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
if (!ToomossCanDrive.IsCycleRevice) return 0;
|
||||
|
||||
if (ListCanDbcModel.Any(a => a.Name == Name))
|
||||
var dbcModel = ListCanDbcModel.FindFirst(a => a.Name == Name);
|
||||
if (dbcModel != null && !string.IsNullOrWhiteSpace(dbcModel.SignalRtValue))
|
||||
{
|
||||
//double.TryParse(ListCanDbcModel.FindFirst(a => a.Name == Name).SignalRtValue, out double Result1);
|
||||
return double.TryParse(ListCanDbcModel.FindFirst(a => a.Name == Name).SignalRtValue.Split(" ")[0], out double Result) == true ? Result : 0;
|
||||
return double.TryParse(dbcModel.SignalRtValue.Split(" ")[0], out double Result) == true ? Result : 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@ namespace CapMachine.Wpf.Services
|
||||
public CanDriveService CanDriveService { get; }
|
||||
public LinDriveService LinDriveService { get; }
|
||||
public SysRunService SysRunService { get; }
|
||||
public ILogService LogService { get; }
|
||||
|
||||
/// <summary>
|
||||
/// PLCScanTask扫描Task
|
||||
@@ -112,7 +113,7 @@ namespace CapMachine.Wpf.Services
|
||||
/// </summary>
|
||||
/// <param name="eventAggregator"></param>
|
||||
public MachineRtDataService(IEventAggregator eventAggregator, AlarmService alarmService, ConfigService configService,
|
||||
CanDriveService canDriveService, LinDriveService linDriveService, SysRunService sysRunService)//, AlarmService alarmService
|
||||
CanDriveService canDriveService, LinDriveService linDriveService, SysRunService sysRunService, ILogService logService)//, AlarmService alarmService
|
||||
{
|
||||
//ConcurrentDictionary<DateTime, RecordInfo> keyValuePairs = new ConcurrentDictionary<DateTime, RecordInfo>();
|
||||
|
||||
@@ -130,6 +131,7 @@ namespace CapMachine.Wpf.Services
|
||||
CanDriveService = canDriveService;
|
||||
LinDriveService = linDriveService;
|
||||
SysRunService = sysRunService;
|
||||
LogService = logService;
|
||||
|
||||
//秒触发一次
|
||||
CycleTimer = new System.Timers.Timer(500);
|
||||
@@ -1108,14 +1110,20 @@ namespace CapMachine.Wpf.Services
|
||||
/// </summary>
|
||||
private void RtScanDeviceStart()
|
||||
{
|
||||
LogService.Info("RtScanDeviceStart 开始启动 PLC 扫描线程");
|
||||
PLCScanTask = Task.Run(async () =>
|
||||
{
|
||||
Stopwatch stopwatch = new Stopwatch();
|
||||
int cycleCount = 0;
|
||||
|
||||
while (ThreadEnable)
|
||||
{
|
||||
//await Task.Delay(5);
|
||||
await Task.CompletedTask;
|
||||
cycleCount++;
|
||||
if (cycleCount % 100 == 0)
|
||||
{
|
||||
LogService.Info($"RtScanDeviceStart 循环计数: {cycleCount}");
|
||||
}
|
||||
await Task.Delay(50);
|
||||
|
||||
DiagnosticsTime.Reset();
|
||||
DiagnosticsTime.Start();
|
||||
@@ -1134,6 +1142,7 @@ namespace CapMachine.Wpf.Services
|
||||
// IsShowCount = 0;
|
||||
// IsValueShow = true;
|
||||
//}
|
||||
|
||||
foreach (var itemTag in TagManger.DicTags)
|
||||
{
|
||||
//TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value = (short)random.Next(0, 100);
|
||||
@@ -1172,7 +1181,15 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanDriveService.GetDbcSpeedValueBySpeedName("通讯转速"));
|
||||
try
|
||||
{
|
||||
var speedValue = CanDriveService.GetDbcSpeedValueBySpeedName("通讯转速");
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)speedValue);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogService.Error($"RtScanDeviceStart 读取CAN通讯转速失败: {ex.Message}");
|
||||
}
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
@@ -1190,7 +1207,15 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电压") * itemTag.Value.Precision));
|
||||
try
|
||||
{
|
||||
var voltageValue = CanDriveService.GetDbcValueByName("通讯母线电压");
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(voltageValue * itemTag.Value.Precision));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogService.Error($"RtScanDeviceStart 读取CAN通讯母线电压失败: {ex.Message}");
|
||||
}
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
@@ -1208,7 +1233,15 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电流") * itemTag.Value.Precision));
|
||||
try
|
||||
{
|
||||
var currentValue = CanDriveService.GetDbcValueByName("通讯母线电流");
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(currentValue * itemTag.Value.Precision));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogService.Error($"RtScanDeviceStart 读取CAN通讯母线电流失败: {ex.Message}");
|
||||
}
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
@@ -1226,7 +1259,15 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯相电流") * itemTag.Value.Precision));
|
||||
try
|
||||
{
|
||||
var phaseCurrentValue = CanDriveService.GetDbcValueByName("通讯相电流");
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(phaseCurrentValue * itemTag.Value.Precision));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogService.Error($"RtScanDeviceStart 读取CAN通讯相电流失败: {ex.Message}");
|
||||
}
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
@@ -1244,7 +1285,15 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯功率") * itemTag.Value.Precision));
|
||||
try
|
||||
{
|
||||
var powerValue = CanDriveService.GetDbcValueByName("通讯功率");
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(powerValue * itemTag.Value.Precision));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogService.Error($"RtScanDeviceStart 读取CAN通讯功率失败: {ex.Message}");
|
||||
}
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
@@ -1262,7 +1311,15 @@ namespace CapMachine.Wpf.Services
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯芯片温度") * itemTag.Value.Precision));
|
||||
try
|
||||
{
|
||||
var tempValue = CanDriveService.GetDbcValueByName("通讯芯片温度");
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(tempValue * itemTag.Value.Precision));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogService.Error($"RtScanDeviceStart 读取CAN通讯芯片温度失败: {ex.Message}");
|
||||
}
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
@@ -1296,7 +1353,15 @@ namespace CapMachine.Wpf.Services
|
||||
if (itemTag.Value.Group == "CANLIN")
|
||||
{
|
||||
//回读CAN通信的DBC集合数据到集合中
|
||||
itemTag.Value.EngPvValue = CanDriveService.GetDbcValueByName(itemTag.Value.NameNoUnit);
|
||||
try
|
||||
{
|
||||
var dbcValue = CanDriveService.GetDbcValueByName(itemTag.Value.NameNoUnit);
|
||||
itemTag.Value.EngPvValue = dbcValue;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogService.Error($"RtScanDeviceStart 回读CAN数据 {itemTag.Value.NameNoUnit} 失败: {ex.Message}");
|
||||
}
|
||||
}
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
@@ -1437,8 +1502,11 @@ namespace CapMachine.Wpf.Services
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
//LogService.Info($"时间:{DateTime.Now.ToString()}-【Meter】-{ex.Message}");
|
||||
|
||||
LogService.Error($"RtScanDeviceStart 扫描异常 (周期 {cycleCount}): {ex.Message}\r\n堆栈: {ex.StackTrace}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
DiagnosticsTime.Stop();
|
||||
}
|
||||
|
||||
DiagnosticsTime.Stop();
|
||||
|
||||
@@ -39,9 +39,9 @@ namespace CapMachine.Wpf.ViewModels
|
||||
IEventAggregator eventAggregator, IRegionManager regionManager, SysRunService sysRunService,
|
||||
ComActionService actionService,
|
||||
ConfigService configService, CanDriveService canDriveService,
|
||||
IMapper mapper, MachineRtDataService machineRtDataService)
|
||||
IMapper mapper, MachineRtDataService machineRtDataService, ILogService logService)
|
||||
{
|
||||
//LogService = logService;
|
||||
LogService = logService;
|
||||
FreeSql = freeSql;
|
||||
EventAggregator = eventAggregator;
|
||||
RegionManager = regionManager;
|
||||
@@ -52,7 +52,6 @@ namespace CapMachine.Wpf.ViewModels
|
||||
Mapper = mapper;
|
||||
this.MachineRtDataService = machineRtDataService;
|
||||
|
||||
//MachineDataService = machineDataService;
|
||||
DialogService = dialogService;
|
||||
|
||||
WriteNameCbxItems = new ObservableCollection<CbxItems>()
|
||||
@@ -89,6 +88,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
public CanDriveService CanDriveService { get; }
|
||||
public IMapper Mapper { get; }
|
||||
private MachineRtDataService MachineRtDataService { get; }
|
||||
public ILogService LogService { get; }
|
||||
|
||||
/// <summary>
|
||||
/// 弹窗服务
|
||||
@@ -104,55 +104,58 @@ namespace CapMachine.Wpf.ViewModels
|
||||
/// </summary>
|
||||
private void InitLoadCanConfigPro()
|
||||
{
|
||||
//CAN配置集合数据
|
||||
canLinConfigPros = FreeSql.Select<CanLinConfigPro>().Where(a => a.CANLINInfo == CANLIN.CAN)
|
||||
.Include(a => a.CANConfigExd)
|
||||
.IncludeMany(a => a.CanLinConfigContents)
|
||||
.ToList();
|
||||
|
||||
ListCanLinConfigPro = new ObservableCollection<CanLinConfigPro>(canLinConfigPros);
|
||||
if (SelectCanLinConfigPro != null)
|
||||
try
|
||||
{
|
||||
SelectCanLinConfigPro = canLinConfigPros.Where(a => a.Id == SelectCanLinConfigPro.Id).FirstOrDefault()!;
|
||||
//无数据就返回
|
||||
if (SelectCanLinConfigPro == null) return;
|
||||
|
||||
SelectedCANConfigExdDto = Mapper.Map<CANConfigExdDto>(SelectCanLinConfigPro!.CANConfigExd);
|
||||
LogService.Info("开始加载CAN配置数据");
|
||||
//CAN配置集合数据
|
||||
canLinConfigPros = FreeSql.Select<CanLinConfigPro>().Where(a => a.CANLINInfo == CANLIN.CAN)
|
||||
.Include(a => a.CANConfigExd)
|
||||
.IncludeMany(a => a.CanLinConfigContents)
|
||||
.ToList();
|
||||
|
||||
//配置信息
|
||||
var WirteData = SelectCanLinConfigPro.CanLinConfigContents!.Where(a => a.RWInfo == RW.Write).ToList();
|
||||
if (WirteData != null && WirteData.Count > 0)
|
||||
ListCanLinConfigPro = new ObservableCollection<CanLinConfigPro>(canLinConfigPros);
|
||||
if (SelectCanLinConfigPro != null)
|
||||
{
|
||||
ListWriteCanLinRWConfigDto = new ObservableCollection<CanLinRWConfigDto>(Mapper.Map<List<CanLinRWConfigDto>>(WirteData));
|
||||
SelectCanLinConfigPro = canLinConfigPros.Where(a => a.Id == SelectCanLinConfigPro.Id).FirstOrDefault()!;
|
||||
//无数据就返回
|
||||
if (SelectCanLinConfigPro == null) return;
|
||||
|
||||
SelectedCANConfigExdDto = Mapper.Map<CANConfigExdDto>(SelectCanLinConfigPro!.CANConfigExd);
|
||||
|
||||
//加载把当前的配置信息给指令
|
||||
CanDriveService.CmdData.Clear();
|
||||
foreach (var item in WirteData)
|
||||
//配置信息
|
||||
var WirteData = SelectCanLinConfigPro.CanLinConfigContents!.Where(a => a.RWInfo == RW.Write).ToList();
|
||||
if (WirteData != null && WirteData.Count > 0)
|
||||
{
|
||||
CanDriveService.AddCmdData(new CanCmdData()
|
||||
{
|
||||
ConfigName = item.Name,
|
||||
MsgName = item.MsgFrameName,
|
||||
SignalName = item.SignalName,
|
||||
SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
|
||||
});
|
||||
//CanDriveService.CmdData.Add(new CanCmdData()
|
||||
//{
|
||||
// ConfigName = item.Name,
|
||||
// MsgName = item.MsgFrameName,
|
||||
// SignalName = item.SignalName,
|
||||
// SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
|
||||
//});
|
||||
}
|
||||
}
|
||||
var ReadData = SelectCanLinConfigPro.CanLinConfigContents!.Where(a => a.RWInfo == RW.Read).ToList();
|
||||
if (ReadData != null && ReadData.Count > 0)
|
||||
{
|
||||
ListReadCanLinRWConfigDto = new ObservableCollection<CanLinRWConfigDto>(Mapper.Map<List<CanLinRWConfigDto>>(ReadData));
|
||||
}
|
||||
ListWriteCanLinRWConfigDto = new ObservableCollection<CanLinRWConfigDto>(Mapper.Map<List<CanLinRWConfigDto>>(WirteData));
|
||||
|
||||
//匹配选中的SelectCanLinConfigPro.CanLinConfigContents和ListCanDbcModel
|
||||
MatchSeletedAndCanDbcModel();
|
||||
//加载把当前的配置信息给指令
|
||||
CanDriveService.CmdData.Clear();
|
||||
foreach (var item in WirteData)
|
||||
{
|
||||
CanDriveService.AddCmdData(new CanCmdData()
|
||||
{
|
||||
ConfigName = item.Name,
|
||||
MsgName = item.MsgFrameName,
|
||||
SignalName = item.SignalName,
|
||||
SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
|
||||
});
|
||||
}
|
||||
}
|
||||
var ReadData = SelectCanLinConfigPro.CanLinConfigContents!.Where(a => a.RWInfo == RW.Read).ToList();
|
||||
if (ReadData != null && ReadData.Count > 0)
|
||||
{
|
||||
ListReadCanLinRWConfigDto = new ObservableCollection<CanLinRWConfigDto>(Mapper.Map<List<CanLinRWConfigDto>>(ReadData));
|
||||
}
|
||||
|
||||
//匹配选中的SelectCanLinConfigPro.CanLinConfigContents和ListCanDbcModel
|
||||
MatchSeletedAndCanDbcModel();
|
||||
}
|
||||
LogService.Info("CAN配置数据加载成功");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogService.Error($"加载CAN配置数据失败: {ex.Message}\r\n堆栈: {ex.StackTrace}");
|
||||
System.Windows.MessageBox.Show($"加载CAN配置数据失败: {ex.Message}", "错误", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -373,41 +376,70 @@ namespace CapMachine.Wpf.ViewModels
|
||||
}
|
||||
break;
|
||||
case "Active":
|
||||
|
||||
//激活到取消的状态的判断
|
||||
if (IsCanConfigProActive == true)
|
||||
try
|
||||
{
|
||||
//控件的激活
|
||||
IsCanConfigProActive = !IsCanConfigProActive;
|
||||
//控件的激活配置信息
|
||||
IsCANConfigDatagridActive = !IsCanConfigProActive;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if ((CanDriveService.ToomossCanDrive.OpenState == true && CanDriveService.ToomossCanDrive.DbcParserState == true))
|
||||
{
|
||||
if (SelectCanLinConfigPro != null)
|
||||
LogService.Info("开始执行CAN配置激活操作");
|
||||
//激活到取消的状态的判断
|
||||
if (IsCanConfigProActive == true)
|
||||
{
|
||||
LogService.Info("准备取消激活状态");
|
||||
//控件的激活
|
||||
IsCanConfigProActive = !IsCanConfigProActive;
|
||||
LogService.Info("IsCanConfigProActive已更新");
|
||||
//控件的激活配置信息
|
||||
IsCANConfigDatagridActive = !IsCanConfigProActive;
|
||||
LogService.Info("IsCANConfigDatagridActive已更新");
|
||||
|
||||
//当前使用的CAN 配置信息
|
||||
CanDriveService.InitCanConfig(SelectCanLinConfigPro);
|
||||
LogService.Info("CAN配置已取消激活");
|
||||
return;
|
||||
}
|
||||
|
||||
if ((CanDriveService.ToomossCanDrive.OpenState == true && CanDriveService.ToomossCanDrive.DbcParserState == true))
|
||||
{
|
||||
if (SelectCanLinConfigPro != null)
|
||||
{
|
||||
LogService.Info($"准备激活配置: {SelectCanLinConfigPro.ConfigName}");
|
||||
//控件的激活
|
||||
IsCanConfigProActive = !IsCanConfigProActive;
|
||||
LogService.Info("IsCanConfigProActive已更新为true");
|
||||
//控件的激活配置信息
|
||||
IsCANConfigDatagridActive = !IsCanConfigProActive;
|
||||
LogService.Info("IsCANConfigDatagridActive已更新");
|
||||
|
||||
//当前使用的CAN 配置信息
|
||||
LogService.Info("开始调用InitCanConfig");
|
||||
CanDriveService.InitCanConfig(SelectCanLinConfigPro);
|
||||
LogService.Info("InitCanConfig完成");
|
||||
|
||||
LogService.Info("开始调用InitLoadCanConfigPro");
|
||||
InitLoadCanConfigPro();
|
||||
LogService.Info($"CAN配置激活成功: {SelectCanLinConfigPro.ConfigName}");
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Windows.MessageBox.Show("选中后再操作", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
|
||||
}
|
||||
|
||||
InitLoadCanConfigPro();
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Windows.MessageBox.Show("选中后再操作", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
|
||||
System.Windows.MessageBox.Show("请确保CAN连接打开和Dbc解析成功后再激活", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
catch (Exception ex)
|
||||
{
|
||||
System.Windows.MessageBox.Show("请确保CAN连接打开和Dbc解析成功后再激活", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
|
||||
LogService.Error($"CAN配置激活操作失败: {ex.Message}\r\n堆栈: {ex.StackTrace}");
|
||||
System.Windows.MessageBox.Show($"CAN配置激活操作失败: {ex.Message}", "错误", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
|
||||
//恢复状态
|
||||
try
|
||||
{
|
||||
IsCanConfigProActive = false;
|
||||
IsCANConfigDatagridActive = true;
|
||||
}
|
||||
catch (Exception restoreEx)
|
||||
{
|
||||
LogService.Error($"恢复状态失败: {restoreEx.Message}");
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -17,6 +17,7 @@ using System.Collections.ObjectModel;
|
||||
using System.Data;
|
||||
using System.Text;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
|
||||
namespace CapMachine.Wpf.ViewModels
|
||||
{
|
||||
@@ -1759,7 +1760,16 @@ namespace CapMachine.Wpf.ViewModels
|
||||
// cr.EndEdit();
|
||||
//}
|
||||
|
||||
var dd = par;
|
||||
//if (par is DataGrid dataGrid && dataGrid.SelectedCells.Count > 0)
|
||||
//{
|
||||
// var selectedCell = dataGrid.SelectedCells[0];
|
||||
// string columnHeader = selectedCell.Column.Header?.ToString();
|
||||
// // 处理列头信息
|
||||
//}
|
||||
|
||||
//var dd = par;
|
||||
|
||||
|
||||
//var dd = new SelectedCellsCollection();
|
||||
//if (par is SelectedCellCo selectedCells)
|
||||
//{
|
||||
@@ -15897,8 +15907,16 @@ namespace CapMachine.Wpf.ViewModels
|
||||
{
|
||||
try
|
||||
{
|
||||
TimeSpan TimeInfo = TimeSpan.FromSeconds(TotalSec);
|
||||
return TimeInfo.ToString();
|
||||
//TimeSpan TimeInfo = TimeSpan.FromSeconds(TotalSec);
|
||||
//return TimeInfo.ToString();
|
||||
|
||||
int hours = TotalSec / 3600;
|
||||
int remainingSeconds = TotalSec % 3600;
|
||||
int minutes = remainingSeconds / 60;
|
||||
int seconds = remainingSeconds % 60;
|
||||
|
||||
return $"{hours}:{minutes:D2}:{seconds:D2}";
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -15908,8 +15926,6 @@ namespace CapMachine.Wpf.ViewModels
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
#region 公共库
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -833,9 +833,11 @@
|
||||
<prism:InvokeCommandAction Command="{Binding GridSelectionChangedCmd}" CommandParameter="{Binding ElementName=MainDatagrid, Path=SelectedItem}" />
|
||||
</i:EventTrigger>
|
||||
<i:EventTrigger EventName="SelectedCellsChanged">
|
||||
<prism:InvokeCommandAction Command="{Binding GridSelectedCellsChangedCmd}" CommandParameter="{Binding SelectedCells, ElementName=MainDatagrid}" />
|
||||
<prism:InvokeCommandAction Command="{Binding GridSelectedCellsChangedCmd}" CommandParameter="{Binding ElementName=MainDatagrid}" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
<!-- CommandParameter="{Binding SelectedCells, ElementName=MainDatagrid}" /> -->
|
||||
|
||||
<!--<prism:InvokeCommandAction Command="{Binding GridSelectionChangedCmd}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}}" />-->
|
||||
<!-- CommandParameter="{Binding ElementName=MainDatagrid, Path=SelectedItem}" -->
|
||||
<!--<DataGrid.RowStyle>
|
||||
@@ -1474,7 +1476,7 @@
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="COND1温度 (℃)" />
|
||||
Text="冷凝器出口水温
(℃)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
@@ -1488,7 +1490,7 @@
|
||||
EditCommand="{Binding ProStepCond1TempEditCmd}"
|
||||
IsTimeOk="{Binding MeterCond1TempExDto.IsTimeOk}"
|
||||
ListMeter="{Binding ListSlopMeterCond1TempItems}"
|
||||
MeterName="COND1温度"
|
||||
MeterName="冷凝器出口水温"
|
||||
MeterSelectedChangedCmd="{Binding MeterCond1TempSlopSelectedChangedCmd}"
|
||||
ParConfigCommand="{Binding MeterCond1TempParConfigCmd}"
|
||||
SelectedMeter="{Binding SelectedSlopCond1Temp, Mode=TwoWay}"
|
||||
@@ -1633,6 +1635,40 @@
|
||||
</TabItem>-->
|
||||
|
||||
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
<StackPanel
|
||||
Width="90"
|
||||
Margin="-20"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="吸气混合器温度
(℃)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
Margin="5,5,0,5"
|
||||
AddCommand="{Binding ProStepOS2TempAddCmd}"
|
||||
ConstSlopSelectedIndex="{Binding ProStepOS2TempSwitchConstSlopIndex, Mode=TwoWay}"
|
||||
ConstantSaveCommand="{Binding ProStepOS2TempConstantSaveCmd}"
|
||||
ConstantValue="{Binding SelectedConstOS2TempValue, Mode=TwoWay}"
|
||||
Cycle="{Binding MeterOS2TempExDto.SlopCycle}"
|
||||
DeleteCommand="{Binding ProStepOS2TempDeleteCmd}"
|
||||
EditCommand="{Binding ProStepOS2TempEditCmd}"
|
||||
IsTimeOk="{Binding MeterOS2TempExDto.IsTimeOk}"
|
||||
ListMeter="{Binding ListSlopMeterOS2TempItems}"
|
||||
MeterName="吸气混合器温度"
|
||||
MeterSelectedChangedCmd="{Binding MeterOS2TempSlopSelectedChangedCmd}"
|
||||
ParConfigCommand="{Binding MeterOS2TempParConfigCmd}"
|
||||
SelectedMeter="{Binding SelectedSlopOS2Temp, Mode=TwoWay}"
|
||||
SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}"
|
||||
TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" />
|
||||
</TabItem>
|
||||
|
||||
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
@@ -1668,7 +1704,6 @@
|
||||
TotalSlopTime="{Binding MeterHVVolExDto.SlopTime}" />
|
||||
</TabItem>
|
||||
|
||||
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
<StackPanel
|
||||
@@ -1771,39 +1806,7 @@
|
||||
TotalSlopTime="{Binding MeterOS1TempExDto.SlopTime}" />
|
||||
</TabItem>-->
|
||||
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
<StackPanel
|
||||
Width="90"
|
||||
Margin="-20"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="OS2温度 (℃)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
Margin="5,5,0,5"
|
||||
AddCommand="{Binding ProStepOS2TempAddCmd}"
|
||||
ConstSlopSelectedIndex="{Binding ProStepOS2TempSwitchConstSlopIndex, Mode=TwoWay}"
|
||||
ConstantSaveCommand="{Binding ProStepOS2TempConstantSaveCmd}"
|
||||
ConstantValue="{Binding SelectedConstOS2TempValue, Mode=TwoWay}"
|
||||
Cycle="{Binding MeterOS2TempExDto.SlopCycle}"
|
||||
DeleteCommand="{Binding ProStepOS2TempDeleteCmd}"
|
||||
EditCommand="{Binding ProStepOS2TempEditCmd}"
|
||||
IsTimeOk="{Binding MeterOS2TempExDto.IsTimeOk}"
|
||||
ListMeter="{Binding ListSlopMeterOS2TempItems}"
|
||||
MeterName="OS2温度"
|
||||
MeterSelectedChangedCmd="{Binding MeterOS2TempSlopSelectedChangedCmd}"
|
||||
ParConfigCommand="{Binding MeterOS2TempParConfigCmd}"
|
||||
SelectedMeter="{Binding SelectedSlopOS2Temp, Mode=TwoWay}"
|
||||
SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}"
|
||||
TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" />
|
||||
</TabItem>
|
||||
|
||||
|
||||
<!--<TabItem>
|
||||
<TabItem.Header>
|
||||
@@ -1906,40 +1909,6 @@
|
||||
TotalSlopTime="{Binding MeterPTCPwExDto.SlopTime}" />
|
||||
</TabItem>-->
|
||||
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
<StackPanel
|
||||
Width="90"
|
||||
Margin="-20"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="压缩机环境湿度 (%)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
Margin="5,5,0,5"
|
||||
AddCommand="{Binding ProStepEnvRHAddCmd}"
|
||||
ConstSlopSelectedIndex="{Binding ProStepEnvRHSwitchConstSlopIndex, Mode=TwoWay}"
|
||||
ConstantSaveCommand="{Binding ProStepEnvRHConstantSaveCmd}"
|
||||
ConstantValue="{Binding SelectedConstEnvRHValue, Mode=TwoWay}"
|
||||
Cycle="{Binding MeterEnvRHExDto.SlopCycle}"
|
||||
DeleteCommand="{Binding ProStepEnvRHDeleteCmd}"
|
||||
EditCommand="{Binding ProStepEnvRHEditCmd}"
|
||||
IsTimeOk="{Binding MeterEnvRHExDto.IsTimeOk}"
|
||||
ListMeter="{Binding ListSlopMeterEnvRHItems}"
|
||||
MeterName="压缩机环境湿度"
|
||||
MeterSelectedChangedCmd="{Binding MeterEnvRHSlopSelectedChangedCmd}"
|
||||
ParConfigCommand="{Binding MeterEnvRHParConfigCmd}"
|
||||
SelectedMeter="{Binding SelectedSlopEnvRH, Mode=TwoWay}"
|
||||
SwitchConstSlopCommand="{Binding MeterEnvRHSwitchConstSlopCmd}"
|
||||
TotalSlopTime="{Binding MeterEnvRHExDto.SlopTime}" />
|
||||
</TabItem>
|
||||
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
<StackPanel
|
||||
@@ -1974,6 +1943,40 @@
|
||||
TotalSlopTime="{Binding MeterEnvTempExDto.SlopTime}" />
|
||||
</TabItem>
|
||||
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
<StackPanel
|
||||
Width="90"
|
||||
Margin="-20"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="压缩机环境湿度 (%)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
Margin="5,5,0,5"
|
||||
AddCommand="{Binding ProStepEnvRHAddCmd}"
|
||||
ConstSlopSelectedIndex="{Binding ProStepEnvRHSwitchConstSlopIndex, Mode=TwoWay}"
|
||||
ConstantSaveCommand="{Binding ProStepEnvRHConstantSaveCmd}"
|
||||
ConstantValue="{Binding SelectedConstEnvRHValue, Mode=TwoWay}"
|
||||
Cycle="{Binding MeterEnvRHExDto.SlopCycle}"
|
||||
DeleteCommand="{Binding ProStepEnvRHDeleteCmd}"
|
||||
EditCommand="{Binding ProStepEnvRHEditCmd}"
|
||||
IsTimeOk="{Binding MeterEnvRHExDto.IsTimeOk}"
|
||||
ListMeter="{Binding ListSlopMeterEnvRHItems}"
|
||||
MeterName="压缩机环境湿度"
|
||||
MeterSelectedChangedCmd="{Binding MeterEnvRHSlopSelectedChangedCmd}"
|
||||
ParConfigCommand="{Binding MeterEnvRHParConfigCmd}"
|
||||
SelectedMeter="{Binding SelectedSlopEnvRH, Mode=TwoWay}"
|
||||
SwitchConstSlopCommand="{Binding MeterEnvRHSwitchConstSlopCmd}"
|
||||
TotalSlopTime="{Binding MeterEnvRHExDto.SlopTime}" />
|
||||
</TabItem>
|
||||
|
||||
</TabControl>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user