Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 714 → Rev 715

/QMK-Groundstation/trunk/Global/Class_Input/Input_TCP.cpp
22,6 → 22,7
{
b_Open = false;
Timer = new QTimer();
s_Buffer = "";
connect(Timer, SIGNAL(timeout()), this, SLOT(slot_Timer()));
 
for (int z = 0; z < MAX_Confirm; z++)
78,7 → 79,7
}
 
QByteArray Temp;
Temp = QByteArray(t_Data.toAscii());
Temp = QByteArray(QString(t_Data + "\n").toAscii());
 
TCP_Socket->write(Temp);
TCP_Socket->flush();
140,8 → 141,10
void Input_TCP::slot_TCP_ReadLine()
{
// QString t_Data = QString(TCP_Socket->readLine(TCP_Socket->bytesAvailable())).remove(QChar('\n'));
QString t_Data = QString(TCP_Socket->readAll());
QString t_Data = s_Buffer + QString(TCP_Socket->readAll());
 
s_Buffer = "";
 
QStringList l_Data;
l_Data = t_Data.split('\n');
 
148,11 → 151,15
for (int z = 0; z < l_Data.count(); z++)
{
 
if ((l_Data[z].length() > 3) && (t_Data[l_Data[z].length() - 1] == '\r'))
if ((l_Data[z][l_Data[z].length() - 1] == '\r'))
{
emit(sig_NewData(l_Data[z]));
// qDebug(QString("DATA: _" + l_Data[z] + "_ < END").toLatin1().data());
}
else
{
s_Buffer = s_Buffer + l_Data[z];
}
}
}