--- branches/linux-serial/H7Serial.cpp 2007/02/04 21:22:44 44 +++ branches/linux-serial/H7Serial.cpp 2007/02/05 10:10:18 54 @@ -1,17 +1,16 @@ -#ifdef _WINDOWS -#include "StdAfx.h" -#endif +#include "stdafx.h" #include "H7Serial.h" #include +#include CH7Serial::CH7Serial(void) : CSlipSerial() { } -CH7Serial::CH7Serial(char* port, int bitrate) +CH7Serial::CH7Serial(char* port, Baudrate bitrate) : CSlipSerial(port, bitrate) { } @@ -22,14 +21,18 @@ short CH7Serial::readTarget(unsigned char target) { + using namespace std; + cout << "read start" << endl; short retval; unsigned char frame[1]; unsigned char hi_target = (target & 0x0F) << 4; frame[0] = hi_target | 0x00; writeFrame(frame,1); + cout << "read mid" << endl; Sleep(50); //be nice and wait a little std::vector answer = readFrame(); + cout << "read done" << endl; if (answer.size() == 0) throw std::runtime_error("No reply"); @@ -52,15 +55,19 @@ void CH7Serial::writeTarget(unsigned char target, unsigned char data) { + using namespace std; unsigned char frame[2]; unsigned char hi_target = (target & 0x0F) << 4; frame[0] = hi_target | 0x01; frame[1] = data; + cout << "write start" << endl; writeFrame(frame,2); + cout << "write mid" << endl; Sleep(50); //be nice and wait a little std::vector answer = readFrame(); - + + cout << "write stop" << endl; if (answer.size() == 0) throw std::runtime_error("No reply");