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

Minor fixes, ver. 2.12.433

Browse Source
This commit is contained in:
Milan Hanajik
2016-12-29 12:29:37 +01:00
parent 535af59860
commit e43e0a6850
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Configs/NameOnly/TestMethodCfg.cs
-5
View File
@@ -1,11 +1,6 @@
/// ///
/// Copyright (c) 2016 Sensus Metering Systems /// Copyright (c) 2016 Sensus Metering Systems
/// ///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic; using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Configs.NameOnly namespace TBF.BenchControl.Configs.NameOnly
TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
-1
View File
@@ -1,6 +1,5 @@
/// ///
/// Copyright (c) 2013-2015 Sensus Metering Systems /// Copyright (c) 2013-2015 Sensus Metering Systems
/// Author: Milan Hanajik
/// ///
using System; using System;
using System.Globalization; using System.Globalization;
TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs
+3 -4
View File
@@ -1,6 +1,5 @@
/// ///
/// Copyright (c) 2013-2015 Sensus Metering Systems /// Copyright (c) 2013-2016 Sensus Metering Systems
/// Author: Milan Hanajik
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -251,14 +250,14 @@ namespace TBF.BenchControl.MettlerToledo.Standard
return; return;
} }
log.DebugFormat("{0} - RunDevice()", Name); log.DebugFormat("{0} - RunDeviceBefore()", Name);
if (msrmntState != MsrmntState.Busy) return; /// No measurement in progress if (msrmntState != MsrmntState.Busy) return; /// No measurement in progress
string justReceived = serialPort.ReadExisting(); string justReceived = serialPort.ReadExisting();
if (justReceived != null && justReceived.Length > 0) if (justReceived != null && justReceived.Length > 0)
{ {
log.DebugFormat("{0} - RunDevice() received {1}", Name, justReceived); log.DebugFormat("{0} - RunDeviceBefore() received {1}", Name, justReceived);
stringBuilder.Append(justReceived); stringBuilder.Append(justReceived);
} }
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.432.1")] [assembly: AssemblyVersion("2.12.433.1")]
[assembly: AssemblyFileVersion("2.12.432.1")] [assembly: AssemblyFileVersion("2.12.433.1")]