From 7ac1f2d4315d636401ec5fd06c0697efd6dac798 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 9 Feb 2017 12:34:36 +0100 Subject: [PATCH] Genesis specific changes, error messages fixed, smalled branch scale fixed, ver.2.12.455 --- Config/Data.cs | 6 ------ .../BenchControl/Elde/ControlBoardDev.cs | 10 ++++++++-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Config/Data.cs b/Config/Data.cs index 4b1ad9fc8..fff74f4ac 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -72,12 +72,6 @@ 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 /// diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index 3436d6a59..1da136f1f 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Metering Systems /// using System; using System.Text; @@ -281,8 +281,14 @@ ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent, } else { +#if GENESIS + BalanceRange = new uint[tankCapacities.Length]; +#endif int cnt = Math.Min(BalanceRange.Length, tankCapacities.Length); - for (int i = 0; i < cnt; i++) BalanceRange[i] = (uint)tankCapacities[i]; + for (int i = 0; i < cnt; i++) + { + BalanceRange[i] = (uint)tankCapacities[i]; + } controlCom = new ControlComWrap(ctrlBrdComponent); } } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index e33c7287a..163ea85f4 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.453.1")] -[assembly: AssemblyFileVersion("2.12.453.1")] +[assembly: AssemblyVersion("2.12.455.1")] +[assembly: AssemblyFileVersion("2.12.455.1")]