From 091d4c9ed07d7184875f18fe9980d26b0aceca20 Mon Sep 17 00:00:00 2001
From: John Lewin <lewin76@gmail.com>
Date: Tue, 2 Jan 2018 21:26:50 -0800
Subject: [PATCH] Remove USE_STANDARD_SERIAL conditional compilation flag

- Issue MatterHackers/MCCentral#2533
---
 .../Communication/FrostedSerial/CSharpSerialPortWrapper.cs  | 6 +-----
 .../Communication/FrostedSerial/FrostedSerialPort.cs        | 2 --
 .../Communication/FrostedSerial/FrostedSerialPortFactory.cs | 2 --
 MatterControl.Printing/MatterControl.Printing.csproj        | 4 ++--
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/MatterControl.Printing/Communication/FrostedSerial/CSharpSerialPortWrapper.cs b/MatterControl.Printing/Communication/FrostedSerial/CSharpSerialPortWrapper.cs
index 532e05531..c375354f1 100644
--- a/MatterControl.Printing/Communication/FrostedSerial/CSharpSerialPortWrapper.cs
+++ b/MatterControl.Printing/Communication/FrostedSerial/CSharpSerialPortWrapper.cs
@@ -33,8 +33,6 @@ using System.Text;
 
 namespace MatterHackers.SerialPortCommunication.FrostedSerial
 {
-#if USE_STANDARD_SERIAL
-
 	public class CSharpSerialPortWrapper : IFrostedSerialPort
 	{
 		private System.IO.Ports.SerialPort port;
@@ -162,6 +160,4 @@ namespace MatterHackers.SerialPortCommunication.FrostedSerial
 			return port.Read(buffer, offset, count);
 		}
 	}
-
-#endif
-		}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPort.cs b/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPort.cs
index e9190a98a..428600aba 100644
--- a/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPort.cs
+++ b/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPort.cs
@@ -178,7 +178,6 @@ namespace MatterHackers.SerialPortCommunication.FrostedSerial
 			}
 			else
 			{
-#if USE_STANDARD_SERIAL
 				using (RegistryKey subkey = Registry.LocalMachine.OpenSubKey("HARDWARE\\DEVICEMAP\\SERIALCOMM"))
 				{
 					if (subkey != null)
@@ -192,7 +191,6 @@ namespace MatterHackers.SerialPortCommunication.FrostedSerial
 						}
 					}
 				}
-#endif
 			}
 
 #if DEBUG
diff --git a/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPortFactory.cs b/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPortFactory.cs
index 6381219f1..c13d5c64b 100644
--- a/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPortFactory.cs
+++ b/MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPortFactory.cs
@@ -147,9 +147,7 @@ namespace MatterHackers.SerialPortCommunication.FrostedSerial
 			}
 			else // use the c# native serial port
 			{
-#if USE_STANDARD_SERIAL
 				newPort = new CSharpSerialPortWrapper(serialPortName);
-#endif
 			}
 
 			return newPort;
diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj
index 87606b8ac..66078ac23 100644
--- a/MatterControl.Printing/MatterControl.Printing.csproj
+++ b/MatterControl.Printing/MatterControl.Printing.csproj
@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;USE_STANDARD_SERIAL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;USE_STANDARD_SERIAL</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>