Skip to content

Commit 95ae6fc

Browse files
macabamacaba
committed
Tweaks
1 parent 07c232d commit 95ae6fc

File tree

9 files changed

+170
-192
lines changed

9 files changed

+170
-192
lines changed

‎source/TS.NET.Sequences/Sequences/AdcBranchGainsAnalysisSequence.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
5757
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 165 MSPS", 3, 165_000_000, Variables),
5858
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 100 MSPS", 3, 100_000_000, Variables),
5959

60-
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel(-1); return Sequencer.Status.Done; }},
60+
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel([]); return Sequencer.Status.Done; }},
6161

6262
new Step("Cleanup"){ Action = (CancellationToken cancellationToken) => {
6363
Instruments.Instance.Close();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
118118
new PgaLoadStep("Channel 1 - measure PGA loading scale - 165 MSPS, 4 channel", 0, [0, 1, 2, 3], 165_000_000, Variables),
119119
new PgaLoadStep("Channel 1 - measure PGA loading scale - 100 MSPS, 4 channel", 0, [0, 1, 2, 3], 100_000_000, Variables),
120120

121-
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel(-1); return Sequencer.Status.Done; }},
121+
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel([]); return Sequencer.Status.Done; }},
122122

123123
new TrimOffsetDacGainStep("Channel 2 - measure trim offset DAC scale - HG L0", 1, 0, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
124124
new TrimOffsetDacGainStep("Channel 2 - measure trim offset DAC scale - HG L1", 1, 1, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
@@ -211,7 +211,7 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
211211
new PgaLoadStep("Channel 2 - measure PGA loading scale - 165 MSPS, 4 channel", 1, [0, 1, 2, 3], 165_000_000, Variables),
212212
new PgaLoadStep("Channel 2 - measure PGA loading scale - 100 MSPS, 4 channel", 1, [0, 1, 2, 3], 100_000_000, Variables),
213213

214-
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel(-1); return Sequencer.Status.Done; }},
214+
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel([]); return Sequencer.Status.Done; }},
215215

216216
new TrimOffsetDacGainStep("Channel 3 - measure trim offset DAC scale - HG L0", 2, 0, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
217217
new TrimOffsetDacGainStep("Channel 3 - measure trim offset DAC scale - HG L1", 2, 1, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
@@ -304,7 +304,7 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
304304
new PgaLoadStep("Channel 3 - measure PGA loading scale - 165 MSPS, 4 channel", 2, [0, 1, 2, 3], 165_000_000, Variables),
305305
new PgaLoadStep("Channel 3 - measure PGA loading scale - 100 MSPS, 4 channel", 2, [0, 1, 2, 3], 100_000_000, Variables),
306306

307-
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel(-1); return Sequencer.Status.Done; }},
307+
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel([]); return Sequencer.Status.Done; }},
308308

309309
new TrimOffsetDacGainStep("Channel 4 - measure trim offset DAC scale - HG L0", 3, 0, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
310310
new TrimOffsetDacGainStep("Channel 4 - measure trim offset DAC scale - HG L1", 3, 1, Variables) { IgnoreError = true, Timeout = TimeSpan.FromSeconds(30), MaxRetries = 3 },
@@ -397,7 +397,7 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
397397
new PgaLoadStep("Channel 4 - measure PGA loading scale - 165 MSPS, 4 channel", 3, [0, 1, 2, 3], 165_000_000, Variables),
398398
new PgaLoadStep("Channel 4 - measure PGA loading scale - 100 MSPS, 4 channel", 3, [0, 1, 2, 3], 100_000_000, Variables),
399399

400-
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel(-1); return Sequencer.Status.Done; }},
400+
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel([]); return Sequencer.Status.Done; }},
401401

402402
new SaveUserCalToFileStep("Save calibration to file", Variables) { AllowSkip = true },
403403
new SaveUserCalToDeviceStep("Save calibration to device", Variables) { AllowSkip = true },

‎source/TS.NET.Sequences/Sequences/BenchVerificationSequence.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
2525
new LoadUserCalFromDeviceStep("Load calibration from device", Variables),
2626
new WarmupStep("Warmup device", Variables) { Skip = false, AllowSkip = true },
2727

