nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove USE_STANDARD_SERIAL conditional compilation flag

Browse source 
- Issue MatterHackers/MCCentral#2533
This commit is contained in:
John Lewin 2018-01-02 21:26:50 -08:00
parent 94f0c05e44
commit 091d4c9ed0
4 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControl.Printing/Communication/FrostedSerial/CSharpSerialPortWrapper.cs
View file

@ -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
}
}

2
MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPort.cs
View file

@ -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

2
MatterControl.Printing/Communication/FrostedSerial/FrostedSerialPortFactory.cs
View file

@ -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;

4
MatterControl.Printing/MatterControl.Printing.csproj
View file

@ -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>