diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs index bad936ad9..c0038fed0 100644 --- a/ResultsBrowser/Program.cs +++ b/ResultsBrowser/Program.cs @@ -48,7 +48,7 @@ namespace ResultsBrowser public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 1; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 public const int WMsCount = 20; public const int LineSize = 10; public const int CompoundWMsCount = 1; diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs index aca8f3b6e..60e8a186d 100644 --- a/TestBenchFramework/BenchControl/Elde/Common.cs +++ b/TestBenchFramework/BenchControl/Elde/Common.cs @@ -41,8 +41,8 @@ namespace TBF.BenchControl.Elde ErrorPressMeter3 = 0x4000000000000, ErrorPressMeter4 = 0x8000000000000, } -#else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 - public enum StatusP : ulong +#else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 + public enum StatusP : ulong { RefFlowMeterMask = 0x7, TestInProgress = 0x8, diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index a09ea30d3..4b0f2ffdc 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -121,7 +121,7 @@ namespace TBF.BenchControl.Elde // Array length is the reference flowmeters count plus one #if DN100 || FUZHOU150 || FUZHOU300 || PT200IL 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 || BADGER_VELKA_TRAT +#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || MURES_PT40 || FUZHOU_40 public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; #endif diff --git a/TestBenchFramework/BenchControl/TestBenchSim.cs b/TestBenchFramework/BenchControl/TestBenchSim.cs index 447b01f52..2a9e4d8ab 100644 --- a/TestBenchFramework/BenchControl/TestBenchSim.cs +++ b/TestBenchFramework/BenchControl/TestBenchSim.cs @@ -313,7 +313,7 @@ namespace TBF.BenchControl const ulong Path3 = VI33; const ulong Path4 = VI34; const ulong Path5 = 0; -#elif CEVAK_PT40_272 || MURES_PT40 +#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 const ulong VL11 = (1L << 0); const ulong VL13 = (1L << 1); const ulong VL18 = (1L << 2); @@ -497,7 +497,7 @@ namespace TBF.BenchControl if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div2sim && (RouteSim & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time); if (Div2sim && (RouteSim & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time); -#elif CEVAK_PT40_272 || MURES_PT40 /// Path1,2,3 do WT1 +#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 /// Path1,2,3 do WT1 if (Div1sim && (RouteSim & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (RouteSim & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); @@ -618,7 +618,7 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } -#elif CEVAK_PT40_272 || MURES_PT40 +#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 switch (regulValveNo) { case 1: diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 712e94f78..adfb6a3e6 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -565,7 +565,7 @@ namespace TBF #elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; #elif IPERLST diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index e0a0c2826..6aeacdc2b 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -55,7 +55,7 @@ namespace TBF public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 1; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 public const int WMsCount = 20; public const int LineSize = 10; public const int CompoundWMsCount = 1; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 57aa9b279..06bbbac6d 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.6.150.1")] -[assembly: AssemblyFileVersion("1.6.150.1")] +[assembly: AssemblyVersion("1.6.151.1")] +[assembly: AssemblyFileVersion("1.6.151.1")] diff --git a/packages/ControlBoard/Fuzhou_40/ControlComponent3U.dll b/packages/ControlBoard/Fuzhou_40/ControlComponent3U.dll new file mode 100644 index 000000000..589ba37ee Binary files /dev/null and b/packages/ControlBoard/Fuzhou_40/ControlComponent3U.dll differ