Skip to content

Commit dbc095c

Browse files
macabamacaba
committed
Sequence changes
1 parent 5891ea4 commit dbc095c

File tree

6 files changed

+28
-21
lines changed

6 files changed

+28
-21
lines changed

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

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

28-
new Step("Connect SDG2042X - Channel 1"){ Action = (CancellationToken cancellationToken) => {
29-
Instruments.Instance.SetSdgChannel(0);
30-
cancellationToken.WaitHandle.WaitOne(2000);
31-
return Sequencer.Status.Done;
32-
}},
33-
3428
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 1 GSPS", 0, 1_000_000_000, Variables),
3529
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 660 MSPS", 0, 660_000_000, Variables),
3630
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 500 MSPS", 0, 500_000_000, Variables),
@@ -39,11 +33,13 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
3933
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 165 MSPS", 0, 165_000_000, Variables),
4034
new AdcBranchGainsStep("ADC branch gains - Channel 1 - 100 MSPS", 0, 100_000_000, Variables),
4135

42-
new Step("Connect SDG2042X - Channel 3"){ Action = (CancellationToken cancellationToken) => {
43-
Instruments.Instance.SetSdgChannel(2);
44-
cancellationToken.WaitHandle.WaitOne(2000);
45-
return Sequencer.Status.Done;
46-
}},
36+
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 1 GSPS", 1, 1_000_000_000, Variables),
37+
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 660 MSPS", 1, 660_000_000, Variables),
38+
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 500 MSPS", 1, 500_000_000, Variables),
39+
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 330 MSPS", 1, 330_000_000, Variables),
40+
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 250 MSPS", 1, 250_000_000, Variables),
41+
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 165 MSPS", 1, 165_000_000, Variables),
42+
new AdcBranchGainsStep("ADC branch gains - Channel 2 - 100 MSPS", 1, 100_000_000, Variables),
4743

4844
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 1 GSPS", 2, 1_000_000_000, Variables),
4945
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 660 MSPS", 2, 660_000_000, Variables),
@@ -53,7 +49,15 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
5349
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 165 MSPS", 2, 165_000_000, Variables),
5450
new AdcBranchGainsStep("ADC branch gains - Channel 3 - 100 MSPS", 2, 100_000_000, Variables),
5551

