Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 313 → Rev 312

/QMK-Groundstation/trunk/Classes/cConnection.cpp
23,10 → 23,7
i_Type = 0;
 
TTY = new ManageSerialPort();
o_Timer = new QTimer(this);
 
connect(o_Timer, SIGNAL(timeout()), SLOT(slot_Timer()));
 
TTY->setBaudRate(BAUD57600); //BaudRate
TTY->setDataBits(DATA_8); //DataBits
TTY->setParity(PAR_NONE); //Parity
204,13 → 201,12
TX_Data = QString("#") + (QString('a' + Address)) + QString(CMD) + TX_Data;
TX_Data = ToolBox::add_CRC(TX_Data) + '\r';
 
Temp = QByteArray(TX_Data.toUtf8());
 
if (Resend)
{
o_Timer->start(2000);
s_ReSend = Temp;
// LastSend = TX_Data;
// TickerEvent[0] = true;
}
Temp = QByteArray(TX_Data.toUtf8());
}
else
{
238,27 → 234,3
}
return true;
}
 
void cConnection::stop_ReSend()
{
o_Timer->stop();
}
 
void cConnection::slot_Timer()
{
switch(i_Type)
{
case C_TTY :
{
TTY->sendData(s_ReSend);
}
break;
case C_IP :
{
TcpSocket->write(s_ReSend);
}
break;
}
 
emit(showTerminal(3, QString(s_ReSend)));
}