michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Program extensions to handle TORINO50 define.

Browse Source
This commit is contained in:
Milan Hanajik 2015-03-09 15:47:59 +01:00
parent e772823572
commit c2bccda07f
7 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ResultsBrowser/Program.cs
View File

@ -31,7 +31,7 @@ namespace ResultsBrowser
#if (DN100 || MUNICH)
public const int WMsCount = 3;
#elif FUZHOU300
#elif FUZHOU300, PT200IL, TORINO50
public const int WMsCount = 6;
#else // if FUZHOU150
public const int WMsCount = 6;

2
TestBenchFramework/BenchControl/Elde/Common.cs
View File

@ -9,7 +9,7 @@ namespace TBF.BenchControl.Elde
Stop = 2, /// Stop the measurement
}
#if FUZHOU300 || PT200IL
#if FUZHOU300 || PT200IL || TORINO50
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7,

4
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
View File

@ -168,8 +168,10 @@ namespace TBF.BenchControl.Elde
ControlComponent3F300.UserControl1 ctrlBrdComponent,
#elif PT200IL
ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
#elif TORINO50
ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
#endif
ulong valvesToInvert,
ulong valvesToInvert,
float[] tankCapacities)
{
this.valvesToInvert = valvesToInvert;

12
TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
View File

@ -11,7 +11,7 @@ namespace TBF.BenchControl.Elde
/// Properties
///
public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } }
#if FUZHOU300 || PT200IL
#if FUZHOU300 || PT200IL || TORINO50
/// <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 || PT200IL
#if FUZHOU300 || PT200IL || TORINO50
public uint FmState { get { return ctrlBrdComponent.fMState[0]; } } /// TODO: index
#else
public uint FmState { get { return ctrlBrdComponent.fMState; } }
@ -75,6 +75,8 @@ namespace TBF.BenchControl.Elde
private ControlComponent3F300.UserControl1 ctrlBrdComponent;
#elif PT200IL
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
#elif TORINO50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#endif
/// <summary>
@ -91,6 +93,8 @@ namespace TBF.BenchControl.Elde
public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent)
#elif PT200IL
public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
#elif TORINO50
public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#endif
{
this.ctrlBrdComponent = ctrlBrdComponent;
@ -174,8 +178,8 @@ namespace TBF.BenchControl.Elde
// valveValue[0],
// valveValue[1]));
log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
#if FUZHOU300 || PT200IL
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime);
#if FUZHOU300 || PT200IL || TORINO50
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime);
#else
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);
#endif

2
TestBenchFramework/BenchControl/StateMachine.cs
View File

@ -187,6 +187,8 @@ namespace TBF.BenchControl
public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent)
#elif PT200IL
public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
#elif TORINO50
public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#endif
{
/// Load the list of components (entities) from the database.

2
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -563,6 +563,8 @@
private ControlComponent3F300.UserControl1 ctrlBrdComponent;
#elif PT200IL
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
#elif TORINO50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#endif
private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;

2
TestBenchFramework/Program.cs
View File

@ -35,7 +35,7 @@ namespace TBF
public const int WMsCount = 3;
#elif FUZHOU300
public const int WMsCount = 6;
#else // if FUZHOU150
#else // if FUZHOU150, PT200IL, TORINO50
public const int WMsCount = 6;
#endif