Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 448 → Rev 449

/QMK-Groundstation/branches/libMK/Classes/cConnection.cpp
44,7 → 44,7
{
//Data = Data;
 
while ((RxData.str.size() > 1) && (RxData.str.substr(1,1) == string("#")))
/* while ((RxData.str.size() > 1) && (RxData.str.substr(1,1) == string("#")))
{
RxData.str = RxData.str.substr(1, RxData.str.size());
}
58,11 → 58,12
{
emit(showTerminal(2, QString(RxData.str.c_str())));
}
 
*/
}
 
void cConnection::slot_newDataReceived(const QByteArray &dataReceived)
{
/*
const char *RXt;
RXt = dataReceived.data();
int a = 0;
80,6 → 81,7
}
a++;
}
*/
}
 
bool cConnection::isOpen()
181,26 → 183,25
if (Input[z] == '\r')
{
new_Data(QString(""));
RxData.str = string("");
//RxData.str = string("");
}
else
{
RxData.str = RxData.str + Input[z].toAscii();
//RxData.str = RxData.str + Input[z].toAscii();
}
}
}
 
bool cConnection::send_Cmd(char CMD, int Address, char Data[150],unsigned int Length, bool Resend)
bool cConnection::send_Cmd(char CMD, int Address, char Data[MAX_DATA_SIZE],unsigned int Length, bool Resend)
{
if (b_isOpen)
if (b_isOpen) //is_connected()
{
QByteArray Temp;
string TX_Data;
 
/*
if (CMD != '#')
{
TX_Data = Parser::encode64(Data, Length);
 
string TX_Data;
char addr = 'a' + Address;
TX_Data = string("#") + (string(&addr)) + string(&CMD) + TX_Data;
TX_Data = Parser::add_CRC(TX_Data) + '\r';
212,6 → 213,7
o_Timer->start(2000);
s_ReSend = Temp;
}
emit(showTerminal(3, QString(TX_Data.c_str())));
}
else
{
220,7 → 222,7
Temp[a] = Data[a];
}
}
 
*/
switch(i_Type)
{
case C_TTY :
234,8 → 236,6
}
break;
}
 
emit(showTerminal(3, QString(TX_Data.c_str())));
}
return true;
}