Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 307 → Rev 313

/QMK-Groundstation/trunk/Classes/cConnection.cpp
23,7 → 23,10
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
201,12 → 204,13
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)
{
// LastSend = TX_Data;
// TickerEvent[0] = true;
o_Timer->start(2000);
s_ReSend = Temp;
}
Temp = QByteArray(TX_Data.toUtf8());
}
else
{
234,3 → 238,27
}
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)));
}
/QMK-Groundstation/trunk/Classes/cConnection.h
21,6 → 21,7
 
#include <QObject>
#include <QTcpSocket>
#include <QTimer>
 
#include "ToolBox.h"
#include "../global.h"
39,10 → 40,15
bool Open(int Typ, QString Address);
bool Close();
bool send_Cmd(char CMD, int Address, char Data[150],unsigned int Length, bool Resend = true);
void stop_ReSend();
 
private:
ManageSerialPort *TTY;
QTcpSocket *TcpSocket;
QTimer *o_Timer;
 
QByteArray s_ReSend;
 
bool b_isOpen;
int i_Type;
sRxData RxData;
54,6 → 60,8
void slot_IP_Connected();
void slot_IP_Disconnect();
void slot_IP_ReadLine();
 
void slot_Timer();
// void slot_Error(QAbstractSocket::SocketError Error);
 
signals: