From: Thomas Pietrzak Date: Wed, 1 Aug 2012 15:40:44 +0000 (+0000) Subject: Minor changes X-Git-Url: https://git.thomaspietrzak.com/?a=commitdiff_plain;h=e0629b11ff6d1753ce6f776444304e439e985d4b;p=arduinoserial.git 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 3b31034..97bf529 100644 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 d736a70..c5a628a 100644 --- a/ArduinoSerial/ArduinoSerial/ArduinoSerial.vcxproj +++ b/ArduinoSerial/ArduinoSerial/ArduinoSerial.vcxproj @@ -39,6 +39,7 @@ true + $(ProjectName)d false diff --git a/SerialWindows.cpp b/SerialWindows.cpp index 0dab561..80da82c 100644 --- a/SerialWindows.cpp +++ b/SerialWindows.cpp @@ -2,10 +2,10 @@ #include using namespace std; - -#ifdef WIN32 -#include -#endif + +#ifdef WIN32 +#include +#endif SerialWindows::SerialWindows(const char *portName, int baudrate) :Serial(portName) @@ -33,15 +33,15 @@ SerialWindows::SerialWindows(const char *portName, int baudrate) } else { - /* - 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";*/ + /* + 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";*/ //If connected we try to set the comm parameters @@ -169,9 +169,9 @@ bool SerialWindows::WriteData(void *buffer, unsigned int nbChar) //ClearCommError(_hSerial, &_errors, &_status); /* if(!FlushFileBuffers(_hSerial)) cout << "ERROR while flushing" << endl;*/ -/* stringstream s; - s << bytesSend << " SENT" << endl; - OutputDebugString(s.str().c_str());*/ +/* stringstream s; + s << bytesSend << " SENT" << endl; + OutputDebugString(s.str().c_str());*/ return true; } }