Adds immediate migration results in progress

This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071

No files matched your search

@@ -8,17 +8,16 @@
namespace WirelessLocationSystem
{
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId))
{
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
bool DdsHandler::init(const QStringList &qosFileList)
{
if (!m_ddsConnector->init(qosFileList))
{
ERROR_LOG() << "Error initializing dds connections - aborting";
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
return false;
}
@@ -31,6 +31,7 @@ public:
}
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
};
@@ -6,9 +6,8 @@
namespace WirelessLocationSystem
{
IsmHandler::IsmHandler(QObject *parent)
: QObject(parent)
{}
IsmHandler::IsmHandler(QObject *parent) : QObject(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
bool IsmHandler::init(MainHandler *mainHandler)
{
@@ -21,7 +20,7 @@ bool IsmHandler::init(MainHandler *mainHandler)
if (!m_dtcIsm->enableMainStructureElement())
{
ERROR_LOG() << "Can not read data from ISM";
ERROR_LOG(m_logger) << "Can not read data from ISM";
return false;
}
@@ -31,6 +31,7 @@ private Q_SLOTS:
private:
NGL::INGLLogger &m_logger;
QHash<int, InfrastructureManagement::MainStructureElement> m_mainStructureElements;
QHash<int, int> m_externalWlsId2MseId;
@@ -8,10 +8,9 @@
namespace WirelessLocationSystem
{
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_ddsHandler(nullptr)
{}
MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_ddsHandler(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
MainHandler::~MainHandler()
{
@@ -46,6 +46,8 @@ public:
}
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<WlsParticipantHandler> m_wlsParticipantHandler;
std::shared_ptr<WlsHandler> m_wlsHandler;
@@ -21,11 +21,10 @@ namespace WirelessLocationSystem
const char *exerciseIdProperty = "exerciseId";
WebSocketHandler::WebSocketHandler(QObject *parent)
: QObject(parent)
WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
, m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
, m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint()))
{}
, m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint())),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
WebSocketHandler::~WebSocketHandler()
{}
@@ -37,7 +36,7 @@ bool WebSocketHandler::init(std::shared_ptr<WlsHandler> wlsHandler,
{
if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
{
WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting" << m_webSocketServer->errorString();
WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting" << m_webSocketServer->errorString();
return false;
}
@@ -58,7 +57,7 @@ void WebSocketHandler::onNewConnection()
if (ws == nullptr)
return;
DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
connect(ws, &QWebSocket::textMessageReceived,
this, &WebSocketHandler::onTextMessageReceived);
@@ -68,14 +67,14 @@ void WebSocketHandler::onNewConnection()
connect(this, &WebSocketHandler::signalBroadcastMessage,
ws, [this, ws](const QString &msg, int exerciseId)
{
DEBUG_LOG() << "broadcast: exercise property is valid? " << ws->property(exerciseIdProperty).isValid() << " for " << ws->peerPort();
DEBUG_LOG(m_logger) << "broadcast: exercise property is valid? " << ws->property(exerciseIdProperty).isValid() << " for " << ws->peerPort();
bool exerciseIdAvailable = false;
int wsExerciseId = ws->property(exerciseIdProperty).toInt(&exerciseIdAvailable);
if (exerciseIdAvailable && wsExerciseId != exerciseId)
{
DEBUG_LOG() << "broadcast: websocket has " << wsExerciseId << ", but " << exerciseId << " was requested";
DEBUG_LOG(m_logger) << "broadcast: websocket has " << wsExerciseId << ", but " << exerciseId << " was requested";
return;
}
@@ -102,7 +101,7 @@ void WebSocketHandler::sendTelegramInternal(const TrainingAreaBase::TetraIcd::Tr
const QString jsonStr(QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)));
DEBUG_LOG() << "jsonStr: " << jsonStr;
DEBUG_LOG(m_logger) << "jsonStr: " << jsonStr;
emit signalBroadcastMessage(jsonStr, exerciseId);
}
@@ -139,7 +138,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
{
using namespace TrainingAreaBase::TetraIcd;
TRACE_LOG() << "WebSocketHandler::onTextMessageReceived: " << baJson;
TRACE_LOG(m_logger) << "WebSocketHandler::onTextMessageReceived: " << baJson;
QWebSocket *ws = qobject_cast<QWebSocket*>(sender());
if (ws == nullptr)
@@ -153,7 +152,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
if (err.error != QJsonParseError::NoError)
{
ERROR_LOG() << "received invalid json from websocket at " << err.offset << ": " << err.errorString();
ERROR_LOG(m_logger) << "received invalid json from websocket at " << err.offset << ": " << err.errorString();
return;
}
@@ -172,7 +171,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
const QJsonValue typeId(obj.value(QStringLiteral("typeId")));
if (!typeId.isDouble())
{
ERROR_LOG() << "Can not read type id: " << baJson;
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
return;
}
@@ -191,7 +190,7 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
{
int exerciseId = ExerciseStateData::fromJson(data).exerciseId;
ws->setProperty(exerciseIdProperty, exerciseId);
DEBUG_LOG() << "set exercise id " << exerciseId << " for ws with peer port " << ws->peerPort();
DEBUG_LOG(m_logger) << "set exercise id " << exerciseId << " for ws with peer port " << ws->peerPort();
sendParticipantConnectionStates(exerciseId);
break;
}
@@ -202,14 +201,14 @@ void WebSocketHandler::onTextMessageReceived(const QString &baJson)
m_participantHandler->handleWlsBinarySfmData(WlsBinarySfmData::fromJson(data));
break;
default:
WARNING_LOG() << "Handler for telegram Id " << typeId.toInt()
WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
<< " not yet implemented (" << baJson << ")";
return;
}
}
catch (const std::exception &e)
{
WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
return;
}
}
@@ -271,16 +270,16 @@ void WebSocketHandler::setPosition(T &tele, const WlsParticipant *participant)
void WebSocketHandler::sendPosition(const WlsParticipant *participant)
{
INFO_LOG() << "sendPosition equipmentNumber=" << participant->equipmentNumber();
INFO_LOG(m_logger) << "sendPosition equipmentNumber=" << participant->equipmentNumber();
if (!participant || !participant->positionIsValid() || participant->equipmentNumber() == 0)
{
INFO_LOG() << "not send - participant is not yet fully initialized";
INFO_LOG(m_logger) << "not send - participant is not yet fully initialized";
return;
}
if (participant->isGpsMode())
{
INFO_LOG() << "not send - participant is in gps mode";
INFO_LOG(m_logger) << "not send - participant is in gps mode";
return;
}
TrainingAreaBase::TetraIcd::PositionReport posValue;
@@ -62,6 +62,7 @@ signals:
void signalBroadcastMessage(const QString &msg, int exerciseId);
private:
NGL::INGLLogger &m_logger;
template <typename T>
void setPosition(T &tele, const WlsParticipant *participant);
void sendTelegramInternal(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,
@@ -32,11 +32,10 @@ static inline QByteArray escapeData(const QByteArray &bufferData)
return ret;
}
WlsHandler::WlsHandler(QObject *parent)
: QObject(parent)
{
WlsHandler::WlsHandler(QObject *parent) : QObject(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
if (Settings::wlsMgrsBasePoint().size() <= 15)
WARNING_LOG() << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
WARNING_LOG(m_logger) << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
}
WlsHandler::~WlsHandler()
@@ -50,14 +49,14 @@ bool WlsHandler::init(WlsParticipantHandler *participantHandler,
{
m_participantHandler = participantHandler;
m_wsHandler = wsHandler;
INFO_LOG() << "WlsHandler::init";
INFO_LOG(m_logger) << "WlsHandler::init";
delete m_tcpServer;
m_tcpServer = new QTcpServer(this);
connect(m_tcpServer, &QTcpServer::newConnection,
this, &WlsHandler::onIncomingConnection);
if (!m_tcpServer->listen(QHostAddress::Any, listenPort))
{
WARNING_LOG() << "Error listening on port " << listenPort;
WARNING_LOG(m_logger) << "Error listening on port " << listenPort;
return false;
}
@@ -87,7 +86,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
auto itSocket = m_tcpSocketByTagId.constFind(tagId);
if (itSocket == m_tcpSocketByTagId.constEnd())
{
ERROR_LOG() << "Can't find a TCP-socket for tag id: " << tagId;
ERROR_LOG(m_logger) << "Can't find a TCP-socket for tag id: " << tagId;
return false;
}
@@ -112,7 +111,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
data.append(s_endMark);
(*itSocket)->write(data);
DEBUG_LOG() << "Sending telegram to wls: " << escapeData(data);
DEBUG_LOG(m_logger) << "Sending telegram to wls: " << escapeData(data);
}
(*itSocket)->flush();
return true;
@@ -120,7 +119,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
void WlsHandler::onIncomingConnection()
{
INFO_LOG() << "WlsHandler::onIncomingConnection";
INFO_LOG(m_logger) << "WlsHandler::onIncomingConnection";
QTcpSocket *tcpSocket = m_tcpServer->nextPendingConnection();
if (!tcpSocket)
return;
@@ -145,7 +144,7 @@ void WlsHandler::onIncomingData()
return;
auto &tcpBuffer = m_tcpSockets[s];
const QByteArray bufferData = tcpBuffer + s->readAll();
TRACE_LOG() << "WlsHandler::onIncomingData bufferData='" << escapeData(bufferData) << "'";
TRACE_LOG(m_logger) << "WlsHandler::onIncomingData bufferData='" << escapeData(bufferData) << "'";
tcpBuffer = parseBuffer(bufferData, s);
@@ -156,7 +155,7 @@ void WlsHandler::onSocketDisconnected()
QTcpSocket *s = qobject_cast<QTcpSocket *>(sender());
if (!s)
return;
INFO_LOG() << "Socket disconnected";
INFO_LOG(m_logger) << "Socket disconnected";
m_tcpSockets.remove(s);
@@ -202,7 +201,7 @@ void WlsHandler::parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket)
const WlsTelegramId telegramId = static_cast<WlsTelegramId>(parts.at(0).toInt());
const QDateTime timestamp = QDateTime::fromString(QString::fromUtf8(parts.at(1)), QStringLiteral("yyyy-MM-dd hh:mm:ss.zzz"));
if (telegramId != WlsTelegramId::PlayerPosition)
DEBUG_LOG() << "Handling " << telegramId
DEBUG_LOG(m_logger) << "Handling " << telegramId
<< ", data: '" << escapeData(baTele) << "'";
bool bOk = true;
switch (telegramId)
@@ -220,11 +219,11 @@ void WlsHandler::parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket)
bOk = handleDataPayloadMobileToHost(parts);
break;
case WlsTelegramId::PayloadHostToMobile:
WARNING_LOG() << "Protocol error - got a message which should not be sent from Wls (PayloadHostToMobile)";
WARNING_LOG(m_logger) << "Protocol error - got a message which should not be sent from Wls (PayloadHostToMobile)";
break;
}
if (!bOk)
WARNING_LOG() << "Error handling telegram: '" << baTele << "'";
WARNING_LOG(m_logger) << "Error handling telegram: '" << baTele << "'";
}
bool WlsHandler::findNextSyncStartByte(const QByteArray &buffer, int &iCurReadPos)
@@ -257,7 +256,7 @@ bool WlsHandler::handleVersionsinformation(const QList<QByteArray> &data)
{
if (data.size() < 4)
return false;
DEBUG_LOG() << "TX(WLS): Version = " << data.at(3);
DEBUG_LOG(m_logger) << "TX(WLS): Version = " << data.at(3);
return true;
}
@@ -290,7 +289,7 @@ bool WlsHandler::handlePlayerPosition(const QList<QByteArray> &data, const QDate
pos.z += m_wlsZOffset;
p->setPosition(pos, timestamp.toMSecsSinceEpoch());
INFO_LOG() << p->getPlayerIdStr() << ": handlePlayerPosition"
INFO_LOG(m_logger) << p->getPlayerIdStr() << ": handlePlayerPosition"
<< " x=" << pos.x << ", y=" << pos.y << ", z=" << pos.z
<< ", wlsAreaId=" << pos.wlsAreaId
<< ", wlsBuildingId=" << pos.wlsBuildingId
@@ -324,7 +323,7 @@ bool WlsHandler::handlePlayerState(const QList<QByteArray> &data)
p->voltage = voltage / 10.;
INFO_LOG() << p->getPlayerIdStr() << ": handlePlayerState"
INFO_LOG(m_logger) << p->getPlayerIdStr() << ": handlePlayerState"
<< " timeout=" << timeout
<< " ,tacticalState=" << tacticalState
<< " ,voltage=" << p->voltage;
@@ -340,7 +339,7 @@ bool WlsHandler::checkPayloadIsHex(const QByteArray &payload) const
(c < 'a' || c > 'f') &&
(c < 'A' || c > 'F'))
{
WARNING_LOG() << "Payload data is not hex coded ...";
WARNING_LOG(m_logger) << "Payload data is not hex coded ...";
return false;
}
}
@@ -360,7 +359,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
QSharedPointer<SfmMessage_rx> msg = SfmMessageConverter::generateRxMessage(payload);
if (!msg)
{
WARNING_LOG() << "Can not convert payload to SfmMessage ... ";
WARNING_LOG(m_logger) << "Can not convert payload to SfmMessage ... ";
return false;
}
@@ -387,7 +386,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
case SfmMessage::MsgId::LicenseState:
case SfmMessage::MsgId::TacticalState:
default:
WARNING_LOG() << "RX(WLS): MessageID(" << static_cast<int>(msg->getId()) << ")";
WARNING_LOG(m_logger) << "RX(WLS): MessageID(" << static_cast<int>(msg->getId()) << ")";
break;
}
return true;
@@ -397,7 +396,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgEquipmentId *sfmTele)
{
const int equipmentNumber = sfmTele->getEquipmentNumber();
INFO_LOG() << participant->getPlayerIdStr() << ": handlePayload"
INFO_LOG(m_logger) << participant->getPlayerIdStr() << ": handlePayload"
<< " - new equipmentNumber = " << equipmentNumber;
if (participant->equipmentNumber() == 0 ||
participant->equipmentNumber() != equipmentNumber)
@@ -414,7 +413,7 @@ void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgRequestG
void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgSfmRestart_rx *sfmTele)
{
WARNING_LOG() << "Restart notification ... " << participant->tagId();
WARNING_LOG(m_logger) << "Restart notification ... " << participant->tagId();
Q_UNUSED(sfmTele)
participant->setWlsZone(-1);
@@ -441,7 +440,7 @@ void WlsHandler::sendGpsMode(WlsParticipant *participant)
return;
SfmMsgGpsControl_tx msg;
msg.setGpsOn(participant->isGpsMode());
INFO_LOG() << participant->getPlayerIdStr() << ": sendGpsMode"
INFO_LOG(m_logger) << participant->getPlayerIdStr() << ": sendGpsMode"
<< " GpsMode = " << participant->isGpsMode();
sendWlsMessage(participant->tagId(), msg);
}
@@ -452,7 +451,7 @@ bool WlsHandler::parseDoubleCm(const QByteArray &data, double &num) const
num = data.toDouble(&bOk);
if (!bOk)
{
WARNING_LOG() << "Error parsing floating point number '" << data << "'";
WARNING_LOG(m_logger) << "Error parsing floating point number '" << data << "'";
return false;
}
num /= 100;
@@ -465,7 +464,7 @@ bool WlsHandler::parseInteger(const QByteArray &data, int &num) const
num = data.toInt(&bOk);
if (!bOk)
{
WARNING_LOG() << "Error parsing number '" << data << "'";
WARNING_LOG(m_logger) << "Error parsing number '" << data << "'";
return false;
}
return true;
@@ -493,7 +492,7 @@ WlsParticipant *WlsHandler::participantFromTagId(const QByteArray &tagId, bool b
SfmMsgRequestEquipmentId_tx getEqId;
INFO_LOG() << "Requesting Equipment number for tag " << tagId;
INFO_LOG(m_logger) << "Requesting Equipment number for tag " << tagId;
sendWlsMessage(tagId, getEqId);
p->lastEquipmentNumberRequest = tNow;
}
@@ -17,6 +17,7 @@ class WlsHandler : public QObject
{
Q_OBJECT
private:
NGL::INGLLogger &m_logger;
enum class WlsTelegramId
{
VersionInformation = 0,
@@ -53,6 +54,7 @@ private Q_SLOTS:
void onIncomingData();
void onSocketDisconnected();
private:
NGL::INGLLogger &m_logger;
QByteArray parseBuffer(const QByteArray &buffer, QTcpSocket *socket);
void parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket);
static bool findNextSyncStartByte(const QByteArray &buffer, int &iCurReadPos);
@@ -74,6 +76,7 @@ private:
WlsParticipant *participantFromTagId(const QByteArray &tagId, bool bAskForEqIdIfNew = true);
private:
NGL::INGLLogger &m_logger;
QTcpServer *m_tcpServer = nullptr;
WlsParticipantHandler *m_participantHandler = nullptr;
WebSocketHandler *m_wsHandler = nullptr;
@@ -14,10 +14,9 @@ static constexpr int s_maxWlsRetryCount = 3;
namespace WirelessLocationSystem
{
WlsParticipant::WlsParticipant(QObject *parent)
: QObject(parent)
, m_wlsTeleTimeoutTimer(new QTimer(this))
{
WlsParticipant::WlsParticipant(QObject *parent) : QObject(parent)
, m_wlsTeleTimeoutTimer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_wlsTeleTimeoutTimer->setSingleShot(true);
m_wlsTeleTimeoutTimer->setTimerType(Qt::VeryCoarseTimer);
m_wlsTeleTimeoutTimer->setInterval(s_dataCommunicationAliveTimeout);
@@ -54,12 +53,12 @@ void WlsParticipant::setPosition(const RelativePosition &newPosition,
if (tsCurrentPos == m_lastSeenPosition ||
(((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout()) && comparePos(m_relativePosition, newPosition)))
{
DEBUG_LOG() << "Check for pos Update";
DEBUG_LOG() << "Is Outdated= " <<((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout());
DEBUG_LOG(m_logger) << "Check for pos Update";
DEBUG_LOG(m_logger) << "Is Outdated= " <<((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout());
if (((tsCurrentPos - m_lastSeenPosition) <= Settings::deadPosTimeout()) && comparePos(m_relativePosition, newPosition))
{
DEBUG_LOG() << "Same Position or not older than 5000msecs " << tsCurrentPos - m_lastSeenPosition;
DEBUG_LOG(m_logger) << "Same Position or not older than 5000msecs " << tsCurrentPos - m_lastSeenPosition;
return;
}
const qint64 tsNow = QDateTime::currentMSecsSinceEpoch();
@@ -99,7 +98,7 @@ void WlsParticipant::checkGpsOnOffTimeoutTimer(qint64 tNow)
if (m_lastSeenDataCommunication > tNow - s_maxWlsRetryCount * s_dataCommunicationAliveTimeout)
return;
DEBUG_LOG() << getPlayerIdStr() << ": lastSeenDataCommunication: "
DEBUG_LOG(m_logger) << getPlayerIdStr() << ": lastSeenDataCommunication: "
<< m_lastSeenDataCommunication << ", now: "
<< (tNow - s_maxWlsRetryCount * s_dataCommunicationAliveTimeout)
<< " (" << tNow << "), "
@@ -141,14 +140,14 @@ void WlsParticipant::setWlsZone(int newWlsZone)
m_dataCommunication = (newWlsZone > 3)
? DataCommunication::On
: DataCommunication::Off;
INFO_LOG() << getPlayerIdStr() << ": wlsZone old: " << m_wlsZone << ", new: " << newWlsZone
INFO_LOG(m_logger) << getPlayerIdStr() << ": wlsZone old: " << m_wlsZone << ", new: " << newWlsZone
<< ", new gps mode: " << m_gpsMode
<< ", new data comm mode: " << m_dataCommunication
<< ", " << this;
}
else
{
INFO_LOG() << getPlayerIdStr() << ": Reset zone/data comunication status - sfm was restarted";
INFO_LOG(m_logger) << getPlayerIdStr() << ": Reset zone/data comunication status - sfm was restarted";
m_gpsMode = GpsMode::On;
m_dataCommunication = DataCommunication::Unknown;
m_lastSeenPosition = -1;
@@ -169,7 +168,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
{
if (!isRecvCounterCorrect(sfmTele->sendCounter()))
{
WARNING_LOG() << "Got data telegram with counter " << int(sfmTele->sendCounter())
WARNING_LOG(m_logger) << "Got data telegram with counter " << int(sfmTele->sendCounter())
<< " last one was " << int(m_lastRecvCounter) << " - ignoring";
return false;
}
@@ -179,7 +178,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
{
if (m_sfmRxPayloadFragmentNumber + 1 != sfmTele->fragmentNumber())
{
WARNING_LOG() << getPlayerIdStr() << ": Missing a fragment (waiting for "
WARNING_LOG(m_logger) << getPlayerIdStr() << ": Missing a fragment (waiting for "
<< (m_sfmRxPayloadFragmentNumber + 1)
<< ", got " << sfmTele->fragmentNumber() << ")";
if (sfmTele->fragmentNumber() != 1)
@@ -200,7 +199,7 @@ bool WlsParticipant::handleSfmRxData(const SfmMsgTetra_rx *sfmTele)
{
if (m_sfmRxPayloadFragmentNumber != 0)
WARNING_LOG() << getPlayerIdStr()
WARNING_LOG(m_logger) << getPlayerIdStr()
<< ": Got unfragmented telegram but currently waiting for next fragment of a fragmented telegram";
m_sfmRxPayloadFragmentNumber = 0;
m_sfmRxPayloadData = sfmTele->payload();
@@ -265,7 +264,7 @@ void WlsParticipant::sendBinarySfmData(const std::vector<unsigned char> &data)
const QByteArray ba = LtsUtils::toQByteArray(data);
if (!calcChunkCountAndLen(ba, chunkCount, chunkLen))
{
WARNING_LOG() << getPlayerIdStr()
WARNING_LOG(m_logger) << getPlayerIdStr()
<< ": Internal error calculating chunk size for payload size " << data.size();
return;
}
@@ -290,7 +289,7 @@ void WlsParticipant::handleWlsAck(const Acknowledge_rx *ack)
if (ack->recvCounter() != m_nextSendCounter)
{
WARNING_LOG() << "Got ack for telegram with counter " << int(ack->recvCounter())
WARNING_LOG(m_logger) << "Got ack for telegram with counter " << int(ack->recvCounter())
<< " but expected " << int(m_nextSendCounter) << " - ignoring";
return;
}
@@ -298,7 +297,7 @@ void WlsParticipant::handleWlsAck(const Acknowledge_rx *ack)
{
if (m_wlsQueue.isEmpty())
{
ERROR_LOG() << "got an ack but nothing was sent - something went terribly wrong - resetting send/recv counter";
ERROR_LOG(m_logger) << "got an ack but nothing was sent - something went terribly wrong - resetting send/recv counter";
m_nextSendCounter = 0;
m_lastRecvCounter = 0;
return;
@@ -343,7 +342,7 @@ void WlsParticipant::sendNextWlsTelegram(bool bIsResend)
m_wlsQueue.clear();
return;
}
WARNING_LOG() << getPlayerIdStr()
WARNING_LOG(m_logger) << getPlayerIdStr()
<< ": Trying to send a wls telegram but no data communication possible";
Q_ASSERT(false);
@@ -364,14 +363,14 @@ void WlsParticipant::sendNextWlsTelegram(bool bIsResend)
void WlsParticipant::onWlsTeleTimeout()
{
++m_wlsTeleTimeoutCounter;
DEBUG_LOG() << getPlayerIdStr()
DEBUG_LOG(m_logger) << getPlayerIdStr()
<< ": Resend WLS connection to participant " << m_equipmentNumber
<< "(" << m_tagId << ")"
<< " m_wlsTeleTimeoutCounter =" << m_wlsTeleTimeoutCounter
<< " s_maxWlsRetryCount=" << s_maxWlsRetryCount;
if (m_wlsTeleTimeoutCounter == s_maxWlsRetryCount)
{
WARNING_LOG() << getPlayerIdStr()
WARNING_LOG(m_logger) << getPlayerIdStr()
<< ": Lost WLS connection to participant " << m_equipmentNumber
<< "(" << m_tagId << ")";
m_lastSeenDataCommunication = -1;
@@ -102,6 +102,7 @@ public:
return ret;
}
protected:
NGL::INGLLogger &m_logger;
explicit WlsParticipant(QObject *parent = nullptr);
public:
void setPosition(const RelativePosition &newPosition, qint64 tsCurrentPos);
@@ -10,10 +10,9 @@
namespace WirelessLocationSystem
{
WlsParticipantHandler::WlsParticipantHandler(QObject *parent)
: QObject(parent)
, m_gpsOnOffTimeoutTimer(new QTimer(this))
{
WlsParticipantHandler::WlsParticipantHandler(QObject *parent) : QObject(parent)
, m_gpsOnOffTimeoutTimer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
connect(m_gpsOnOffTimeoutTimer, &QTimer::timeout, this, &WlsParticipantHandler::onGpsOnOffTimeoutTimer);
m_gpsOnOffTimeoutTimer->setSingleShot(false);
m_gpsOnOffTimeoutTimer->start(1000);
@@ -94,7 +93,7 @@ void WlsParticipantHandler::handleWlsBinarySfmData(const TrainingAreaBase::Tetra
WlsParticipant *p = m_participantsByEqId.value(data.header.equipmentNumber);
if (!p)
{
WARNING_LOG() << "Got binary sfm data for participant with eqId " << data.header.equipmentNumber
WARNING_LOG(m_logger) << "Got binary sfm data for participant with eqId " << data.header.equipmentNumber
<< " but could not find this participant!";
return;
}
@@ -39,6 +39,7 @@ public:
private Q_SLOTS:
void onGpsOnOffTimeoutTimer();
private:
NGL::INGLLogger &m_logger;
WebSocketHandler *m_wsHandler = nullptr;
WlsHandler *m_wlsHandler = nullptr;