diff --git a/Config/Data.cs b/Config/Data.cs index 0616a0375..a38017a7e 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -16,7 +16,7 @@ namespace Config public const int WMsCount = 3; public const int LineSize = 3; public const int CompoundWMsCount = 1; -#elif FUZHOU300 || FUZHOU150 || PT200IL +#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 3; diff --git a/Results/Results.csproj b/Results/Results.csproj index 962ff2198..40c53f9ef 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -27,7 +27,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;MUNICH prompt 4 diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs index ec5dc0fbe..3e63cef0f 100644 --- a/TestBenchFramework/BenchControl/Elde/Common.cs +++ b/TestBenchFramework/BenchControl/Elde/Common.cs @@ -16,7 +16,7 @@ namespace TBF.BenchControl.Elde ResetShapesOfPulses = 8, } -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || BADGER_VELKA_TRAT +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || BADGER_VELKA_TRAT || PUCHONG_PT200 public enum StatusP : ulong { RefFlowMeterMask = 0x7, diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index e55f78dae..39168f61b 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -119,8 +119,8 @@ namespace TBF.BenchControl.Elde public byte[] MeretRS485Address = new byte[4]; public float[,] TempCalibData = new float[8, 5]; - // Array length is the reference flowmeters count plus one -#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL + // Array length is the reference flowmeters count plus one +#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; #elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || MURES_PT40 || FUZHOU_40 public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; @@ -243,7 +243,7 @@ namespace TBF.BenchControl.Elde ControlComponent3Munich.UserControl1 ctrlBrdComponent, #elif FUZHOU300 ControlComponent3F300.UserControl1 ctrlBrdComponent, -#elif PT200IL +#elif PT200IL || PUCHONG_PT200 ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent, #else /// all newer benches ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index f966c06d7..cecb2bc23 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -74,7 +74,7 @@ namespace TBF.BenchControl.Elde private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #elif FUZHOU300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; -#elif PT200IL +#elif PT200IL || PUCHONG_PT200 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; #else /// newer benches private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; @@ -92,12 +92,12 @@ namespace TBF.BenchControl.Elde public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU300 public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif PT200IL +#elif PT200IL || PUCHONG_PT200 public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) #endif - { + { this.ctrlBrdComponent = ctrlBrdComponent; } diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index 94df1ccf7..21780eeb3 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -216,12 +216,12 @@ namespace TBF.BenchControl public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU300 public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif PT200IL +#elif PT200IL || PUCHONG_PT200 public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) #endif - { + { /// Load the list of components (entities) from the database. /// Then create the components (derived from IComponent). components = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Config.Entities.DBKind.Config)); diff --git a/TestBenchFramework/BenchControl/TestBenchSim.cs b/TestBenchFramework/BenchControl/TestBenchSim.cs index 808388610..ca5150289 100644 --- a/TestBenchFramework/BenchControl/TestBenchSim.cs +++ b/TestBenchFramework/BenchControl/TestBenchSim.cs @@ -218,7 +218,7 @@ namespace TBF.BenchControl const ulong Path3 = VL12 | VI31 | VI32; const ulong Path4 = VL12 | VI41 | VI42; const ulong Path5 = VL12 | VI41 | VI43; -#elif PT200IL +#elif PT200IL || PUCHONG_PT200 const ulong VM11 = (1L << 4); const ulong VM12 = (1L << 5); const ulong VM21 = (1L << 6); @@ -461,7 +461,7 @@ namespace TBF.BenchControl if (Div2sim && (RouteSim & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time); if (Div2sim && (RouteSim & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time); if (Div1sim && (RouteSim & Path5) == Path5) Mass1sim += DiffKg(Flow5sim, time); -#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL +#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 if (Div1sim && (RouteSim & Path1) == Path1) { float diff = DiffKg(Flow1sim, time); @@ -585,7 +585,7 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } -#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL +#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 switch (regulValveNo) { case 1: diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 8fe09b6d6..7f3a44319 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -625,7 +625,7 @@ namespace TBF #elif FUZHOU300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif PT200IL +#elif PT200IL || PUCHONG_PT200 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; #elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT diff --git a/packages/ControlBoard/Puchong-PT200/ControlComponent3U.dll b/packages/ControlBoard/Puchong-PT200/ControlComponent3U.dll new file mode 100644 index 000000000..80550373a Binary files /dev/null and b/packages/ControlBoard/Puchong-PT200/ControlComponent3U.dll differ