Skip to content

Commit ce880ad

Browse files
macabamacaba
committed
Reorder steps & added 1M steps
1 parent 36b35e7 commit ce880ad

3 files changed

Lines changed: 43 additions & 17 deletions

File tree

‎source/TS.NET.Sequencer/HTML/HtmlReport.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div>@Sequence.Name</div>
3333
<div>@Sequence.StartTimestamp.ToString("yyyy-MM-dd HH:mm:ssK") (@Sequence.TzId)</div>
3434
<div>@HumanDuration(Sequence.Duration)</div>
35-
<div>TS0019</div>
35+
<div>-</div>
3636
</div>
3737
</div>
3838

‎source/TS.NET.Sequencer/HTML/ReportHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static string GetStyles(Sequence sequence)
2828
using var reader = new StreamReader(stream1);
2929
var content = reader.ReadToEnd();
3030
content = content.Replace("[@top-center content]", sequence.Name);
31-
content = content.Replace("[@top-right content]", "Device: TS0019");
31+
content = content.Replace("[@top-right content]", "Device: -");
3232
content = content.Replace("[@bottom-left content]", sequence.StartTimestamp.ToString("yyyy-MM-dd HH:mm:ss"));
3333
sb.Append(content);
3434
}

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

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,55 @@ private void AddSteps(Func<Dialog, DialogResult> uiDialog)
2929
new WarmupStep("Warmup device", Variables) { Skip = false, AllowSkip = true },
3030

3131
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW 20M, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw20M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
32-
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
33-
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
34-
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
35-
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
36-
3732
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW 20M, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw20M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
38-
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
39-
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
40-
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
41-
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
42-
4333
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW 20M, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw20M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
44-
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
45-
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
46-
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
47-
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
48-
4934
new AcRmsStep("Channel 4 - AC RMS - 50R, 8-bit, 1 GSPS, BW 20M, PGA HG L0", 3, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw20M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
35+
36+
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
37+
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
38+
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
5039
new AcRmsStep("Channel 4 - AC RMS - 50R, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 3, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
40+
41+
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
42+
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
43+
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
5144
new AcRmsStep("Channel 4 - AC RMS - 50R, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 3, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
45+
46+
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
47+
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
48+
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
5249
new AcRmsStep("Channel 4 - AC RMS - 50R, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 3, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
50+
51+
new AcRmsStep("Channel 1 - AC RMS - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
52+
new AcRmsStep("Channel 2 - AC RMS - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
53+
new AcRmsStep("Channel 3 - AC RMS - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
5354
new AcRmsStep("Channel 4 - AC RMS - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 3, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
5455

56+
new AcRmsStep("Channel 1 - AC RMS - 1M, 8-bit, 1 GSPS, BW 20M, PGA HG L0", 0, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw20M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
57+
new AcRmsStep("Channel 2 - AC RMS - 1M, 8-bit, 1 GSPS, BW 20M, PGA HG L0", 1, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw20M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
58+
new AcRmsStep("Channel 3 - AC RMS - 1M, 8-bit, 1 GSPS, BW 20M, PGA HG L0", 2, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw20M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
59+
new AcRmsStep("Channel 4 - AC RMS - 1M, 8-bit, 1 GSPS, BW 20M, PGA HG L0", 3, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw20M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
60+
61+
new AcRmsStep("Channel 1 - AC RMS - 1M, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 0, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
62+
new AcRmsStep("Channel 2 - AC RMS - 1M, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 1, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
63+
new AcRmsStep("Channel 3 - AC RMS - 1M, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 2, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
64+
new AcRmsStep("Channel 4 - AC RMS - 1M, 8-bit, 1 GSPS, BW 100M, PGA HG L0", 3, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw100M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
65+
66+
new AcRmsStep("Channel 1 - AC RMS - 1M, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 0, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
67+
new AcRmsStep("Channel 2 - AC RMS - 1M, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 1, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
68+
new AcRmsStep("Channel 3 - AC RMS - 1M, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 2, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
69+
new AcRmsStep("Channel 4 - AC RMS - 1M, 8-bit, 1 GSPS, BW 200M, PGA HG L0", 3, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw200M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
70+
71+
new AcRmsStep("Channel 1 - AC RMS - 1M, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 0, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
72+
new AcRmsStep("Channel 2 - AC RMS - 1M, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 1, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
73+
new AcRmsStep("Channel 3 - AC RMS - 1M, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 2, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
74+
new AcRmsStep("Channel 4 - AC RMS - 1M, 8-bit, 1 GSPS, BW 350M, PGA HG L0", 3, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.Bw350M, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
75+
76+
new AcRmsStep("Channel 1 - AC RMS - 1M, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 0, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
77+
new AcRmsStep("Channel 2 - AC RMS - 1M, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 1, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
78+
new AcRmsStep("Channel 3 - AC RMS - 1M, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 2, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
79+
new AcRmsStep("Channel 4 - AC RMS - 1M, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 3, 0, ThunderscopeTermination.OneMegaohm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables){ MinLimit = 0.00003, MaxLimit = 0.00009, Averages = 100 },
80+
5581
new NsdStep("Channel 1 - NSD - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 0, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables),
5682
new NsdStep("Channel 2 - NSD - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 1, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables),
5783
new NsdStep("Channel 3 - NSD - 50R, 8-bit, 1 GSPS, BW FULL, PGA HG L0", 2, 0, ThunderscopeTermination.FiftyOhm, ThunderscopeBandwidth.BwFull, 1_000_000_000, Variables),

0 commit comments

Comments
 (0)