diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs index b2b617dac..6cbe72beb 100644 --- a/ResultsBrowser/Program.cs +++ b/ResultsBrowser/Program.cs @@ -32,7 +32,7 @@ namespace ResultsBrowser public static DatabaseSettings CurrentBench; const string SQLiteDbFName = "SQLite.db"; -#if DN100 || MUNICH +#if DN100 || MUNICH || BADGER_VELKA_TRAT public const int WMsCount = 3; public const int LineSize = 3; public const int CompoundWMsCount = 1; diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs index c208e5bc3..aca8f3b6e 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 +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || IPERLST || BADGER_VELKA_TRAT public enum StatusP : ulong { RefFlowMeterMask = 0x7, diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index 9cd40d1a8..a09ea30d3 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 +#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || MURES_PT40 || BADGER_VELKA_TRAT 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 610a7b7c2..447b01f52 100644 --- a/TestBenchFramework/BenchControl/TestBenchSim.cs +++ b/TestBenchFramework/BenchControl/TestBenchSim.cs @@ -277,7 +277,7 @@ namespace TBF.BenchControl const ulong Path3 = VL12 | VI31 | VI32; const ulong Path4 = VL12 | VI41 | VI42; const ulong Path5 = VL12 | VI41 | VI43; -#elif BADGER_MALA_TRAT +#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT const ulong VZ34 = (1L << 0); const ulong VZ35 = (1L << 1); const ulong VZ39 = (1L << 2); @@ -312,6 +312,7 @@ namespace TBF.BenchControl const ulong Path2 = VI32; const ulong Path3 = VI33; const ulong Path4 = VI34; + const ulong Path5 = 0; #elif CEVAK_PT40_272 || MURES_PT40 const ulong VL11 = (1L << 0); const ulong VL13 = (1L << 1); @@ -491,7 +492,7 @@ namespace TBF.BenchControl Mass2sim += diff; log.WarnFormat("Path5: Div3, Mass2 += {0}kg, flow={1}m3/h, Mass2={2}kg", diff, Flow1sim, Mass2sim); } -#elif BADGER_MALA_TRAT || TORINO50 /// Path1,2 do WT1, Path3,4 do WT2 +#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || TORINO50 /// Path1,2 do WT1, Path3,4 do WT2 if (Div1sim && (RouteSim & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (RouteSim & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div2sim && (RouteSim & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time); @@ -602,7 +603,7 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } -#elif BADGER_MALA_TRAT || TORINO50 +#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || TORINO50 switch (regulValveNo) { case 1: diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 32bf72765..b7a040d2e 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -588,7 +588,7 @@ namespace TBF #elif PT200IL private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif TORINO50 || BADGER_MALA_TRAT +#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 diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index acf23d0b4..925b01457 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -39,7 +39,7 @@ namespace TBF public static DatabaseSettings CurrentBench; const string SQLiteDbFName = "SQLite.db"; -#if DN100 || MUNICH +#if DN100 || MUNICH || BADGER_VELKA_TRAT public const int WMsCount = 3; public const int LineSize = 3; public const int CompoundWMsCount = 1; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index f7dbc1f24..924c88931 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.147.1")] -[assembly: AssemblyFileVersion("1.6.147.1")] +[assembly: AssemblyVersion("1.6.148.1")] +[assembly: AssemblyFileVersion("1.6.148.1")] diff --git a/packages/ControlBoard/Badger-velka-trat/ControlComponent3U.dll b/packages/ControlBoard/Badger-velka-trat/ControlComponent3U.dll new file mode 100644 index 000000000..328db37ea Binary files /dev/null and b/packages/ControlBoard/Badger-velka-trat/ControlComponent3U.dll differ