Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -44,8 +44,8 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
|
||||
connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWritten(qint64)));
|
||||
|
||||
INFO_LOG() << "Connecting,..";
|
||||
INFO_LOG() << nmeaHost << " port: " << nmeaPort;
|
||||
INFO_LOG(m_logger) << "Connecting,..";
|
||||
INFO_LOG(m_logger) << nmeaHost << " port: " << nmeaPort;
|
||||
//socket->connectToHost(QHostAddress::LocalHost, nmeaPort);
|
||||
//socket->connectToHost(nmeaHost, nmeaPort);
|
||||
reconnect();
|
||||
@@ -54,12 +54,12 @@ void SocketHandler::init(QString nmeaHost, int nmeaPort)
|
||||
|
||||
void SocketHandler::reconnect()
|
||||
{
|
||||
INFO_LOG() << "Connecting,.." << " host = " << m_nmeaHost
|
||||
INFO_LOG(m_logger) << "Connecting,.." << " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;;
|
||||
|
||||
if(!socket->bind(m_nmeaPort, QAbstractSocket::BindFlag::ShareAddress))
|
||||
{
|
||||
ERROR_LOG() << "Error from Socket: " << socket->errorString();
|
||||
ERROR_LOG(m_logger) << "Error from Socket: " << socket->errorString();
|
||||
m_reconnectTimer->start(10000);
|
||||
}
|
||||
|
||||
@@ -69,24 +69,24 @@ void SocketHandler::connected()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
|
||||
INFO_LOG() << "Connected!";
|
||||
INFO_LOG(m_logger) << "Connected!";
|
||||
}
|
||||
|
||||
|
||||
void SocketHandler::disconnected()
|
||||
{
|
||||
INFO_LOG() << "Disconnected!";
|
||||
INFO_LOG(m_logger) << "Disconnected!";
|
||||
}
|
||||
|
||||
void SocketHandler::bytesWritten(qint64 bytes)
|
||||
{
|
||||
TRACE_LOG() << "We wrote: " << bytes;
|
||||
TRACE_LOG(m_logger) << "We wrote: " << bytes;
|
||||
}
|
||||
|
||||
void SocketHandler::reconnectTimerSlot()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
INFO_LOG() << "Reconnect NMEA-Socket "
|
||||
INFO_LOG(m_logger) << "Reconnect NMEA-Socket "
|
||||
<< " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;
|
||||
reconnect();
|
||||
@@ -96,7 +96,7 @@ void SocketHandler::reconnectTimerSlot()
|
||||
void SocketHandler::readyRead()
|
||||
{
|
||||
bool hasData = true;
|
||||
INFO_LOG() << "Reading...";
|
||||
INFO_LOG(m_logger) << "Reading...";
|
||||
// QByteArray ba = socket->readDatagram();
|
||||
|
||||
QByteArray ba;
|
||||
@@ -106,18 +106,18 @@ void SocketHandler::readyRead()
|
||||
|
||||
ba.resize(int(socket->pendingDatagramSize()));
|
||||
socket->readDatagram(ba.data(), ba.size());
|
||||
INFO_LOG() << ba;
|
||||
INFO_LOG(m_logger) << ba;
|
||||
QByteArray nmeaDataBa = ba; // ba.mid(startNmeaData, endNmeaData);
|
||||
std::string nmeaDataStd = nmeaDataBa.toStdString() ;
|
||||
QString nmeaData = QString::fromLocal8Bit(nmeaDataStd.c_str());
|
||||
|
||||
|
||||
INFO_LOG() << "nmeaDecoder :" << nmeaData;
|
||||
INFO_LOG(m_logger) << "nmeaDecoder :" << nmeaData;
|
||||
//ba = ba.mid(endNmeaData, ba.length());
|
||||
m_nmeaHandler->decode(nmeaData);
|
||||
|
||||
INFO_LOG() << "NMEA-Data=" << nmeaData;
|
||||
INFO_LOG() << "NMEA-Data ba=" << ba;
|
||||
INFO_LOG(m_logger) << "NMEA-Data=" << nmeaData;
|
||||
INFO_LOG(m_logger) << "NMEA-Data ba=" << ba;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ void SocketHandler::onTurnRadioMasterOffRequest(const rti::core::SampleIdentity
|
||||
|
||||
Core::FunctionReplyObject reply;
|
||||
if (reply.error())
|
||||
WARNING_LOG() << "onTurnRadioMasterOffReply: " << reply();
|
||||
WARNING_LOG(m_logger) << "onTurnRadioMasterOffReply: " << reply();
|
||||
|
||||
m_ddsHandler->fts()->turnRadioMasterOffReply(cookie, reply);
|
||||
|
||||
|
||||
Reference in new issue
Block a user