diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs index d3e4ed232..eb91f0c26 100644 --- a/ResultsBrowser/Program.cs +++ b/ResultsBrowser/Program.cs @@ -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; diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs index 08e1176bc..5fcf9f62b 100644 --- a/TestBenchFramework/BenchControl/Elde/Common.cs +++ b/TestBenchFramework/BenchControl/Elde/Common.cs @@ -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, diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index e9f678d1b..03721c277 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -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; diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index e0d0996be..2afea2860 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -11,7 +11,7 @@ namespace TBF.BenchControl.Elde /// Properties /// public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } } -#if FUZHOU300 || PT200IL +#if FUZHOU300 || PT200IL || TORINO50 /// /// 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 /// @@ -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 diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index 0c51a5de0..e70da3f4e 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -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. diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 0b07f7e1a..ff2d06deb 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -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; diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index 44c3a1a91..946988996 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -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