Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+12
-12
@@ -29,7 +29,7 @@ NmeaDispatcher::NmeaDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
m_nmeaHost = getNmeaHost();
|
||||
m_nmeaPort = getNmeaPort();
|
||||
|
||||
DEBUG_LOG() << "Host: " << m_nmeaHost << " Port: " << m_nmeaPort;
|
||||
DEBUG_LOG(m_logger) << "Host: " << m_nmeaHost << " Port: " << m_nmeaPort;
|
||||
m_socket = new QUdpSocket(this);
|
||||
connect(m_socket, &QUdpSocket::connected, this, &NmeaDispatcher::connected);
|
||||
connect(m_socket, &QUdpSocket::disconnected, this, &NmeaDispatcher::disconnected);
|
||||
@@ -59,12 +59,12 @@ void NmeaDispatcher::exerciseChanged()
|
||||
|
||||
void NmeaDispatcher::reconnect()
|
||||
{
|
||||
INFO_LOG() << "Connecting,.." << " host = " << m_nmeaHost
|
||||
INFO_LOG(m_logger) << "Connecting,.." << " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;;
|
||||
|
||||
if(!m_socket->bind(m_nmeaPort, QAbstractSocket::BindFlag::ShareAddress | QAbstractSocket::BindFlag::ReuseAddressHint))
|
||||
{
|
||||
ERROR_LOG() << "Error from Socket: " << m_socket->errorString();
|
||||
ERROR_LOG(m_logger) << "Error from Socket: " << m_socket->errorString();
|
||||
m_reconnectTimer->start(10000);
|
||||
}
|
||||
else
|
||||
@@ -77,25 +77,25 @@ void NmeaDispatcher::connected()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
m_txHandler->onUdpSocketConnected(m_socket, m_nmeaPort, m_nmeaHost);
|
||||
DEBUG_LOG() << "Connected!";
|
||||
DEBUG_LOG(m_logger) << "Connected!";
|
||||
}
|
||||
|
||||
|
||||
void NmeaDispatcher::disconnected()
|
||||
{
|
||||
m_reconnectTimer->start();
|
||||
DEBUG_LOG() << "Disconnected!";
|
||||
DEBUG_LOG(m_logger) << "Disconnected!";
|
||||
}
|
||||
|
||||
void NmeaDispatcher::bytesWritten(qint64 bytes)
|
||||
{
|
||||
DEBUG_LOG() << "We wrote: " << bytes;
|
||||
DEBUG_LOG(m_logger) << "We wrote: " << bytes;
|
||||
}
|
||||
|
||||
void NmeaDispatcher::reconnectTimerSlot()
|
||||
{
|
||||
m_reconnectTimer->stop();
|
||||
INFO_LOG() << "Reconnect NMEA-Socket "
|
||||
INFO_LOG(m_logger) << "Reconnect NMEA-Socket "
|
||||
<< " host = " << m_nmeaHost
|
||||
<< " port = " << m_nmeaPort;
|
||||
reconnect();
|
||||
@@ -104,7 +104,7 @@ void NmeaDispatcher::reconnectTimerSlot()
|
||||
|
||||
void NmeaDispatcher::readyRead()
|
||||
{
|
||||
DEBUG_LOG() << "Reading...";
|
||||
DEBUG_LOG(m_logger) << "Reading...";
|
||||
|
||||
|
||||
QByteArray ba;
|
||||
@@ -114,18 +114,18 @@ void NmeaDispatcher::readyRead()
|
||||
|
||||
ba.resize(int(m_socket->pendingDatagramSize()));
|
||||
m_socket->readDatagram(ba.data(), ba.size());
|
||||
INFO_LOG() << ba;
|
||||
INFO_LOG(m_logger) << ba;
|
||||
QByteArray nmeaDataBa = ba;
|
||||
std::string nmeaDataStd = nmeaDataBa.toStdString() ;
|
||||
QString nmeaData = QString::fromLocal8Bit(nmeaDataStd.c_str());
|
||||
|
||||
|
||||
DEBUG_LOG() << "nmeaDecoder :" << nmeaData;
|
||||
DEBUG_LOG(m_logger) << "nmeaDecoder :" << nmeaData;
|
||||
|
||||
m_rxHandler->handleTelegram(nmeaData);
|
||||
|
||||
DEBUG_LOG() << "NMEA-Data=" << nmeaData;
|
||||
DEBUG_LOG() << "NMEA-Data ba=" << ba;
|
||||
DEBUG_LOG(m_logger) << "NMEA-Data=" << nmeaData;
|
||||
DEBUG_LOG(m_logger) << "NMEA-Data ba=" << ba;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user