marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge done

Browse Source
This commit is contained in:
Roland Drabesch
2022-09-22 16:11:42 +02:00
parent e293fc408e be78f16ead
commit 581f40ea03
97 changed files with 2072 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
+2 -2
View File
@@ -692,7 +692,7 @@ namespace CordonelPreadjustmentUi
{
throw new ApplicationException("Detect failed");
}
if (settings.MeterSize != MeterSize.NAN)
if (settings.MeterSize != MeterSize.NA)
{
btn_ZeroFlowCal_Start_Click(null, EventArgs.Empty);
}
@@ -1770,7 +1770,7 @@ namespace CordonelPreadjustmentUi
var ts = DateTimeOffset.UtcNow - totalStartOffset.Value;
DebugMessage($"offset duration= {ts.TotalSeconds}");
MeterStateCtls.ForEach(f => f.Meter?.calibrationResult?.AddAditonlaLog($"offset duration=", $"{ts.TotalSeconds}S"));
MeterStateCtls.ForEach(f => f.Meter?.calibrationResult?.AddAdditionalLog($"offset duration=", $"{ts.TotalSeconds}S"));
totalStartOffset = null;