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-15 21:42:57 +08:00
parent 43e0ff62e7
commit cf627cf650
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,8 +155,6 @@ namespace CapMachine.Wpf.Models.ProModelPars
//RunEnable = false;
//时间到了触发下载下一步步骤
//不为空的数据
if (NextProStepExe == null)
{
@@ -225,14 +223,30 @@ namespace CapMachine.Wpf.Models.ProModelPars
//组装斜坡数据，按照秒为间隔发送
for (var i = 1; i <= NextProStepExe.KeepTime; i++)
{
var SlopExStep = new SlopExStep()
if (i == NextProStepExe.KeepTime)
{
StepNo = i,
SV = NextProStepExe.StartSV + (int)(SecStepValue * i),
IsHasEx = false,
};
ListSlopExStep.Add(SlopExStep);
//最后一个打点步骤数据数据，防止上面的相除得到误差，故在最后一个打点数据用NextProStepExe.EndSV，这样就确保了最后一个打点数据就是EndSV
var SlopExStep = new SlopExStep()
{
StepNo = i,
SV = NextProStepExe.EndSV,
IsHasEx = false,
};
ListSlopExStep.Add(SlopExStep);
}
else//非最后一个数据，正常累加
{
var SlopExStep = new SlopExStep()
{
StepNo = i,
SV = NextProStepExe.StartSV + (int)(SecStepValue * i),
IsHasEx = false,
};
ListSlopExStep.Add(SlopExStep);
}
}
//需要发送一次StartSV数据吗？
//组装完成开始循环打点
@@ -373,7 +387,7 @@ namespace CapMachine.Wpf.Models.ProModelPars
}
else
{
return RunStepType.Step;
return RunStepType.No;
}
}