Allow bench calibration to use branch fine gains for more steps

Author: macaba

source/TS.NET.Sequences/Sequences/BenchCalibrationSequence.cs

@@ -25,6 +25,8 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
             new LoadUserCalFromDeviceFallbackToFileStep("Load calibration from device/file", Variables),
             new WarmupStep("Warmup device", Variables) { Skip = false, AllowSkip = true },
 
+            new AdcBranchGainsStep("Channel 1 - ADC branch gains", 0, 1_000_000_000, Variables),
+            
             new TrimOffsetDacGainStep("Channel 1 - measure trim offset DAC scale - HG L0", 0, 0, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
             new TrimOffsetDacGainStep("Channel 1 - measure trim offset DAC scale - HG L1", 0, 1, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
             new TrimOffsetDacGainStep("Channel 1 - measure trim offset DAC scale - HG L2", 0, 2, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
@@ -73,8 +75,6 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
 
             new FindSigGenZeroStep("Channel 1 - find signal generator zero", 0, Variables),
 
-            new AdcBranchGainsStep("Channel 1 - ADC branch gains", 0, 1_000_000_000, Variables),
-
             new BufferInputVppStep("Channel 1 - measure buffer input Vpp - HG L0", 0, 0, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
             new BufferInputVppStep("Channel 1 - measure buffer input Vpp - HG L1", 0, 1, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
             new BufferInputVppStep("Channel 1 - measure buffer input Vpp - HG L2", 0, 2, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },

source/TS.NET.Sequences/Steps/AdcBranchGainsStep.cs

@@ -99,8 +99,8 @@ public AdcBranchGainsStep(string name, int channelIndex, uint rateHz, BenchCalib
                 ]
             });
 
-            Instruments.Instance.SetThunderscopeAdcCalibration([0, 0, 0, 0, 0, 0, 0, 0]);
-
+            //Instruments.Instance.SetThunderscopeAdcCalibration([0, 0, 0, 0, 0, 0, 0, 0]);
+            Instruments.Instance.SetSdgChannel(-1);
             Logger.Instance.Log(LogLevel.Information, Index, Status.Done);
             //Instruments.Instance.SetSdgDc(channelIndex);
             return Status.Done;