From 71cc77bee1c6b1d9b2ff72b7b7d6e74d19f500fd Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 10 Apr 2017 12:11:20 +0200 Subject: [PATCH] Keithley.Multimeter_2010_RS232.Multimeter shut-down bug fix, ver. 2.12.536 --- .../Keithley/Multimeter_2010_RS232/Multimeter.cs | 10 +++++++--- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs b/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs index 7cf80a64d..476a07923 100644 --- a/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs +++ b/TestBenchFramework/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs @@ -200,7 +200,7 @@ namespace TBF.BenchControl.Keithley.Multimeter_2010_RS232 /// Run this device public void RunDeviceBefore() { - if (multimeterCfg.DebugLevel == DebugMode.Simulate) return; + if (serialPort == null) return; receivedData.Append(serialPort.ReadExisting()); @@ -244,7 +244,7 @@ namespace TBF.BenchControl.Keithley.Multimeter_2010_RS232 /// Run this device public void RunDeviceAfter() { - if (multimeterCfg.DebugLevel == DebugMode.Simulate) return; + if (serialPort == null) return; switch (scanState) { @@ -297,7 +297,11 @@ namespace TBF.BenchControl.Keithley.Multimeter_2010_RS232 { if (multimeterCfg.DebugLevel == DebugMode.Simulate) return; - serialPort.Close(); + if (serialPort != null) + { + serialPort.Close(); + serialPort = null; + } } } } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index ec27560dd..7327e0901 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.535.1")] -[assembly: AssemblyFileVersion("2.12.535.1")] +[assembly: AssemblyVersion("2.12.536.1")] +[assembly: AssemblyFileVersion("2.12.536.1")]