Support for PT200 Israel added, fixed component for Fuzhou300 (I4 problem)
This commit is contained in:
@@ -96,9 +96,7 @@ namespace TBF.BenchControl.Elde
|
||||
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
|
||||
#elif MUNICH
|
||||
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
|
||||
#elif FUZHOU150
|
||||
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
|
||||
#elif FUZHOU300
|
||||
#elif FUZHOU150 || FUZHOU300 || PT200IL
|
||||
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
|
||||
#endif
|
||||
public uint[] DiverterEdge = new uint[2] { 50, 50 };
|
||||
@@ -126,7 +124,7 @@ namespace TBF.BenchControl.Elde
|
||||
/// <param name="power">Power (0.0f .. 100.0f)</param>
|
||||
public void SetFMFreq(int index, float power)
|
||||
{
|
||||
#if FUZHOU300
|
||||
#if FUZHOU300 || PT200IL
|
||||
if ((FMFreq == null) || (FMFreq.Length != 6))
|
||||
{
|
||||
if (index == 0) FMFreq = new float[6] { power, 0, 0, 0, 0, 0 };
|
||||
@@ -164,8 +162,8 @@ namespace TBF.BenchControl.Elde
|
||||
{
|
||||
if (cfg == null) throw new ArgumentNullException("cfg");
|
||||
this.controlBoardCfg = cfg;
|
||||
#if FUZHOU300
|
||||
FMFreq = new float[6] { 0, 0, 0, 0, 0, 0 }; /// Nr. of pumps: Fuzhou150=2, Fuzhou300=6
|
||||
#if FUZHOU300 || PT200IL
|
||||
FMFreq = new float[6] { 0, 0, 0, 0, 0, 0 }; /// Nr. of pumps: Fuzhou150=2, Fuzhou300,PT200IL=6
|
||||
#else
|
||||
FMFreq = new float[2] { 0, 0 }; /// Nr. of pumps: Fuzhou150=2, Fuzhou300=6
|
||||
#endif
|
||||
@@ -186,6 +184,8 @@ namespace TBF.BenchControl.Elde
|
||||
ControlComponent3Munich.UserControl1 ctrlBrdComponent,
|
||||
#elif FUZHOU300
|
||||
ControlComponent3F300.UserControl1 ctrlBrdComponent,
|
||||
#elif PT200IL
|
||||
ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
|
||||
#endif
|
||||
ulong valvesToInvert,
|
||||
float[] tankCapacities)
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace TBF.BenchControl.Elde
|
||||
/// Properties
|
||||
///
|
||||
public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } }
|
||||
#if FUZHOU300
|
||||
#if FUZHOU300 || PT200IL
|
||||
/// <summary>
|
||||
/// In case of I11, I12
|
||||
/// referenceFreq[0] = I11 + I12
|
||||
@@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde
|
||||
public ulong RRoute { get { return ctrlBrdComponent.rRoute; } }
|
||||
public uint DivTime { get { return ctrlBrdComponent.divTime; } }
|
||||
public float TTime { get { return ctrlBrdComponent.Ttime; } }
|
||||
#if FUZHOU300
|
||||
#if FUZHOU300 || PT200IL
|
||||
public uint FmState { get { return ctrlBrdComponent.fMState[0]; } } /// TODO: index
|
||||
#else
|
||||
public uint FmState { get { return ctrlBrdComponent.fMState; } }
|
||||
@@ -73,6 +73,8 @@ namespace TBF.BenchControl.Elde
|
||||
private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
|
||||
#elif FUZHOU300
|
||||
private ControlComponent3F300.UserControl1 ctrlBrdComponent;
|
||||
#elif PT200IL
|
||||
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
@@ -87,6 +89,8 @@ namespace TBF.BenchControl.Elde
|
||||
public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
|
||||
#elif FUZHOU300
|
||||
public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent)
|
||||
#elif PT200IL
|
||||
public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
|
||||
#endif
|
||||
{
|
||||
this.ctrlBrdComponent = ctrlBrdComponent;
|
||||
@@ -170,7 +174,7 @@ namespace TBF.BenchControl.Elde
|
||||
// valveValue[0],
|
||||
// valveValue[1]));
|
||||
log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
|
||||
#if FUZHOU300
|
||||
#if FUZHOU300 || PT200IL
|
||||
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime);
|
||||
#else
|
||||
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);
|
||||
|
||||
@@ -185,6 +185,8 @@ namespace TBF.BenchControl
|
||||
public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
|
||||
#elif FUZHOU300
|
||||
public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent)
|
||||
#elif PT200IL
|
||||
public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
|
||||
#endif
|
||||
{
|
||||
/// Load the list of components (entities) from the database.
|
||||
|
||||
Reference in New Issue
Block a user