This commit is contained in:
GukSang.Jin
2026-05-20 14:37:20 +08:00
parent df5c7566fb
commit 263fffbcf5
4 changed files with 63 additions and 1 deletions

View File

@@ -1624,7 +1624,7 @@ namespace TabletTester2025.ViewModels
AddHardnessSample(value);
await ReadHardnessMaxCaptureAsync();
ApplyHardnessStatistics(count);
await WaitForCoilStateAsync(completeCoil, false, TimeSpan.FromSeconds(10), "硬度完成信号未回落");
await TryWaitForCoilStateAsync(completeCoil, false, TimeSpan.FromSeconds(2));
}
if (_hardnessResults.Count < count)
@@ -1786,6 +1786,20 @@ namespace TabletTester2025.ViewModels
throw new TimeoutException(timeoutMessage);
}
private async Task<bool> TryWaitForCoilStateAsync(ushort coilAddress, bool expectedState, TimeSpan timeout)
{
DateTime deadline = DateTime.Now.Add(timeout);
while (_isHardnessRunning && DateTime.Now <= deadline)
{
if (await _plc.ReadCoilAsync(coilAddress) == expectedState)
return true;
await Task.Delay(100);
}
return false;
}
private void ApplyHardnessStatistics(int requiredCount)
{
var stats = TestCalculationService.CalculateHardness(