diff --git a/TestBenchFramework/BenchControl/Greco/Ambient.cs b/TestBenchFramework/BenchControl/Greco/Ambient.cs index 8321b0fa5..1991b4cf2 100644 --- a/TestBenchFramework/BenchControl/Greco/Ambient.cs +++ b/TestBenchFramework/BenchControl/Greco/Ambient.cs @@ -156,16 +156,19 @@ namespace TBF.BenchControl.Greco public IOperation ReadAmbientOp(FloatBox temperature, FloatBox pressure, FloatBox humidity) { - this.tempBox = temperature; + this.tempBox = temperature; this.pressureBox = pressure; - this.humiBox = humidity; + this.humiBox = humidity; return this; } /// Start this operation public void Start() { - } + if (tempBox != null) tempBox.Val = temperature; + if (pressureBox != null) pressureBox.Val = pressure; + if (humiBox != null) humiBox.Val = humidity; + } /// Run this operation /// @@ -173,10 +176,10 @@ namespace TBF.BenchControl.Greco /// public Event Run() { - tempBox.Val = temperature; - pressureBox.Val = pressure; - humiBox.Val = humidity; - return Event.AmbientDone; + if (tempBox != null) tempBox.Val = temperature; + if (pressureBox != null) pressureBox.Val = pressure; + if (humiBox != null) humiBox.Val = humidity; + return Event.AmbientDone; } /// Stop this operation diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 8bc97593a..e93ccbd55 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -268,6 +268,7 @@ namespace TBF.BenchControl.Sequences Formulas.VolumeFromPulses(refCount.Val, 1.0f / ltrPerRefPulse), tempIn, tempOut, + tempDiv, pressIn, pressOut, mass, diff --git a/packages/ControlBoard/Fuzhou300/ControlComponent3U.dll b/packages/ControlBoard/Fuzhou300/ControlComponent3U.dll index 674ac1743..26247e63e 100644 Binary files a/packages/ControlBoard/Fuzhou300/ControlComponent3U.dll and b/packages/ControlBoard/Fuzhou300/ControlComponent3U.dll differ