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

CAN和SV发送数据问题的修复，只发送速度到CAN

Browse Source
This commit is contained in:
Tyrone CT
2025-04-25 22:28:16 +08:00
parent 0aee140e3f
commit 2f80b50e0b
9 changed files with 60 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,6 +208,7 @@ 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),
IsSpeed=IsSpeed,
ListStepExd = GetStepExds(NextProStepExe),//拓展参数
@@ -264,6 +265,7 @@ 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),
IsSpeed = IsSpeed,
ListStepExd = GetStepExds(NextProStepExe),//拓展参数
});
@@ -444,6 +446,7 @@ namespace CapMachine.Wpf.Models.ProModelPars
{
MeterName = MeterName,
SV = NoExData.First().SV,
IsSpeed = IsSpeed,
ProSegName = CurProStepExe.ProSegName,
MeterStep = CurProStepExe.MeterStep,

12
CapMachine.Wpf/Models/ProModelPars/ProStepExe.cs
View File

@@ -63,10 +63,20 @@ namespace CapMachine.Wpf.Models.ProModelPars
/// </summary>
public int MeterStep { get; set; }
private string? _ProStepInfo;
/// <summary>
/// 这个步骤是打开具体设置步骤界面的那个层面的信息，例如：2-3,代表是程序2里面的仪表步骤3，方便调试和给液击使用
/// </summary>
public string? ProStepInfo { get; set; }
public string? ProStepInfo
{
get { return _ProStepInfo; }
set { _ProStepInfo = value;RaisePropertyChanged(); }
}
/////// <summary>
/////// 这个步骤是打开具体设置步骤界面的那个层面的信息，例如：2-3,代表是程序2里面的仪表步骤3，方便调试和给液击使用
/////// </summary>
////public string? ProStepInfo { get; set; }
///// <summary>
///// 启用状态-没有启用就是什么数据都没有