- Component update (temp., etc.)
- Process data logging update (SequenceBase.cs)
This commit is contained in:
@@ -156,16 +156,19 @@ namespace TBF.BenchControl.Greco
|
|||||||
|
|
||||||
public IOperation ReadAmbientOp(FloatBox temperature, FloatBox pressure, FloatBox humidity)
|
public IOperation ReadAmbientOp(FloatBox temperature, FloatBox pressure, FloatBox humidity)
|
||||||
{
|
{
|
||||||
this.tempBox = temperature;
|
this.tempBox = temperature;
|
||||||
this.pressureBox = pressure;
|
this.pressureBox = pressure;
|
||||||
this.humiBox = humidity;
|
this.humiBox = humidity;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Start this operation</summary>
|
/// <summary>Start this operation</summary>
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
}
|
if (tempBox != null) tempBox.Val = temperature;
|
||||||
|
if (pressureBox != null) pressureBox.Val = pressure;
|
||||||
|
if (humiBox != null) humiBox.Val = humidity;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>Run this operation</summary>
|
/// <summary>Run this operation</summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
@@ -173,10 +176,10 @@ namespace TBF.BenchControl.Greco
|
|||||||
/// </returns>
|
/// </returns>
|
||||||
public Event Run()
|
public Event Run()
|
||||||
{
|
{
|
||||||
tempBox.Val = temperature;
|
if (tempBox != null) tempBox.Val = temperature;
|
||||||
pressureBox.Val = pressure;
|
if (pressureBox != null) pressureBox.Val = pressure;
|
||||||
humiBox.Val = humidity;
|
if (humiBox != null) humiBox.Val = humidity;
|
||||||
return Event.AmbientDone;
|
return Event.AmbientDone;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Stop this operation</summary>
|
/// <summary>Stop this operation</summary>
|
||||||
|
|||||||
@@ -268,6 +268,7 @@ namespace TBF.BenchControl.Sequences
|
|||||||
Formulas.VolumeFromPulses(refCount.Val, 1.0f / ltrPerRefPulse),
|
Formulas.VolumeFromPulses(refCount.Val, 1.0f / ltrPerRefPulse),
|
||||||
tempIn,
|
tempIn,
|
||||||
tempOut,
|
tempOut,
|
||||||
|
tempDiv,
|
||||||
pressIn,
|
pressIn,
|
||||||
pressOut,
|
pressOut,
|
||||||
mass,
|
mass,
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user