Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 715 → Rev 713

/QMK-Groundstation/trunk/Global/Class_Input/Input_TCP.cpp
22,7 → 22,6
{
b_Open = false;
Timer = new QTimer();
s_Buffer = "";
connect(Timer, SIGNAL(timeout()), this, SLOT(slot_Timer()));
 
for (int z = 0; z < MAX_Confirm; z++)
79,7 → 78,7
}
 
QByteArray Temp;
Temp = QByteArray(QString(t_Data + "\n").toAscii());
Temp = QByteArray(t_Data.toAscii());
 
TCP_Socket->write(Temp);
TCP_Socket->flush();
141,10 → 140,8
void Input_TCP::slot_TCP_ReadLine()
{
// QString t_Data = QString(TCP_Socket->readLine(TCP_Socket->bytesAvailable())).remove(QChar('\n'));
QString t_Data = s_Buffer + QString(TCP_Socket->readAll());
QString t_Data = QString(TCP_Socket->readAll());
 
s_Buffer = "";
 
QStringList l_Data;
l_Data = t_Data.split('\n');
 
151,15 → 148,11
for (int z = 0; z < l_Data.count(); z++)
{
 
if ((l_Data[z][l_Data[z].length() - 1] == '\r'))
if ((l_Data[z].length() > 3) && (t_Data[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];
}
}
}
 
/QMK-Groundstation/trunk/Global/Class_Input/Input_TCP.h
48,7 → 48,6
QTimer *Timer;
bool b_Open;
s_Resend Confirm[MAX_Confirm];
QString s_Buffer;
 
private slots:
// void slot_newDataReceived(const QByteArray &dataReceived);