Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+2
@@ -32,6 +32,8 @@ public:
|
||||
const char *name() const override { return tr_lts("dds", "WlsTetra"); }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
WlsDispatcher *m_wlsDispatcher;
|
||||
TetraDispatcher *m_tetraDispatcher;
|
||||
|
||||
|
||||
+1
-1
@@ -250,7 +250,7 @@ bool MainHandlerTx::txData(const TetraIcd::Sanitation &data)
|
||||
|
||||
bool MainHandlerTx::txData(const TetraIcd::SelectiveReammunition &data)
|
||||
{
|
||||
DEBUG_LOG() << "MainHandlerTx::txData SelectiveReammunition";
|
||||
DEBUG_LOG(m_logger) << "MainHandlerTx::txData SelectiveReammunition";
|
||||
return sendToTxMixin(&data);
|
||||
}
|
||||
bool MainHandlerTx::txData(const TetraIcd::SetDevicePowerRequest &data)
|
||||
|
||||
+2
@@ -64,9 +64,11 @@ 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:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<WlsHandlerTx> m_wlsHandlerTx;
|
||||
std::shared_ptr<TetraHandlerTx> m_tetraHandlerTx;
|
||||
};
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ void TetraDispatcher::onSendInitialData()
|
||||
m_txHandler->setConnected(true);
|
||||
if (m_dataProvider)
|
||||
{
|
||||
INFO_LOG() << "sending initial data";
|
||||
INFO_LOG(m_logger) << "sending initial data";
|
||||
|
||||
if (m_dataProvider->exerciseId() > 0)
|
||||
{
|
||||
|
||||
+3
@@ -39,6 +39,7 @@ public:
|
||||
const char *name() const override { return tr_lts("dds", "TETRA"); }
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool init(PrtCnv::PrtCnvApplication *prtCnvApp);
|
||||
|
||||
private Q_SLOTS:
|
||||
@@ -46,9 +47,11 @@ private Q_SLOTS:
|
||||
void onSendInitialData();
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void disconnectSocket(QWebSocket *s);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<TetraHandlerRx> m_rxHandler;
|
||||
std::shared_ptr<TetraHandlerTx> m_txHandler;
|
||||
TetraPrtCnv *m_tetraPrtCnv;
|
||||
|
||||
+9
-10
@@ -10,13 +10,12 @@
|
||||
namespace WlsTetra
|
||||
{
|
||||
|
||||
TetraHandlerRx::TetraHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler)
|
||||
: m_rxHandler(rxHandler)
|
||||
TetraHandlerRx::TetraHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler) : m_rxHandler(rxHandler)
|
||||
, m_ackTimer(new QTimer(this))
|
||||
, m_receiveCounter(0)
|
||||
, m_bWarnedOnce(false)
|
||||
, m_bWaitForInitialAck(true)
|
||||
{
|
||||
, m_bWaitForInitialAck(true),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_ackTimer->setInterval(1000);
|
||||
m_ackTimer->setSingleShot(false);
|
||||
connect(m_ackTimer, &QTimer::timeout,
|
||||
@@ -37,14 +36,14 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
if (!sendCounter.isDouble())
|
||||
return false;
|
||||
m_receiveCounter = sendCounter.toInt(-1);
|
||||
DEBUG_LOG() << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
|
||||
DEBUG_LOG(m_logger) << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
|
||||
if (m_receiveCounter < 0)
|
||||
return false;
|
||||
}
|
||||
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 false;
|
||||
}
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
@@ -167,14 +166,14 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
emit participantLicenseChange(ParticipantLicenseChange::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 false;
|
||||
}
|
||||
}
|
||||
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 false;
|
||||
}
|
||||
return true;
|
||||
@@ -182,7 +181,7 @@ bool TetraHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
|
||||
void TetraHandlerRx::handleAcknowledge(qint64 timeStamp, int counter)
|
||||
{
|
||||
TRACE_LOG() << "Ack from Socket for time " << timeStamp
|
||||
TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp
|
||||
<< " with counter " << counter
|
||||
<< ", initial: " << m_bWaitForInitialAck;
|
||||
if (m_bWaitForInitialAck)
|
||||
@@ -209,7 +208,7 @@ void TetraHandlerRx::rxData(const T &data)
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
ERROR_LOG() << "No RecvFromTab available";
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
return;
|
||||
|
||||
+1
@@ -33,6 +33,7 @@ private:
|
||||
void rxData(const T &data);
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
|
||||
QTimer *m_ackTimer;
|
||||
int m_receiveCounter;
|
||||
|
||||
+4
-4
@@ -40,14 +40,14 @@ bool TetraHandlerTx::sendTele(const QByteArray &ba)
|
||||
const QJsonValue typeId = obj[QStringLiteral("typeId")];
|
||||
if (typeId.toInt() == TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
{
|
||||
TRACE_LOG() << "Outgoing ack";
|
||||
TRACE_LOG(m_logger) << "Outgoing ack";
|
||||
emit outgoingMessage(ba);
|
||||
return true;
|
||||
}
|
||||
|
||||
obj[QStringLiteral("counter")] = m_sendCounter++;
|
||||
const QByteArray baToSend = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
DEBUG_LOG() << "Outgoing message: " << typeId.toInt();
|
||||
DEBUG_LOG(m_logger) << "Outgoing message: " << typeId.toInt();
|
||||
emit outgoingMessage(baToSend);
|
||||
return true;
|
||||
}
|
||||
@@ -234,7 +234,7 @@ bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::Sanitation &data)
|
||||
|
||||
bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data)
|
||||
{
|
||||
DEBUG_LOG() << " TetraHandlerTx::txData: SelectiveReammunition";
|
||||
DEBUG_LOG(m_logger) << " TetraHandlerTx::txData: SelectiveReammunition";
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
@@ -261,7 +261,7 @@ bool TetraHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTele
|
||||
obj[QStringLiteral("counter")] = m_sendCounter++;
|
||||
const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
DEBUG_LOG() << "Sending tele: " << ba;
|
||||
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
|
||||
emit outgoingMessage(ba);
|
||||
return true;
|
||||
}
|
||||
|
||||
+2
@@ -67,7 +67,9 @@ public:
|
||||
Q_SIGNALS:
|
||||
void outgoingMessage(const QByteArray &msg);
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_sendCounter = 1;
|
||||
bool m_bConnected = false;
|
||||
};
|
||||
|
||||
+4
-4
@@ -43,7 +43,7 @@ void TetraPrtCnv::onExerciseChanged()
|
||||
{
|
||||
if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId)
|
||||
if (!updatePrtCnv())
|
||||
ERROR_LOG() << "Error changing PrtCnv state from radio grp id: "
|
||||
ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
|
||||
<< m_radioGrpId
|
||||
<< " to " << m_pdp->exerciseRadioGroup().id();
|
||||
}
|
||||
@@ -72,7 +72,7 @@ bool TetraPrtCnv::updatePrtCnv()
|
||||
if (!QFile::copy(QStringLiteral(":/PrtCnv.dat"), iniFileOut()) ||
|
||||
!QFile::setPermissions(iniFileOut(), QFile::ReadOwner | QFile::WriteOwner))
|
||||
{
|
||||
ERROR_LOG() << "Error creating ini file for PrtCnv: " << iniFileOut();
|
||||
ERROR_LOG(m_logger) << "Error creating ini file for PrtCnv: " << iniFileOut();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -112,10 +112,10 @@ bool TetraPrtCnv::checkConfigTemplates()
|
||||
{
|
||||
if (!QFile::exists(playerIdsFile()))
|
||||
{
|
||||
INFO_LOG() << "Creating " << playerIdsFile();
|
||||
INFO_LOG(m_logger) << "Creating " << playerIdsFile();
|
||||
if (!QFile::copy(QStringLiteral(":/playerIds.dat"), playerIdsFile()))
|
||||
{
|
||||
ERROR_LOG() << "Error creating " << playerIdsFile();
|
||||
ERROR_LOG(m_logger) << "Error creating " << playerIdsFile();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
|
||||
+1
@@ -31,6 +31,7 @@ Q_SIGNALS:
|
||||
void textMessageToPrtCnv(const QByteArray &message);
|
||||
void broadcastTelegramsRequest(int equipmentNumber, int broadcastIndex, int resetCounter);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void cleanupProcess();
|
||||
static QString iniFileIn();
|
||||
QString iniFileOut() const;
|
||||
|
||||
+3
-3
@@ -67,7 +67,7 @@ void WlsDispatcher::onWlsConnected()
|
||||
|
||||
void WlsDispatcher::onWlsDisconnected()
|
||||
{
|
||||
INFO_LOG() << "Wls socket disconnected";
|
||||
INFO_LOG(m_logger) << "Wls socket disconnected";
|
||||
m_webSocketReconnectTimer->start(5000);
|
||||
m_sendToWls->onWlsDisconnected();
|
||||
|
||||
@@ -85,7 +85,7 @@ void WlsDispatcher::onWebSocketError()
|
||||
if (!m_webSocket)
|
||||
return;
|
||||
if (!m_bWarnedOnce)
|
||||
WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
|
||||
WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
|
||||
m_webSocket->close();
|
||||
m_webSocketReconnectTimer->start(5000);
|
||||
m_bWarnedOnce = true;
|
||||
@@ -101,7 +101,7 @@ void WlsDispatcher::onTextMessageReceived(const QString &message)
|
||||
|
||||
void WlsDispatcher::onParticipantLicenseChange(const TrainingAreaBase::TetraIcd::ParticipantLicenseChange &lc)
|
||||
{
|
||||
INFO_LOG() << "onParticipantLicenseChange id=" << lc.id()
|
||||
INFO_LOG(m_logger) << "onParticipantLicenseChange id=" << lc.id()
|
||||
<< " equipmentNumber=" << lc.equipmentNumber;
|
||||
m_recvFromWls->participantLicenseChange(lc);
|
||||
}
|
||||
|
||||
+2
@@ -43,8 +43,10 @@ Q_SIGNALS:
|
||||
void wlsTelegramReceived(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
|
||||
void wlsTelegramSent(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QUrl webSocketUrl() const;
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
|
||||
std::shared_ptr<WlsHandlerRx> m_recvFromWls;
|
||||
std::shared_ptr<WlsHandlerTx> m_sendToWls;
|
||||
|
||||
+10
-11
@@ -15,11 +15,10 @@ namespace WlsTetra
|
||||
{
|
||||
|
||||
WlsHandlerRx::WlsHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
WlsDispatcher *dispatcher)
|
||||
: m_rxHandler(recvFromTabCb)
|
||||
WlsDispatcher *dispatcher) : m_rxHandler(recvFromTabCb)
|
||||
, m_dispatcher(dispatcher)
|
||||
, m_bWarnedOnce(false)
|
||||
{}
|
||||
, m_bWarnedOnce(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
|
||||
bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
{
|
||||
@@ -28,7 +27,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
if (baJson.isEmpty())
|
||||
return false;
|
||||
const QJsonObject obj = QJsonDocument::fromJson(baJson).object();
|
||||
TRACE_LOG() << "incoming telegram: " << baJson;
|
||||
TRACE_LOG(m_logger) << "incoming telegram: " << baJson;
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +42,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &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 false;
|
||||
}
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
@@ -70,7 +69,7 @@ bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
|
||||
}
|
||||
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 false;
|
||||
}
|
||||
return true;
|
||||
@@ -187,7 +186,7 @@ bool WlsHandlerRx::handleTelegram(TrainingAreaBase::TetraIcd::TrainingAreaTelegr
|
||||
rxData(toSpecialized<ParticipantConfigurationReport>(tabTele));
|
||||
break;
|
||||
default:
|
||||
ERROR_LOG() << "WlsHandlerRx::handleTelegram no Handler for " << tabTele->id();
|
||||
ERROR_LOG(m_logger) << "WlsHandlerRx::handleTelegram no Handler for " << tabTele->id();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -210,7 +209,7 @@ void WlsHandlerRx::sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &d
|
||||
{
|
||||
if (data.payload.size() < 2)
|
||||
{
|
||||
ERROR_LOG() << "Invalid binary data from WLS: " << QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact);
|
||||
ERROR_LOG(m_logger) << "Invalid binary data from WLS: " << QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -222,7 +221,7 @@ void WlsHandlerRx::sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &d
|
||||
TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tabTele = CoPrtCnvTelegramConverter::convertToTabTele(&radio);
|
||||
if (!tabTele)
|
||||
{
|
||||
WARNING_LOG() << "Can not convert binary sfm data to a valid tetra telegram - ignoring ("
|
||||
WARNING_LOG(m_logger) << "Can not convert binary sfm data to a valid tetra telegram - ignoring ("
|
||||
<< data.header.equipmentNumber << "): " << QByteArray::fromRawData(reinterpret_cast<const char *>(data.payload.data()),
|
||||
data.payload.size()).toHex();
|
||||
return;
|
||||
@@ -238,7 +237,7 @@ void WlsHandlerRx::rxData(const T &data)
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
ERROR_LOG() << "No RecvFromTab available";
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
return;
|
||||
|
||||
+2
@@ -27,11 +27,13 @@ public:
|
||||
Q_SIGNALS:
|
||||
void participantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void sfmData(const TrainingAreaBase::TetraIcd::WlsBinarySfmData &data);
|
||||
|
||||
template<typename T>
|
||||
void rxData(const T &data);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
|
||||
QSet<int> m_licensedEquipmentNumbers;
|
||||
WlsDispatcher *m_dispatcher;
|
||||
|
||||
+2
-2
@@ -301,7 +301,7 @@ bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &d
|
||||
|
||||
void WlsHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
|
||||
{
|
||||
DEBUG_LOG() << "onParticipantConnectionState - " << equipmentNumber
|
||||
DEBUG_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
|
||||
<< ", communication possible: " << dataCommunicationPossible;
|
||||
m_dataCommunicationPossible[equipmentNumber] = dataCommunicationPossible;
|
||||
}
|
||||
@@ -342,7 +342,7 @@ bool WlsHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegr
|
||||
|
||||
const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
DEBUG_LOG() << "Sending tele: " << ba;
|
||||
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
|
||||
m_webSocket->sendTextMessage(QString::fromUtf8(ba));
|
||||
if (!bIsAlreadyLogged)
|
||||
emit m_dispatcher->wlsTelegramSent(data);
|
||||
|
||||
+2
@@ -68,12 +68,14 @@ public:
|
||||
public Q_SLOTS:
|
||||
void onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
template <typename T>
|
||||
bool sendToTxBinary(const T *data);
|
||||
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data,
|
||||
bool bForce = false,
|
||||
bool bIsAlreadyLogged = false);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QHash<int, bool> m_dataCommunicationPossible;
|
||||
TrainingAreaBase::Plugin::DataProvider *m_pdp;
|
||||
QWebSocket *m_webSocket;
|
||||
|
||||
Reference in new issue
Block a user