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-04-14 10:33:49 +08:00
parent 4a07d45b25
commit 43e0ff62e7
10 changed files with 470 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CapMachine.Wpf/Models/ProModelPars/ProExModel.cs
View File

@@ -41,7 +41,7 @@ namespace CapMachine.Wpf.Models.ProModelPars
/// <summary>
/// 是否是速度仪表参数
/// </summary>
public bool IsSpeed { get; set; }=false;
public bool IsSpeed { get; set; } = false;
/// <summary>
/// 程序执行管道
@@ -155,7 +155,7 @@ namespace CapMachine.Wpf.Models.ProModelPars
//RunEnable = false;
//时间到了触发下载下一步步骤
//不为空的数据
if (NextProStepExe == null)
@@ -210,6 +210,9 @@ namespace CapMachine.Wpf.Models.ProModelPars
CurLoadLimit = LimitResult == true ? new Limit() { Up = (short)NextProStepExe.CurConfigLimitDto.Up, Down = (short)NextProStepExe.CurConfigLimitDto.Down } : new Limit(),
CurLoadPID = PidResult == true ? new PID() { P = (short)NextProStepExe.CurConfigPIDDto.P, I = (short)NextProStepExe.CurConfigPIDDto.I, D = (short)NextProStepExe.CurConfigPIDDto.D } : new PID(),
RunStepType = GetRunStepType(PidResult, LimitResult, false),
ListStepExd = GetStepExds(NextProStepExe),//拓展参数
});
//存在坡度数据
@@ -247,6 +250,8 @@ namespace CapMachine.Wpf.Models.ProModelPars
CurLoadLimit = LimitResult == true ? new Limit() { Up = (short)NextProStepExe.CurConfigLimitDto.Up, Down = (short)NextProStepExe.CurConfigLimitDto.Down } : new Limit(),
CurLoadPID = PidResult == true ? new PID() { P = (short)NextProStepExe.CurConfigPIDDto.P, I = (short)NextProStepExe.CurConfigPIDDto.I, D = (short)NextProStepExe.CurConfigPIDDto.D } : new PID(),
RunStepType = GetRunStepType(PidResult, LimitResult, true),
ListStepExd = GetStepExds(NextProStepExe),//拓展参数
});
Console.WriteLine($"【时间】{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff")} 【参数名称】：{MeterName} " +
$"【程序Seg】{CurProStepExe.ProSegName} " +
@@ -309,6 +314,21 @@ namespace CapMachine.Wpf.Models.ProModelPars
}
}
/// <summary>
/// 获取拓展信息
/// 一般是速度有这些参数
/// </summary>
/// <returns></returns>
private List<StepExd> GetStepExds(ProStepExe proStepExe)
{
if (proStepExe.ListStepExd != null && proStepExe.ListStepExd.Count() > 0)
{
return proStepExe.ListStepExd;
}
return null;
}
/// <summary>
/// 当前步骤已经运行时长-秒
/// </summary>