diff --git a/Config/Data.cs b/Config/Data.cs index ea1522990..0eca8da36 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -20,7 +20,7 @@ namespace Config public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = WMsCount / LineSize; -#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS +#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 3; @@ -68,9 +68,15 @@ namespace Config public const int CompoundWMsCount = 0; public const int HeatMetersCount = 0; public const int MaxPartNr = WMsCount / LineSize; +#elif BERLIN + public const int WMsCount = 6; + public const int LineSize = 6; + public const int CompoundWMsCount = 1; + public const int HeatMetersCount = 0; + public const int MaxPartNr = WMsCount / LineSize; #endif - /// + /// /// Database related: This object reference is set after a successful user login /// public static DatabaseSettings CurrentBench; diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index 35ea53d7d..61b81ba1f 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -123,10 +123,10 @@ namespace TBF.BenchControl.Elde public float[,] TempCalibData = new float[8, 5]; // Array length is the reference flowmeters count plus one -#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS +#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; -#elif GENESIS +#elif GENESIS || BERLIN public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 }; #elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || IPERLST || IPERLST_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 @@ -267,7 +267,7 @@ namespace TBF.BenchControl.Elde ControlComponent3Munich.UserControl1 ctrlBrdComponent, #elif FUZHOU300 ControlComponent3F300.UserControl1 ctrlBrdComponent, -#elif PT200IL || PUCHONG_PT200 || GENESIS +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN 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 6f4152a6d..82b1315bb 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -32,7 +32,7 @@ namespace TBF.BenchControl.Elde public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq[0]; } } /// In [Hz] 0..2500, nom.=2000 #endif public int EtPulses(int wmNr0) { return (int)ctrlBrdComponent.etPulses[wmNr0]; } -#if FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS +#if FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } } #else public int EtPulses2 { get { return 0; } } @@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde public float Pressure(int prsNr0) { return ctrlBrdComponent.pressure[prsNr0]; } public float Temperature(int tmpNr0) { return ctrlBrdComponent.temperature[tmpNr0]; } public RegulValveState RegulValveState(int rvNr1) { return (RegulValveState)ctrlBrdComponent.rValveStatus[rvNr1 - 1]; } -#if GENESIS +#if GENESIS || BERLIN public UInt128 RRoute { get { return ((UInt128)ctrlBrdComponent.rRoute << 64) | (UInt128)ctrlBrdComponent.rRoute; } } #else public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } } @@ -103,13 +103,13 @@ namespace TBF.BenchControl.Elde private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #elif FUZHOU300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; -#elif PT200IL || PUCHONG_PT200 || GENESIS +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; #else /// newer benches private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; #endif - /// + /// /// Constructor that initializes the control board component reference /// /// @@ -121,12 +121,12 @@ namespace TBF.BenchControl.Elde public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU300 public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif PT200IL || PUCHONG_PT200 || GENESIS +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) #endif - { + { this.ctrlBrdComponent = ctrlBrdComponent; } @@ -313,7 +313,7 @@ namespace TBF.BenchControl.Elde #elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#elif GENESIS +#elif GENESIS || BERLIN uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index 1b9a9659c..f27c2bcc0 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -197,12 +197,12 @@ namespace TBF.BenchControl public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU300 public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif PT200IL || PUCHONG_PT200 || GENESIS +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN 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 ad76a30ad..d135a3550 100644 --- a/TestBenchFramework/BenchControl/TestBenchSim.cs +++ b/TestBenchFramework/BenchControl/TestBenchSim.cs @@ -219,7 +219,7 @@ namespace TBF.BenchControl const ulong Path3 = VL12 | VI31 | VI32; const ulong Path4 = VL12 | VI41 | VI42; const ulong Path5 = VL12 | VI41 | VI43; -#elif PT200IL || PUCHONG_PT200 || GENESIS +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN const ulong VM11 = (1L << 4); const ulong VM12 = (1L << 5); const ulong VM21 = (1L << 6); @@ -505,8 +505,8 @@ namespace TBF.BenchControl if (Div2sim && (SimRoute & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time); if (Div2sim && (SimRoute & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time); if (Div1sim && (SimRoute & Path5) == Path5) Mass1sim += DiffKg(Flow5sim, time); -#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS - if (Div1sim && (SimRoute & Path1) == Path1) +#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN + if (Div1sim && (SimRoute & Path1) == Path1) { float diff = DiffKg(Flow1sim, time); Mass1sim += diff; @@ -636,8 +636,8 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } -#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS - switch (regulValveNo) +#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN + switch (regulValveNo) { case 1: case 2: diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 9aa966bf1..0fc0390f7 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -649,7 +649,7 @@ namespace TBF #elif FUZHOU300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif PT200IL || PUCHONG_PT200 || GENESIS +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; #elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index d8eaa92e2..47d85538b 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.12.419.1")] -[assembly: AssemblyFileVersion("2.12.419.1")] +[assembly: AssemblyVersion("2.12.420.1")] +[assembly: AssemblyFileVersion("2.12.420.1")] diff --git a/packages/ControlBoard/Berlin/ControlComponent3U.dll b/packages/ControlBoard/Berlin/ControlComponent3U.dll new file mode 100644 index 000000000..3c58b6ef5 Binary files /dev/null and b/packages/ControlBoard/Berlin/ControlComponent3U.dll differ