56-
new Step("Disconnect SDG2042X"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel(-1); return Sequencer.Status.Done; }},
52+
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 1 GSPS", 3, 1_000_000_000, Variables),
53+
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 660 MSPS", 3, 660_000_000, Variables),
54+
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 500 MSPS", 3, 500_000_000, Variables),
55+
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 330 MSPS", 3, 330_000_000, Variables),
56+
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 250 MSPS", 3, 250_000_000, Variables),
57+
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 165 MSPS", 3, 165_000_000, Variables),
58+
new AdcBranchGainsStep("ADC branch gains - Channel 4 - 100 MSPS", 3, 100_000_000, Variables),
59+
60+
new Step("Disconnect signal generator"){ Action = (CancellationToken cancellationToken) => { Instruments.Instance.SetSdgChannel(-1); return Sequencer.Status.Done; }},
5761

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
1919
{
2020
Steps =
2121
[
22-
new DialogStep("Cable check", uiDialog){ Title = "Cable check", Text = "Cables connected from 2x SDG2042X to channels 1-4?", Buttons = DialogButtons.YesNo, Icon = DialogIcon.Question },
22+
new DialogStep("Cable check", uiDialog){ Title = "Cable check", Text = "Cables connected from 2x signal generators to channels 1-4?", Buttons = DialogButtons.YesNo, Icon = DialogIcon.Question },
2323
new InitialiseDeviceStep("Initialise device", Variables),
2424
new InitialiseSigGensStep("Initialise instruments", Variables),
2525
new LoadUserCalFromDeviceFallbackToFileStep("Load calibration from device/file", Variables),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
1919
{
2020
Steps =
2121
[
22-
new DialogStep("Cable check", uiDialog){ Title = "Cable check", Text = "Cables connected from 2x SDG2042X to channels 1-4?", Buttons = DialogButtons.YesNo, Icon = DialogIcon.Question },
22+
new DialogStep("Cable check", uiDialog){ Title = "Cable check", Text = "Cables connected from 2x signal generators to channels 1-4?", Buttons = DialogButtons.YesNo, Icon = DialogIcon.Question },
2323
new InitialiseDeviceStep("Initialise device", Variables),
2424
new InitialiseSigGensStep("Initialise instruments", Variables),
2525
new LoadUserCalFromDeviceStep("Load calibration from device", Variables),

‎source/TS.NET.Sequences/Singletons/Instruments.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void InitialiseSigGens(string? sigGen1Host, string? sigGen2Host)
105105

106106
sigGen1 = new TcpScpiConnection();
107107
sigGen1.Open(sigGen1Host, 5025);
108-
Logger.Instance.Log(LogLevel.Debug, "SCPI connection to SDG2042X #1 opened.");
108+
Logger.Instance.Log(LogLevel.Debug, "SCPI connection to signal generator #1 opened.");
109109
sigGen1.WriteLine("*IDN?");
110110
var sigGen1Idn = sigGen1.ReadLine();
111111
Logger.Instance.Log(LogLevel.Debug, $"*IDN: {sigGen1Idn}");
@@ -128,7 +128,7 @@ public void InitialiseSigGens(string? sigGen1Host, string? sigGen2Host)
128128

129129
sigGen2 = new TcpScpiConnection();
130130
sigGen2.Open(sigGen2Host, 5025);
131-
Logger.Instance.Log(LogLevel.Debug, "SCPI connection to SDG2042X #2 opened.");
131+
Logger.Instance.Log(LogLevel.Debug, "SCPI connection to signal generator #2 opened.");
132132
sigGen2.WriteLine("*IDN?");
133133
var sigGen2Idn = sigGen2.ReadLine();
134134
Logger.Instance.Log(LogLevel.Debug, $"*IDN: {sigGen2Idn}");

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ public AdcBranchGainsStep(string name, int channelIndex, uint rateHz, BenchCalib
1616
Instruments.Instance.SetThunderscopeChannel([channelIndex]);
1717
Instruments.Instance.SetThunderscopeResolution(AdcResolution.EightBit);
1818
Instruments.Instance.SetThunderscopeRate(rateHz);
19-
Instruments.Instance.SetThunderscopeAdcCalibration(branchFineGains); // Reset to all zero
19+
Instruments.Instance.SetThunderscopeAdcCalibration([0, 0, 0, 0, 0, 0, 0, 0]); // Reset to all zero
2020

21+
Instruments.Instance.SetSdgChannel(channelIndex);
2122
Instruments.Instance.SetSdgNoise(channelIndex, 0.16, 0.0);
2223

2324
// First set the maximum range
@@ -100,11 +101,13 @@ public AdcBranchGainsStep(string name, int channelIndex, uint rateHz, BenchCalib
100101
]
101102
});
102103

103-
Logger.Instance.Log(LogLevel.Information, Index, Status.Passed);
104+
Instruments.Instance.SetThunderscopeAdcCalibration([0, 0, 0, 0, 0, 0, 0, 0]);
105+
106+
Logger.Instance.Log(LogLevel.Information, Index, Status.Done);
104107
//Instruments.Instance.SetSdgDc(channelIndex);
105-
if(Result != null)
108+
if (Result != null)
106109
Result.Metadata = metadata.ToArray();
107-
return Status.Passed;
110+
return Status.Done;
108111

109112
void GetBranchScales()
110113
{

‎source/TS.NET.Sequences/Steps/PgaLoadStep.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public PgaLoadStep(string name, int channelIndex, int[] channelIndices, uint sam
1616
var configIndex = 21;
1717
var pathConfig = Utility.GetChannelPathConfig(channelIndex, configIndex, variables);
1818
var vpp = Utility.FindVpp(channelIndex, pathConfig, variables.SigGenZero, cancellationToken);
19-
var scaleValue = Math.Round(variables.ReferenceVpp / vpp, 4);
19+
var scaleValue = Math.Round(variables.ReferenceVpp / vpp, 3);
2020
var scale = new ThunderscopePgaLoadScale() { SampleRate = sampleRateHz, ChannelCount = (byte)channelIndices.Length, Scale = scaleValue };
2121
switch (channelIndex)
2222
{

0 commit comments

Comments
 (0)