28-
new AdcBranchGainsStep("Channel 1 - ADC branch gains", 0, 1_000_000_000, Variables),
29-
new BodePlotStep("Channel 1 - 1 GSPS, 50R, 0.8 Vpp, attenuator off, LG L10", channelIndex: 0, preamp: PgaPreampGain.Low, ladder: 10, 0.8 * 2, false, Variables),
30-
new BodePlotStep("Channel 1 - 1 GSPS, 50R, 10 Vpp, attenuator on, LG L7", channelIndex: 0, preamp: PgaPreampGain.Low, ladder: 7, 10 * 2, true, Variables),
28+
new AdcBranchGainsStep("Channel 1 - 1GSPS ADC branch gains", 0, 1_000_000_000, Variables),
29+
new BodePlotStep("Channel 1 - 1 GSPS, 50R, 0.8 Vpp, attenuator off, LG L10", channelIndex: 0, 1_000_000_000, preamp: PgaPreampGain.Low, ladder: 10, 0.8, false, Variables),
30+
new BodePlotStep("Channel 1 - 1 GSPS, 50R, 10 Vpp, attenuator on, LG L7", channelIndex: 0, 1_000_000_000, preamp: PgaPreampGain.Low, ladder: 7, 10, true, Variables),
3131

32-
new AdcBranchGainsStep("Channel 2 - ADC branch gains", 1, 1_000_000_000, Variables),
33-
new BodePlotStep("Channel 2 - 1 GSPS, 50R, 0.8 Vpp, attenuator off, LG L10", channelIndex: 1, preamp: PgaPreampGain.Low, ladder: 10, 0.8 * 2, false, Variables),
34-
new BodePlotStep("Channel 2 - 1 GSPS, 50R, 10 Vpp, attenuator on, LG L7", channelIndex: 1, preamp: PgaPreampGain.Low, ladder: 7, 10 * 2, true, Variables),
32+
new AdcBranchGainsStep("Channel 2 - 1GSPS ADC branch gains", 1, 1_000_000_000, Variables),
33+
new BodePlotStep("Channel 2 - 1 GSPS, 50R, 0.8 Vpp, attenuator off, LG L10", channelIndex: 1, 1_000_000_000, preamp: PgaPreampGain.Low, ladder: 10, 0.8, false, Variables),
34+
new BodePlotStep("Channel 2 - 1 GSPS, 50R, 10 Vpp, attenuator on, LG L7", channelIndex: 1, 1_000_000_000, preamp: PgaPreampGain.Low, ladder: 7, 10, true, Variables),
3535

36-
new AdcBranchGainsStep("Channel 3 - ADC branch gains", 2, 1_000_000_000, Variables),
37-
new BodePlotStep("Channel 3 - 1 GSPS, 50R, 0.8 Vpp, attenuator off, LG L10", channelIndex: 2, preamp: PgaPreampGain.Low, ladder: 10, 0.8 * 2, false, Variables),
38-
new BodePlotStep("Channel 3 - 1 GSPS, 50R, 10 Vpp, attenuator on, LG L7", channelIndex: 2, preamp: PgaPreampGain.Low, ladder: 7, 10 * 2, true, Variables),
36+
new AdcBranchGainsStep("Channel 3 - 1GSPS ADC branch gains", 2, 1_000_000_000, Variables),
37+
new BodePlotStep("Channel 3 - 1 GSPS, 50R, 0.8 Vpp, attenuator off, LG L10", channelIndex: 2, 1_000_000_000, preamp: PgaPreampGain.Low, ladder: 10, 0.8, false, Variables),
38+
new BodePlotStep("Channel 3 - 1 GSPS, 50R, 10 Vpp, attenuator on, LG L7", channelIndex: 2, 1_000_000_000, preamp: PgaPreampGain.Low, ladder: 7, 10, true, Variables),
3939

40-
new AdcBranchGainsStep("Channel 4 - ADC branch gains", 3, 1_000_000_000, Variables),
41-
new BodePlotStep("Channel 4 - 1 GSPS, 50R, 0.8 Vpp, attenuator off, LG L10", channelIndex: 3, preamp: PgaPreampGain.Low, ladder: 10, 0.8 * 2, false, Variables),
42-
new BodePlotStep("Channel 4 - 1 GSPS, 50R, 10 Vpp, attenuator on, LG L7", channelIndex: 3, preamp: PgaPreampGain.Low, ladder: 7, 10 * 2, true, Variables),
40+
new AdcBranchGainsStep("Channel 4 - 1GSPS ADC branch gains", 3, 1_000_000_000, Variables),
41+
new BodePlotStep("Channel 4 - 1 GSPS, 50R, 0.8 Vpp, attenuator off, LG L10", channelIndex: 3, 1_000_000_000, preamp: PgaPreampGain.Low, ladder: 10, 0.8, false, Variables),
42+
new BodePlotStep("Channel 4 - 1 GSPS, 50R, 10 Vpp, attenuator on, LG L7", channelIndex: 3, 1_000_000_000, preamp: PgaPreampGain.Low, ladder: 7, 10, true, Variables),
4343

44-
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel(-1); return Sequencer.Status.Done; }},
44+
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel([]); return Sequencer.Status.Done; }},
4545

4646
new Step("Cleanup"){ Action = (CancellationToken cancellationToken) => {
4747
Instruments.Instance.Close();

0 commit comments

Comments
 (0)