Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+2
@@ -31,6 +31,8 @@ public:
|
||||
const char *name() const override { return tr_lts("dds", "Nme"); }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
NmeaDispatcher *m_tetraDispatcher;
|
||||
NGL::Settings *m_settings;
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
|
||||
|
||||
+1
@@ -62,6 +62,7 @@ public:
|
||||
bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
template <typename T>
|
||||
bool sendToTxMixin(const T *data);
|
||||
private:
|
||||
|
||||
+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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -42,10 +42,12 @@ private slots:
|
||||
void readyRead();
|
||||
void reconnectTimerSlot();
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void reconnect();
|
||||
QString getNmeaHost();
|
||||
int getNmeaPort();
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<NmeaHandlerRx> m_rxHandler;
|
||||
std::shared_ptr<NmeaHandlerTx> m_txHandler;
|
||||
TrainingAreaBase::Plugin::DataProvider *m_dataProvider;
|
||||
|
||||
+22
-23
@@ -11,10 +11,9 @@
|
||||
namespace Nmea
|
||||
{
|
||||
|
||||
NmeaHandlerRx::NmeaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler)
|
||||
: m_rxHandler(rxHandler)
|
||||
, m_bWarnedOnce(false)
|
||||
{
|
||||
NmeaHandlerRx::NmeaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler) : m_rxHandler(rxHandler)
|
||||
, m_bWarnedOnce(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
|
||||
|
||||
|
||||
@@ -48,7 +47,7 @@ void NmeaHandlerRx::decode(QString nmeaPackage)
|
||||
nmeaPackage.remove(0, startingPoint);
|
||||
|
||||
nmeaType = nmeaPackage.mid(1, 5);
|
||||
INFO_LOG() << "nmeaType=" << nmeaType;
|
||||
INFO_LOG(m_logger) << "nmeaType=" << nmeaType;
|
||||
|
||||
if (nmeaType == QStringLiteral("IIXDR"))
|
||||
{
|
||||
@@ -57,10 +56,10 @@ void NmeaHandlerRx::decode(QString nmeaPackage)
|
||||
|
||||
if (nmeaType == QStringLiteral("GPGGA"))
|
||||
{
|
||||
INFO_LOG() << "Eigenposition";
|
||||
INFO_LOG(m_logger) << "Eigenposition";
|
||||
if (checksum(nmeaPackage))
|
||||
{
|
||||
INFO_LOG() << "Eigenposition checksum ok";
|
||||
INFO_LOG(m_logger) << "Eigenposition checksum ok";
|
||||
GPGGA(nmeaPackage);
|
||||
}
|
||||
}
|
||||
@@ -132,29 +131,29 @@ void NmeaHandlerRx::IIXDR(const QString &package)
|
||||
ServiceControl serviceControl;
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
INFO_LOG() << "----------------------------------------------------";
|
||||
INFO_LOG() << "batteryState pkt_data.size=" << pkt_data.size();
|
||||
INFO_LOG(m_logger) << "----------------------------------------------------";
|
||||
INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
|
||||
for (int i = 0; i < pkt_data.size(); i++)
|
||||
INFO_LOG() << "i=" << i << "Value=" << pkt_data[i];
|
||||
INFO_LOG(m_logger) << "i=" << i << "Value=" << pkt_data[i];
|
||||
|
||||
|
||||
int index = pkt_data.indexOf(QLatin1String("S")) + 1;
|
||||
if ( index >= 1)
|
||||
{
|
||||
INFO_LOG() << "Ausschalten!!!";
|
||||
INFO_LOG(m_logger) << "Ausschalten!!!";
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_PRESHUTDOWN"))
|
||||
{
|
||||
INFO_LOG() << "SERVICE_CONTROL_PRESHUTDOWN";
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_PRESHUTDOWN";
|
||||
serviceControl.serviceControlState = ServiceControlEnum::PRESHUTDOWN;
|
||||
}
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN"))
|
||||
{
|
||||
INFO_LOG() << "SERVICE_CONTROL_SHUTDOWN";
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN";
|
||||
serviceControl.serviceControlState = ServiceControlEnum::SHUTDOWN;
|
||||
}
|
||||
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP"))
|
||||
{
|
||||
INFO_LOG() << "SERVICE_CONTROL_STOP";
|
||||
INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP";
|
||||
serviceControl.serviceControlState = ServiceControlEnum::STOP;
|
||||
}
|
||||
serviceControl.header.equipmentNumber = 1;
|
||||
@@ -229,7 +228,7 @@ void NmeaHandlerRx::IIXDR(const QString &package)
|
||||
batteryState.voltage = voltage;
|
||||
|
||||
batteryState.serialNumber = serialNumber;
|
||||
INFO_LOG() << "publish batteryState serialNumber=" << serialNumber;
|
||||
INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber;
|
||||
batteryInfo.batteryStates = {batteryState};
|
||||
batteryInfo.header.equipmentNumber = 1;
|
||||
batteryInfo.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
|
||||
@@ -243,7 +242,7 @@ void NmeaHandlerRx::IIALR(const QString &package)
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep);
|
||||
alarm_state packageData;
|
||||
INFO_LOG() << "pkt_data.size=" << pkt_data.size();
|
||||
INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
|
||||
|
||||
|
||||
|
||||
@@ -262,7 +261,7 @@ void NmeaHandlerRx::IIALR(const QString &package)
|
||||
|
||||
qint64 timeAlarm = getDateTime(packageData.time);
|
||||
|
||||
INFO_LOG() << "time=" << packageData.time
|
||||
INFO_LOG(m_logger) << "time=" << packageData.time
|
||||
<< " timeAlarm=" << timeAlarm
|
||||
<< " number=" << packageData.number
|
||||
<< " condition=" << packageData.condition
|
||||
@@ -339,9 +338,9 @@ void NmeaHandlerRx::GPGGA(const QString &package)
|
||||
lonDeg *= -1;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "RAW Nmea Position: " << packageData.D_longitude << " | " << packageData.B_latitude;
|
||||
DEBUG_LOG() << "Lat: " << latDeg;
|
||||
DEBUG_LOG() << "Lon: " << lonDeg;
|
||||
DEBUG_LOG(m_logger) << "RAW Nmea Position: " << packageData.D_longitude << " | " << packageData.B_latitude;
|
||||
DEBUG_LOG(m_logger) << "Lat: " << latDeg;
|
||||
DEBUG_LOG(m_logger) << "Lon: " << lonDeg;
|
||||
|
||||
PositionExcon.geoPosition.lat = latDeg * M_PI / 180.0;
|
||||
PositionExcon.geoPosition.lon = lonDeg * M_PI / 180.0;
|
||||
@@ -371,7 +370,7 @@ void NmeaHandlerRx::GPRMC(const QString &package)
|
||||
packageData.K_variacao_magnetica_coord = pkt_data[11].toStdString()[0];
|
||||
|
||||
|
||||
INFO_LOG() << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
|
||||
INFO_LOG(m_logger) << "velocidade=" << QString::number(packageData.G_velocity * 1.852);
|
||||
|
||||
}
|
||||
|
||||
@@ -404,7 +403,7 @@ void NmeaHandlerRx::sendTestMessages()
|
||||
batteryState.generic = 1;
|
||||
batteryState.serialNumber = QStringLiteral("Test");
|
||||
batteryState.temperature = 38.8;
|
||||
DEBUG_LOG() << "Send BatteryInfo Message";
|
||||
DEBUG_LOG(m_logger) << "Send BatteryInfo Message";
|
||||
batteryInfo.batteryStates = {batteryState};
|
||||
batteryInfo.header.equipmentNumber = 1;
|
||||
batteryInfo.header.timeStamp = QDateTime::currentMSecsSinceEpoch();
|
||||
@@ -419,7 +418,7 @@ void NmeaHandlerRx::rxData(const T &data)
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
ERROR_LOG() << "No RecvFromTab available";
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
return;
|
||||
|
||||
+1
@@ -123,6 +123,7 @@ private:
|
||||
qint64 getDateTime(QString receivedTimeStr);
|
||||
QStringList m_batteries;
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
|
||||
bool m_bWarnedOnce;
|
||||
};
|
||||
|
||||
+2
@@ -69,6 +69,8 @@ signals:
|
||||
void outgoingMessage(const QByteArray &msg);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QUdpSocket *m_udpSocket;
|
||||
QString m_nmeaHost;
|
||||
int m_nmeaPort;
|
||||
|
||||
Reference in new issue
Block a user