michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Genesis specific changes, error messages fixed, smalled branch scale fixed, ver.2.12.455

Browse Source
This commit is contained in:
Milan Hanajik
2017-02-09 12:34:36 +01:00
parent d96f124bb3
commit 7ac1f2d431
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Data.cs
-6
View File
@@ -72,12 +72,6 @@ namespace Config
public const int CompoundWMsCount = 0; public const int CompoundWMsCount = 0;
public const int HeatMetersCount = 0; public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize; 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 #endif
/// ///
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
+8 -2
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2013-2016 Sensus Metering Systems /// Copyright (c) 2013-2017 Sensus Metering Systems
/// ///
using System; using System;
using System.Text; using System.Text;
@@ -281,8 +281,14 @@ ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
} }
else else
{ {
#if GENESIS
BalanceRange = new uint[tankCapacities.Length];
#endif
int cnt = Math.Min(BalanceRange.Length, tankCapacities.Length); 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); controlCom = new ControlComWrap(ctrlBrdComponent);
} }
} }
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.12.453.1")] [assembly: AssemblyVersion("2.12.455.1")]
[assembly: AssemblyFileVersion("2.12.453.1")] [assembly: AssemblyFileVersion("2.12.455.1")]