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/Cameras/IdcCamera/IdcCamera.cs
+9 -8
View File
@@ -5,6 +5,7 @@ using System;
using System.Diagnostics;
using System.Collections.Generic;
using System.Threading;
using Config.Entities;
using TBF.BenchControl;
using TBF.BenchControl.Generic;
using log4net;
@@ -75,7 +76,7 @@ namespace TBF.BenchControl.Cameras.IdcCamera
public void Initialize()
{
if (idcCameraCfg.DebugLevel == Entities.DebugMode.Simulate)
if (idcCameraCfg.DebugLevel == DebugMode.Simulate)
{
log.WarnFormat("{0}: in simulation mode", Name);
return;
@@ -86,19 +87,19 @@ namespace TBF.BenchControl.Cameras.IdcCamera
RetVal rVal = Idc100.StartOp(new Command.Connect(3000)); /// timeout in ms
if (idcCameraCfg.DebugLevel == Entities.DebugMode.AutoDetect)
if (idcCameraCfg.DebugLevel == DebugMode.AutoDetect)
{
if (rVal == RetVal.OK)
idcCameraCfg.DebugLevel = Entities.DebugMode.DetectedOn;
idcCameraCfg.DebugLevel = DebugMode.DetectedOn;
else
idcCameraCfg.DebugLevel = Entities.DebugMode.DetectedOff;
idcCameraCfg.DebugLevel = DebugMode.DetectedOff;
}
else if (rVal != RetVal.OK)
{
throw (new Exception(string.Format("Cannot make a connection to {0} on COM{1}", Name, idcCameraCfg.ComPortNr)));
}
if (idcCameraCfg.DebugLevel != Entities.DebugMode.DetectedOff)
if (idcCameraCfg.DebugLevel != DebugMode.DetectedOff)
{
log.FatalFormat("Successfully initialized device {0}", ToString());
}
@@ -209,7 +210,7 @@ namespace TBF.BenchControl.Cameras.IdcCamera
/// <summary>Start the operation</summary>
public void Start()
{
if (Cfg.DebugLevel == Entities.DebugMode.Normal || Cfg.DebugLevel == Entities.DebugMode.DetectedOn)
if (Cfg.DebugLevel == DebugMode.Normal || Cfg.DebugLevel == DebugMode.DetectedOn)
{
switch (currentOp)
{
@@ -241,7 +242,7 @@ namespace TBF.BenchControl.Cameras.IdcCamera
/// <returns></returns>
public Event Run()
{
if (Cfg.DebugLevel == Entities.DebugMode.Normal || Cfg.DebugLevel == Entities.DebugMode.DetectedOn)
if (Cfg.DebugLevel == DebugMode.Normal || Cfg.DebugLevel == DebugMode.DetectedOn)
{
switch (currentOp)
{
@@ -295,7 +296,7 @@ namespace TBF.BenchControl.Cameras.IdcCamera
/// <summary>Stop the operation</summary>
public void Stop()
{
if ((Cfg.DebugLevel == Entities.DebugMode.Normal || Cfg.DebugLevel == Entities.DebugMode.DetectedOn)
if ((Cfg.DebugLevel == DebugMode.Normal || Cfg.DebugLevel == DebugMode.DetectedOn)
&& (Idc100.IdcState != IdcState.Idle))
{
Idc100.StopOp();