Skip to content

Commit 26322f3

Browse files
macabamacaba
committed
Factory calibration updated to match developer calibration
1 parent f9cc421 commit 26322f3

12 files changed

Lines changed: 181 additions & 181 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424
<div class="flex flex-row gap-2 mb-8 text-sm text-black">
2525
<div class="flex flex-col gap-1">
2626
<div>Sequence name:</div>
27+
<div>Sequence version:</div>
2728
<div>Start date/time:</div>
2829
<div>Duration:</div>
2930
</div>
3031
<div class="flex flex-col gap-1">
3132
<div>@Sequence.Name</div>
33+
<div>@Sequence.Version</div>
3234
<div>@Sequence.StartTimestamp.ToString("yyyy-MM-dd HH:mm:ssK") (@Sequence.TzId)</div>
3335
<div>@HumanDuration(Sequence.Duration)</div>
3436
</div>

‎source/TS.NET.Sequencer/Sequence.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ namespace TS.NET.Sequencer;
99
public class Sequence
1010
{
1111
public string? Name { get; set; }
12+
public string? Version { get; set; }
1213
private Status? status;
1314
public Status? Status { get { return status; } set { status = value; SequenceStatusChanged?.Invoke(value); } }
1415
public DateTimeOffset StartTimestamp { get; set; }

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class AdcBranchGainsAnalysisSequence : Sequence
99
public AdcBranchGainsAnalysisSequence(ModalUiContext modalUiContext, FactoryVariables variables)
1010
{
1111
Name = "ADC branch gains analysis";
12+
Version = "1.0";
1213
Variables = variables;
1314
AddSteps(modalUiContext);
1415
SetStepIndices();

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class DeveloperCalibrationSequence : Sequence
99
public DeveloperCalibrationSequence(ModalUiContext modalUiContext, FactoryVariables variables)
1010
{
1111
Name = "Developer calibration";
12+
Version = "1.0";
1213
Variables = variables;
1314
AddSteps(modalUiContext);
1415
SetStepIndices();
@@ -28,10 +29,6 @@ private void AddSteps(ModalUiContext modalUiContext)
2829
new InitialiseDeviceStep("Initialise device", Variables),
2930
new InitialiseSigGensStep("Initialise signal generators", Variables),
3031
new LoadCalibrationFromDefaultStep("Load calibration from default", Variables),
31-
//new LoadCalibrationFromUserCalStep("Load calibration from user cal", Variables),
32-
//new LoadCalibrationFromFileStep("Load calibration from file", Variables) { PostAction = cancellationToken => { Variables.TrimDacZeroCalibrated = true; Variables.TrimDacScaleCalibrated = true; Variables.BufferInputVppCalibrated = true; } },
33-
//new SaveFactoryCalToDeviceStep("Save factory calibration to device", Variables),
34-
//new SaveUserCalToDeviceStep("Save user calibration to device", Variables),
3532
new TemperatureCheckStep("Temperature check", Variables),
3633

3734
//new ReferenceClockInputValidStep("Reference clock input check", Variables) { Skip = false, AllowSkip = true },
@@ -330,17 +327,17 @@ private void AddSteps(ModalUiContext modalUiContext)
330327
new BufferInputVppStep("Channel 1 - Buffer input Vpp - HG L8", channelIndex: 0, PgaPreampGain.High, pgaLadder: 8, Variables) { MaxRetries = 2 },
331328
new BufferInputVppStep("Channel 1 - Buffer input Vpp - HG L9", channelIndex: 0, PgaPreampGain.High, pgaLadder: 9, Variables) { MaxRetries = 2 },
332329
new BufferInputVppStep("Channel 1 - Buffer input Vpp - HG L10", channelIndex: 0, PgaPreampGain.High, pgaLadder: 10, Variables) { MaxRetries = 2 },
333-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L0", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 0, Variables),
334-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L1", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 1, Variables),
335-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L2", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 2, Variables),
336-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L3", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 3, Variables),
337-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L4", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 4, Variables),
338-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L5", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 5, Variables),
339-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L6", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 6, Variables),
340-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L7", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 7, Variables),
341-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L8", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 8, Variables),
342-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L9", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 9, Variables),
343-
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L10", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 10, Variables),
330+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L0", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 0, Variables) { MaxRetries = 2 },
331+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L1", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 1, Variables) { MaxRetries = 2 },
332+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L2", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 2, Variables) { MaxRetries = 2 },
333+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L3", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 3, Variables) { MaxRetries = 2 },
334+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L4", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 4, Variables) { MaxRetries = 2 },
335+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L5", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 5, Variables) { MaxRetries = 2 },
336+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L6", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 6, Variables) { MaxRetries = 2 },
337+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L7", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 7, Variables) { MaxRetries = 2 },
338+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L8", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 8, Variables) { MaxRetries = 2 },
339+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L9", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 9, Variables) { MaxRetries = 2 },
340+
new BufferInputVppStep("Channel 1 - Buffer input Vpp - LG L10", channelIndex: 0, PgaPreampGain.Low, pgaLadder: 10, Variables) { MaxRetries = 2 },
344341

345342
new AttenuatorStep("Channel 1 - Attenuator scale", channelIndex: 0, Variables) { IgnoreError = true, MaxRetries = 2 },
346343

@@ -579,7 +576,7 @@ private void AddSteps(ModalUiContext modalUiContext)
579576
return Sequencer.Status.Done;
580577
}},
581578
new SaveCalToFileStep("Save calibration to file", Variables) { AllowSkip = true },
582-
new SaveUserCalToDeviceStep("Save calibration to device", Variables) { AllowSkip = true },
579+
new SaveUserCalToDeviceStep("Save user calibration to device", Variables) { AllowSkip = true },
583580

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class DeveloperHwidSequence : Sequence
99
public DeveloperHwidSequence(ModalUiContext modalUiContext, CommonVariables variables)
1010
{
1111
Name = "Developer HWID";
12+
Version = "1.0";
1213
Variables = variables;
1314
AddSteps(modalUiContext);
1415
SetStepIndices();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class DeveloperVerificationSequence : Sequence
99
public DeveloperVerificationSequence(ModalUiContext modalUiContext, FactoryVariables variables)
1010
{
1111
Name = "Developer verification";
12+
Version = "1.0";
1213
Variables = variables;
1314
AddSteps(modalUiContext);
1415
SetStepIndices();

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class FactoryBringUpSequence : Sequence
99
public FactoryBringUpSequence(ModalUiContext modalUiContext, FactoryBringUpVariables variables)
1010
{
1111
Name = "Factory bring-up";
12+
Version = "1.0";
1213
Variables = variables;
1314
AddSteps(modalUiContext);
1415
SetStepIndices();
@@ -38,14 +39,6 @@ private void AddSteps(ModalUiContext modalUiContext)
3839
new JtagProgramHwidStep("JTAG program HWID", Variables),
3940
new JtagResetFpgaStep("JTAG reset FPGA", Variables),
4041

41-
//new ModalDialogStep("Build check", modalUiContext)
42-
//{
43-
// Title = "Build check",
44-
// Message = "PCB installed in enclosure & connected to PC, power cycled, with cables connected from 2x signal generators to channel 1-4?",
45-
// Buttons = DialogButtons.YesNo,
46-
// Icon = DialogIcon.Question
47-
//},
48-
4942
new Step("Cleanup"){ Action = (CancellationToken cancellationToken) => {
5043
return Sequencer.Status.Done;
5144
}},

0 commit comments

Comments
 (0)