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

Modifications for Torun

Browse Source
This commit is contained in:
Milan Hanajik 2015-05-05 17:15:37 +02:00
parent 85c29f4eef
commit fb4005afb7
7 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ResultsBrowser/Program.cs
View File

@ -34,11 +34,13 @@ namespace ResultsBrowser
#if (DN100 || MUNICH)
public const int WMsCount = 3;
#else // if FUZHOU300|| FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
#elif FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
public const int WMsCount = 6;
#elif TORUN_PT50_2015
public const int WMsCount = 20;
#endif
/// <summary>
/// <summary>
/// Selected procedure data
/// - before the main program window is open, objects referenced by this variable
/// are loaded from the database.

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

@ -12,7 +12,7 @@ namespace TBF.BenchControl.Elde
Stop = 2, /// Stop the measurement
}
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7,
@ -38,7 +38,7 @@ namespace TBF.BenchControl.Elde
ErrorPressMeter4 = 0x8000000000000,
}
#else
public enum StatusP : ulong
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7,
TestInProgress = 0x8,

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

@ -83,7 +83,7 @@ namespace TBF.BenchControl.Elde
// Array length is the reference flowmeters count plus one
#if DN100
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
#elif MUNICH || TORINO50 || BADGER_MALA_TRAT
#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
#elif FUZHOU150 || FUZHOU300 || PT200IL
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
@ -175,8 +175,10 @@ namespace TBF.BenchControl.Elde
ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
#elif BADGER_MALA_TRAT
ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
#elif TORUN_PT50_2015
ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
#endif
ulong valvesToInvert,
ulong valvesToInvert,
float[] tankCapacities)
{
this.valvesToInvert = valvesToInvert;

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

@ -14,7 +14,7 @@ namespace TBF.BenchControl.Elde
/// Properties
///
public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } }
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
/// <summary>
/// In case of I11, I12
/// referenceFreq[0] = I11 + I12
@ -43,7 +43,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 || TORINO50 || BADGER_MALA_TRAT
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
public uint FmState { get { return ctrlBrdComponent.fMState[0]; } } /// TODO: index
#else
public uint FmState { get { return ctrlBrdComponent.fMState; } }
@ -82,6 +82,8 @@ namespace TBF.BenchControl.Elde
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#elif BADGER_MALA_TRAT
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#elif TORUN_PT50_2015
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#endif
/// <summary>
@ -102,6 +104,8 @@ namespace TBF.BenchControl.Elde
public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#elif BADGER_MALA_TRAT
public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#elif TORUN_PT50_2015
public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#endif
{
this.ctrlBrdComponent = ctrlBrdComponent;
@ -185,7 +189,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 || PT200IL || TORINO50 || BADGER_MALA_TRAT
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime);
#else
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);

2
TestBenchFramework/BenchControl/StateMachine.cs
View File

@ -194,6 +194,8 @@ namespace TBF.BenchControl
public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#elif BADGER_MALA_TRAT
public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#elif TORUN_PT50_2015
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

@ -587,6 +587,8 @@ namespace TBF
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#elif BADGER_MALA_TRAT
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#elif TORUN_PT50_2015
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#endif
private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;

4
TestBenchFramework/Program.cs
View File

@ -38,8 +38,10 @@ namespace TBF
#if DN100 || MUNICH
public const int WMsCount = 3;
#else // if FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
#elif FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
public const int WMsCount = 6;
#elif TORUN_PT50_2015
public const int WMsCount = 20;
#endif
/// <summary>