From e0629b11ff6d1753ce6f776444304e439e985d4b Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Wed, 1 Aug 2012 15:40:44 +0000 Subject: [PATCH] Minor changes git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@86 47cf9a05-e0a8-4ed5-9e9b-101a649bc004 --- ArduinoSerial/ArduinoSerial.suo | Bin 20992 -> 19456 bytes .../ArduinoSerial/ArduinoSerial.vcxproj | 1 + SerialWindows.cpp | 32 +++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ArduinoSerial/ArduinoSerial.suo b/ArduinoSerial/ArduinoSerial.suo index 3b31034879ee106d9c2e458fbc4e47609654ce71..97bf52904e3515e94a3811fff9eb9b2e8c59e4b4 100644 GIT binary patch delta 786 zcmYjO&1(};5P!3IZ?j1@Hcg9-`DhbUPije^6tp61yQ0Qo4Fo|HQJZKB`B>TrRzbI* zp1d?8;!(8TJk&nHYeDfO()RE0BoVEL#(8NgJIgFHzu$bknQ>RZeFdwIhK?RHvy8D} z(gUO)idAUwDM(<359zNje6q`RoadWi)=O+ZX@>+i`7o{rINlc*!!Sr_(95_z9RG+} zzN13Rx@{<<>#XXdu(MpehL(Rl^80-1PU+`S`{mZ%r602&(^xce(lVZa?-^rQJl@yJ zaH!!@I@1c;rs~`0?a~ZR<7b{1ega##9V~=FBU8C5w)@6rsAMEPKqy4cB^5>;zMP`b?gk-VHT$X1El*;!)9zc3=u*Oc~GIw_g-$t z{D7^rMU~6I@Ll{I-W0Lr9G6DI0XQWWlMexs@>l9RSF6MJ;SE!#RG+67wzE^xH8|i? z!_kErp^hR@ICHr&zc9DZtkh>JBYXC(+to^G&Y5gftCgANT%)d{IUx%|EhC`nM$}J9 z2*t$sn&k@Ivd3`j*mF5?@-(cC*qUh&ttM2md$(Now%E?mv?*f6UW8)BRdUvFQDku? zl*Al2B7;nWgM@NVn4Tv`X!37fhqvxokTBW-=ty_`h7ac_uVDH_9A3~#@^7r@KjGl` A;{X5v delta 2316 zcmd6pOH30%7{_PImX@*&uL`w*yfH+Ieb7cKkCrYf1wjNKBzq9rMyl90Z9yJ2_F$q3 zdaz>*oQ&u}5)Z&$ydmPr1A(gt;@QN+LrEkt;x~Q3UQFYGhDmS7_iJPx zN8aLPzvMa3mRBN#s(@;s2B-z&_qX&_=vN?Glbo%LFIlFn-0-f_fE6@hC108@B zumPQb9pHd2-~wy27MAZz@1)I8i|hW6C&(qhGjva!PL!!PyvG_0U4Pobg-omP>6ygR=CA7AQXzk zQo2-$sp;9{;EO?Pn6v0CIw4QBE5V!e;m8%^O=8u!q!><*E72-dRBcyc4G1No2}wxZ zuSEHvoD`{2x*N8HJ+%yz(MArY8YAyD*8Csg-OZWxvc846>nrD82Iqv|nlQ$_!gSdz z#udVD`6ff`WqJ~;-eRdssc23TtLc3h@QjS}wt#EG8NSaIpq)d?u6|Y{#wu- z2=YU|kdNnl&WU?&Zz#wI15Q3T>2AWvKa#i@&ZJW%=D6YUx_tM8O-{c*9G>NL zU3#0zZq{}hO)c8yu4cWqrPHj_8ja=xQ;Wf1H`ok@2g#(7JeB^4U5)*Rs}G5#JVIAZ zY3(F)q<|!4z)spVOWG*`I~ZZQp=tA2Gq-?gEvgQ;6@$2AWUTejSR!qQM>WFmhAtcm z=r#1|M}RvyV6VAmd{nRu78BBfJw 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; } } -- 2.30.2