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

'Config', 'Results' projects added, includes iPerl opto logging bug-fixes, builds OK, cannot open DB, version 2.0.158.

Browse Source
This commit is contained in:
Milan Hanajik
2015-12-05 14:18:36 +01:00
parent 29ece2f91c
commit f6cec9d769
360 changed files with 6406 additions and 4091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs
+8 -7
View File
@@ -8,6 +8,7 @@ using System.Globalization;
using System.Text;
using System.IO.Ports;
using log4net;
using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Boxes;
@@ -97,7 +98,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
{
msrmntState = MsrmntState.Failed; /// Data not valid yet
if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate) return;
if (balanceCfg.DebugLevel == DebugMode.Simulate) return;
stringBuilder = new StringBuilder(40);
string comPortName = "COM" + balanceCfg.ComPortNr.ToString();
@@ -120,7 +121,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
public void ZeroWhenStable()
{
if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate) return;
if (balanceCfg.DebugLevel == DebugMode.Simulate) return;
if (msrmntState == MsrmntState.Busy)
{
@@ -137,7 +138,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
public void Taring()
{
if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate) return;
if (balanceCfg.DebugLevel == DebugMode.Simulate) return;
if (msrmntState == MsrmntState.Busy)
{
@@ -157,7 +158,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
/// </summary>
public void GetStableMassMeasurement()
{
if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate) return;
if (balanceCfg.DebugLevel == DebugMode.Simulate) return;
if (msrmntState == MsrmntState.Busy)
{
@@ -177,7 +178,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
/// </summary>
public void GetImmediateMassMeasurement()
{
if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate) return;
if (balanceCfg.DebugLevel == DebugMode.Simulate) return;
if (msrmntState == MsrmntState.Busy)
{
@@ -208,7 +209,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
/// <remarks>After a successful SetUnits(kg) mass is still sent in g. MH 15.10.2013</remarks>
public void SetUnits(Units unit)
{
if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate) return;
if (balanceCfg.DebugLevel == DebugMode.Simulate) return;
if (msrmntState == MsrmntState.Busy)
{
@@ -235,7 +236,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
/// </summary>
public virtual void RunDeviceBefore()
{
if (balanceCfg.DebugLevel == Entities.DebugMode.Simulate)
if (balanceCfg.DebugLevel == DebugMode.Simulate)
{
mass = TestBenchSim.GetSimMass(balanceNr);
Masses[balanceNr] = mass;