Minor changes

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@86 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

diff --git a/ArduinoSerial/ArduinoSerial.suo b/ArduinoSerial/ArduinoSerial.suo
index 3b31034879ee106d9c2e458fbc4e47609654ce71..97bf52904e3515e94a3811fff9eb9b2e8c59e4b4 100644 (file)
Binary files a/ArduinoSerial/ArduinoSerial.suo and b/ArduinoSerial/ArduinoSerial.suo differ

diff --git a/ArduinoSerial/ArduinoSerial/ArduinoSerial.vcxproj b/ArduinoSerial/ArduinoSerial/ArduinoSerial.vcxproj
index d736a700563578a5a059bd4aadd4ab5cef624938..c5a628a4bd7546b0aed9d20336f087e14386d4f5 100644 (file)
--- a/ArduinoSerial/ArduinoSerial/ArduinoSerial.vcxproj
+++ b/ArduinoSerial/ArduinoSerial/ArduinoSerial.vcxproj
@@ -39,6 +39,7 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <LinkIncremental>true</LinkIncremental>\r
+    <TargetName>$(ProjectName)d</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r

diff --git a/SerialWindows.cpp b/SerialWindows.cpp
index 0dab561ba38808fb7e7a41c94d079fee40bbf442..80da82cdb3886d7ebc56f2775f17323b3b940a38 100644 (file)
--- a/SerialWindows.cpp
+++ b/SerialWindows.cpp
@@ -2,10 +2,10 @@
 \r
 #include <iostream>\r
 using namespace std;\r
-
-#ifdef WIN32
-#include <windows.h>
-#endif
+\r
+#ifdef WIN32\r
+#include <windows.h>\r
+#endif\r
 \r
 SerialWindows::SerialWindows(const char *portName, int baudrate)\r
 :Serial(portName)\r
@@ -33,15 +33,15 @@ SerialWindows::SerialWindows(const char *portName, int baudrate)
     }\r
     else\r
     {\r
-       /*      
-       COMMTIMEOUTS commTimeouts;
-       commTimeouts.ReadIntervalTimeout = 1;
-       commTimeouts.ReadTotalTimeoutMultiplier = 10;
-       commTimeouts.ReadTotalTimeoutConstant = 100;
-       commTimeouts.WriteTotalTimeoutMultiplier = 10;
-       commTimeouts.WriteTotalTimeoutConstant = 100;
-       if (SetCommTimeouts(_comport, &commTimeouts) == 0)
-               throw "Cannot set COM port timeouts";*/
+       /*      \r
+       COMMTIMEOUTS commTimeouts;\r
+       commTimeouts.ReadIntervalTimeout = 1;\r
+       commTimeouts.ReadTotalTimeoutMultiplier = 10;\r
+       commTimeouts.ReadTotalTimeoutConstant = 100;\r
+       commTimeouts.WriteTotalTimeoutMultiplier = 10;\r
+       commTimeouts.WriteTotalTimeoutConstant = 100;\r
+       if (SetCommTimeouts(_comport, &commTimeouts) == 0)\r
+               throw "Cannot set COM port timeouts";*/\r
 \r
 \r
         //If connected we try to set the comm parameters\r
@@ -169,9 +169,9 @@ bool SerialWindows::WriteData(void *buffer, unsigned int nbChar)
         //ClearCommError(_hSerial, &_errors, &_status);\r
 /*             if(!FlushFileBuffers(_hSerial))\r
                        cout << "ERROR while flushing" << endl;*/\r
-/*             stringstream s;
-               s << bytesSend << " SENT" << endl;
-               OutputDebugString(s.str().c_str());*/
+/*             stringstream s;\r
+               s << bytesSend << " SENT" << endl;\r
+               OutputDebugString(s.str().c_str());*/\r
         return true;\r
        }\r
 }\r