Formats minimally release source files based on former clang-format
This commit is contained in:
387 files changed
+37323
-38074
No files matched your search
Executable → Regular
+169
-169
@@ -11,183 +11,183 @@
|
||||
namespace TetraRadio
|
||||
{
|
||||
|
||||
ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler,
|
||||
const char *loggerName) : m_rxHandler(rxHandler)
|
||||
, m_bWarnedOnce(false)
|
||||
, m_logger(N_LogView::getLogger(loggerName)) {}
|
||||
|
||||
bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
|
||||
{
|
||||
using namespace TrainingAreaBase::TetraIcd;
|
||||
|
||||
if (baJson.isEmpty())
|
||||
return false;
|
||||
const QJsonObject obj = QJsonDocument::fromJson(baJson).object();
|
||||
const QJsonValue sendCounter = obj.value(QStringLiteral("counter"));
|
||||
if (!sendCounter.isUndefined())
|
||||
ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler, const char *loggerName)
|
||||
: m_rxHandler(rxHandler)
|
||||
, m_bWarnedOnce(false)
|
||||
, m_logger(N_LogView::getLogger(loggerName))
|
||||
{
|
||||
if (!sendCounter.isDouble())
|
||||
return false;
|
||||
recvCounter = sendCounter.toInt(-1);
|
||||
DEBUG_LOG(m_logger) << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
|
||||
if (recvCounter < 0)
|
||||
return false;
|
||||
}
|
||||
const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
|
||||
if (!typeId.isDouble())
|
||||
|
||||
bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
|
||||
return false;
|
||||
}
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
try
|
||||
{
|
||||
switch (typeId.toInt())
|
||||
using namespace TrainingAreaBase::TetraIcd;
|
||||
|
||||
if (baJson.isEmpty())
|
||||
return false;
|
||||
const QJsonObject obj = QJsonDocument::fromJson(baJson).object();
|
||||
const QJsonValue sendCounter = obj.value(QStringLiteral("counter"));
|
||||
if (!sendCounter.isUndefined())
|
||||
{
|
||||
case Constraints<Acknowledge>::id():
|
||||
{
|
||||
auto ack = TrainingAreaBase::TetraIcd::Acknowledge::fromJson(data);
|
||||
handleAcknowledge(ack.timeStamp, ack.ackCounter);
|
||||
break;
|
||||
if (!sendCounter.isDouble())
|
||||
return false;
|
||||
recvCounter = sendCounter.toInt(-1);
|
||||
DEBUG_LOG(m_logger) << "Incoming telegram with Id " << obj.value(QStringLiteral("type")).toString();
|
||||
if (recvCounter < 0)
|
||||
return false;
|
||||
}
|
||||
case Constraints<ManipulationReport>::id():
|
||||
rxData(ManipulationReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentOperationalState>::id():
|
||||
rxData(EquipmentOperationalState::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentConfigurationReport>::id():
|
||||
rxData(EquipmentConfigurationReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<CtaDataError>::id():
|
||||
rxData(CtaDataError::fromJson(data));
|
||||
break;
|
||||
case Constraints<RestoreRadioReadiness>::id():
|
||||
rxData(RestoreRadioReadiness::fromJson(data));
|
||||
break;
|
||||
case Constraints<PositionReport>::id():
|
||||
rxData(PositionReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<PositionReportWithMountedEquipments>::id():
|
||||
rxData(PositionReportWithMountedEquipments::fromJson(data));
|
||||
break;
|
||||
case Constraints<MineTriggered>::id():
|
||||
rxData(MineTriggered::fromJson(data));
|
||||
break;
|
||||
case Constraints<DefinitionIed>::id():
|
||||
rxData(DefinitionIed::fromJson(data));
|
||||
break;
|
||||
case Constraints<StateIed>::id():
|
||||
rxData(StateIed::fromJson(data));
|
||||
break;
|
||||
case Constraints<DusSingleMineState>::id():
|
||||
rxData(DusSingleMineState::fromJson(data));
|
||||
break;
|
||||
case Constraints<StateChangeDirect>::id():
|
||||
rxData(StateChangeDirect::fromJson(data));
|
||||
break;
|
||||
case Constraints<StateChangeIndirect>::id():
|
||||
rxData(StateChangeIndirect::fromJson(data));
|
||||
break;
|
||||
case Constraints<OperatorAction>::id():
|
||||
rxData(OperatorAction::fromJson(data));
|
||||
break;
|
||||
case Constraints<SelectiveReammunition>::id():
|
||||
rxData(SelectiveReammunition::fromJson(data));
|
||||
break;
|
||||
case Constraints<StateChange>::id():
|
||||
rxData(StateChange::fromJson(data));
|
||||
break;
|
||||
case Constraints<FunctionalAreaEntry>::id():
|
||||
rxData(FunctionalAreaEntry::fromJson(data));
|
||||
break;
|
||||
case Constraints<OpaquePayloadDataIn>::id():
|
||||
rxData(OpaquePayloadDataIn::fromJson(data));
|
||||
break;
|
||||
case Constraints<SpecialSensorData>::id():
|
||||
rxData(SpecialSensorData::fromJson(data));
|
||||
break;
|
||||
case Constraints<MinelayerTrailerData>::id():
|
||||
rxData(MinelayerTrailerData::fromJson(data));
|
||||
break;
|
||||
case Constraints<MinelayerThrowerData>::id():
|
||||
rxData(MinelayerThrowerData::fromJson(data));
|
||||
break;
|
||||
case Constraints<MinelayerTrailerPosition>::id():
|
||||
rxData(MinelayerTrailerPosition::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentEvent>::id():
|
||||
rxData(EquipmentEvent::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentGearAssignment>::id():
|
||||
rxData(EquipmentGearAssignment::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentGearChargeState>::id():
|
||||
rxData(EquipmentGearChargeState::fromJson(data));
|
||||
break;
|
||||
case Constraints<BiteReport>::id():
|
||||
rxData(BiteReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentGearEvent>::id():
|
||||
rxData(EquipmentGearEvent::fromJson(data));
|
||||
break;
|
||||
case Constraints<ParticipantSwVersions>::id():
|
||||
rxData(ParticipantSwVersions::fromJson(data));
|
||||
break;
|
||||
case Constraints<ParticipantModeReport>::id():
|
||||
rxData(ParticipantModeReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<ParticipantConfigurationReport>::id():
|
||||
rxData(ParticipantConfigurationReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<SanitationRepair>::id():
|
||||
rxData(SanitationRepair::fromJson(data));
|
||||
break;
|
||||
case Constraints<SanitaryMaterialStockReport>::id():
|
||||
rxData(SanitaryMaterialStockReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<Sanitation>::id():
|
||||
rxData(Sanitation::fromJson(data));
|
||||
break;
|
||||
case Constraints<EmergencyCall>::id():
|
||||
rxData(EmergencyCall::fromJson(data));
|
||||
break;
|
||||
case Constraints<ApacheLaserDesignation>::id():
|
||||
rxData(ApacheLaserDesignation::fromJson(data));
|
||||
break;
|
||||
case Constraints<ProxyConnectionState>::id():
|
||||
handleTetraConnectionChanged(ProxyConnectionState::fromJson(data).connectedToSystem);
|
||||
break;
|
||||
case Constraints<ParticipantLicenseChange>::id():
|
||||
|
||||
break;
|
||||
default:
|
||||
WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt()
|
||||
<< " not yet implemented (" << baJson << ")";
|
||||
const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
|
||||
if (!typeId.isDouble())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
|
||||
return false;
|
||||
}
|
||||
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
|
||||
try
|
||||
{
|
||||
switch (typeId.toInt())
|
||||
{
|
||||
case Constraints<Acknowledge>::id():
|
||||
{
|
||||
auto ack = TrainingAreaBase::TetraIcd::Acknowledge::fromJson(data);
|
||||
handleAcknowledge(ack.timeStamp, ack.ackCounter);
|
||||
break;
|
||||
}
|
||||
case Constraints<ManipulationReport>::id():
|
||||
rxData(ManipulationReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentOperationalState>::id():
|
||||
rxData(EquipmentOperationalState::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentConfigurationReport>::id():
|
||||
rxData(EquipmentConfigurationReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<CtaDataError>::id():
|
||||
rxData(CtaDataError::fromJson(data));
|
||||
break;
|
||||
case Constraints<RestoreRadioReadiness>::id():
|
||||
rxData(RestoreRadioReadiness::fromJson(data));
|
||||
break;
|
||||
case Constraints<PositionReport>::id():
|
||||
rxData(PositionReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<PositionReportWithMountedEquipments>::id():
|
||||
rxData(PositionReportWithMountedEquipments::fromJson(data));
|
||||
break;
|
||||
case Constraints<MineTriggered>::id():
|
||||
rxData(MineTriggered::fromJson(data));
|
||||
break;
|
||||
case Constraints<DefinitionIed>::id():
|
||||
rxData(DefinitionIed::fromJson(data));
|
||||
break;
|
||||
case Constraints<StateIed>::id():
|
||||
rxData(StateIed::fromJson(data));
|
||||
break;
|
||||
case Constraints<DusSingleMineState>::id():
|
||||
rxData(DusSingleMineState::fromJson(data));
|
||||
break;
|
||||
case Constraints<StateChangeDirect>::id():
|
||||
rxData(StateChangeDirect::fromJson(data));
|
||||
break;
|
||||
case Constraints<StateChangeIndirect>::id():
|
||||
rxData(StateChangeIndirect::fromJson(data));
|
||||
break;
|
||||
case Constraints<OperatorAction>::id():
|
||||
rxData(OperatorAction::fromJson(data));
|
||||
break;
|
||||
case Constraints<SelectiveReammunition>::id():
|
||||
rxData(SelectiveReammunition::fromJson(data));
|
||||
break;
|
||||
case Constraints<StateChange>::id():
|
||||
rxData(StateChange::fromJson(data));
|
||||
break;
|
||||
case Constraints<FunctionalAreaEntry>::id():
|
||||
rxData(FunctionalAreaEntry::fromJson(data));
|
||||
break;
|
||||
case Constraints<OpaquePayloadDataIn>::id():
|
||||
rxData(OpaquePayloadDataIn::fromJson(data));
|
||||
break;
|
||||
case Constraints<SpecialSensorData>::id():
|
||||
rxData(SpecialSensorData::fromJson(data));
|
||||
break;
|
||||
case Constraints<MinelayerTrailerData>::id():
|
||||
rxData(MinelayerTrailerData::fromJson(data));
|
||||
break;
|
||||
case Constraints<MinelayerThrowerData>::id():
|
||||
rxData(MinelayerThrowerData::fromJson(data));
|
||||
break;
|
||||
case Constraints<MinelayerTrailerPosition>::id():
|
||||
rxData(MinelayerTrailerPosition::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentEvent>::id():
|
||||
rxData(EquipmentEvent::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentGearAssignment>::id():
|
||||
rxData(EquipmentGearAssignment::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentGearChargeState>::id():
|
||||
rxData(EquipmentGearChargeState::fromJson(data));
|
||||
break;
|
||||
case Constraints<BiteReport>::id():
|
||||
rxData(BiteReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<EquipmentGearEvent>::id():
|
||||
rxData(EquipmentGearEvent::fromJson(data));
|
||||
break;
|
||||
case Constraints<ParticipantSwVersions>::id():
|
||||
rxData(ParticipantSwVersions::fromJson(data));
|
||||
break;
|
||||
case Constraints<ParticipantModeReport>::id():
|
||||
rxData(ParticipantModeReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<ParticipantConfigurationReport>::id():
|
||||
rxData(ParticipantConfigurationReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<SanitationRepair>::id():
|
||||
rxData(SanitationRepair::fromJson(data));
|
||||
break;
|
||||
case Constraints<SanitaryMaterialStockReport>::id():
|
||||
rxData(SanitaryMaterialStockReport::fromJson(data));
|
||||
break;
|
||||
case Constraints<Sanitation>::id():
|
||||
rxData(Sanitation::fromJson(data));
|
||||
break;
|
||||
case Constraints<EmergencyCall>::id():
|
||||
rxData(EmergencyCall::fromJson(data));
|
||||
break;
|
||||
case Constraints<ApacheLaserDesignation>::id():
|
||||
rxData(ApacheLaserDesignation::fromJson(data));
|
||||
break;
|
||||
case Constraints<ProxyConnectionState>::id():
|
||||
handleTetraConnectionChanged(ProxyConnectionState::fromJson(data).connectedToSystem);
|
||||
break;
|
||||
case Constraints<ParticipantLicenseChange>::id():
|
||||
|
||||
break;
|
||||
default:
|
||||
WARNING_LOG(m_logger) << "Handler for telegram Id " << typeId.toInt() << " not yet implemented (" << baJson << ")";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
|
||||
template <typename T> void ConvertFromJson::rxData(const T &data)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
|
||||
return false;
|
||||
if (!m_rxHandler)
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
return;
|
||||
}
|
||||
return m_rxHandler->rxData(data);
|
||||
}
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void ConvertFromJson::rxData(const T &data)
|
||||
{
|
||||
if (!m_rxHandler)
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "No RecvFromTab available";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
return;
|
||||
}
|
||||
return m_rxHandler->rxData(data);
|
||||
}
|
||||
|
||||
}
|
||||
Executable → Regular
+21
-21
@@ -9,27 +9,27 @@
|
||||
class XDR_Wrapper_it;
|
||||
namespace TetraRadio
|
||||
{
|
||||
class ConvertFromJson
|
||||
{
|
||||
public:
|
||||
explicit ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler, const char *loggerName);
|
||||
virtual ~ConvertFromJson() = default;
|
||||
class ConvertFromJson
|
||||
{
|
||||
public:
|
||||
explicit ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler, const char *loggerName);
|
||||
virtual ~ConvertFromJson() = default;
|
||||
|
||||
protected:
|
||||
bool handleTelegram(const QByteArray &baJson, int &recvCounter);
|
||||
virtual void handleAcknowledge(qint64 timeStamp, int counter) = 0;
|
||||
virtual void handleTetraConnectionChanged(bool bConnected) = 0;
|
||||
private:
|
||||
template<typename T>
|
||||
void rxData(const T &data);
|
||||
protected:
|
||||
bool handleTelegram(const QByteArray &baJson, int &recvCounter);
|
||||
virtual void handleAcknowledge(qint64 timeStamp, int counter) = 0;
|
||||
virtual void handleTetraConnectionChanged(bool bConnected) = 0;
|
||||
|
||||
private:
|
||||
|
||||
static TrainingAreaBase::TetraIcd::BiteError convertBiteError(const QJsonObject &obj);
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool m_bWarnedOnce;
|
||||
};
|
||||
private:
|
||||
template <typename T> void rxData(const T &data);
|
||||
|
||||
}
|
||||
private:
|
||||
static TrainingAreaBase::TetraIcd::BiteError convertBiteError(const QJsonObject &obj);
|
||||
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool m_bWarnedOnce;
|
||||
};
|
||||
|
||||
}
|
||||
Executable → Regular
+270
-272
@@ -9,281 +9,279 @@
|
||||
|
||||
namespace TetraRadio
|
||||
{
|
||||
ConvertToJson::ConvertToJson(const char *loggerName)
|
||||
: QObject()
|
||||
, SendToTab()
|
||||
, m_bConnected(false)
|
||||
, m_logger(N_LogView::getLogger(loggerName))
|
||||
{
|
||||
resetSendCounter();
|
||||
}
|
||||
|
||||
ConvertToJson::~ConvertToJson()
|
||||
{}
|
||||
|
||||
TrainingAreaBase::SendToTab::HandleState ConvertToJson::canHandleTelegram(int equipmentNumber, int telegramId) const
|
||||
{
|
||||
if (!m_bConnected)
|
||||
return HandleState::No;
|
||||
|
||||
using namespace TrainingAreaBase::TetraIcd;
|
||||
if (telegramId == Constraints<ExerciseEquipmentAssignmentComplete>::id() ||
|
||||
telegramId == Constraints<ExerciseStateData>::id())
|
||||
return HandleState::YesShare;
|
||||
|
||||
Q_UNUSED(equipmentNumber)
|
||||
return HandleState::YesFallback;
|
||||
}
|
||||
|
||||
void ConvertToJson::resetSendCounter()
|
||||
{
|
||||
m_sendCounter = 1;
|
||||
}
|
||||
|
||||
bool ConvertToJson::sendTele(const QByteArray &ba)
|
||||
{
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(ba));
|
||||
QJsonObject obj = doc.object();
|
||||
const QJsonValue typeId = obj[QStringLiteral("typeId")];
|
||||
if (typeId.toInt() == TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
ConvertToJson::ConvertToJson(const char *loggerName)
|
||||
: QObject()
|
||||
, SendToTab()
|
||||
, m_bConnected(false)
|
||||
, m_logger(N_LogView::getLogger(loggerName))
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "Outgoing ack";
|
||||
resetSendCounter();
|
||||
}
|
||||
|
||||
ConvertToJson::~ConvertToJson() {}
|
||||
|
||||
TrainingAreaBase::SendToTab::HandleState ConvertToJson::canHandleTelegram(int equipmentNumber, int telegramId) const
|
||||
{
|
||||
if (!m_bConnected)
|
||||
return HandleState::No;
|
||||
|
||||
using namespace TrainingAreaBase::TetraIcd;
|
||||
if (telegramId == Constraints<ExerciseEquipmentAssignmentComplete>::id() || telegramId == Constraints<ExerciseStateData>::id())
|
||||
return HandleState::YesShare;
|
||||
|
||||
Q_UNUSED(equipmentNumber)
|
||||
return HandleState::YesFallback;
|
||||
}
|
||||
|
||||
void ConvertToJson::resetSendCounter()
|
||||
{
|
||||
m_sendCounter = 1;
|
||||
}
|
||||
|
||||
bool ConvertToJson::sendTele(const QByteArray &ba)
|
||||
{
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(ba));
|
||||
QJsonObject obj = doc.object();
|
||||
const QJsonValue typeId = obj[QStringLiteral("typeId")];
|
||||
if (typeId.toInt() == TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "Outgoing ack";
|
||||
emit outgoingMessage(ba);
|
||||
return true;
|
||||
}
|
||||
|
||||
obj[QStringLiteral("counter")] = m_sendCounter++;
|
||||
const QByteArray baToSend = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
NOTICE_LOG(m_logger) << "Outgoing message: " << typeId.toInt();
|
||||
emit outgoingMessage(baToSend);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::Acknowledge &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandBite &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::Init &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::SetVulnerabilityModel &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandEquipmentConfigurationReport &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::LanguageSelection &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::EquipmentMessage &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::EquipmentMessageOC &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateAreaExplosion &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateMineArea &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::MineAreaSingleMineState &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateNContamination &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateCContamination &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DeactivateEffectSimulation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ModifyAreaEffectSimulationName &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::PauseEffectSimulation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ResumeEffectSimulation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::MineTriggered &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DusMineReactivation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateFunctionalArea &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool TetraRadio::ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateDusSingleMine &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ExerciseEnvironmentData &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ExerciseStateData &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ParticipantSwVersionsRequest &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataOut &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::TechnicalArea &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CesHitInformation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ParticipantMode &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandParticipantMode &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ParticipantConfiguration &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandParticipantConfiguration &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ExerciseEquipmentAssignmentComplete &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::Sanitation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ConvertToJson::txData SelectiveReammunition";
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ConvertToJson::txData OcCommand";
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data)
|
||||
{
|
||||
Q_UNUSED(data);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data)
|
||||
{
|
||||
Q_UNUSED(data);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ConvertToJson::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data)
|
||||
{
|
||||
if (!m_bConnected)
|
||||
return false;
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("data")] = data->toJson();
|
||||
obj[QStringLiteral("type")] = data->type();
|
||||
obj[QStringLiteral("typeId")] = data->id();
|
||||
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
obj[QStringLiteral("counter")] = m_sendCounter++;
|
||||
const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
|
||||
emit outgoingMessage(ba);
|
||||
return true;
|
||||
}
|
||||
|
||||
obj[QStringLiteral("counter")] = m_sendCounter++;
|
||||
const QByteArray baToSend = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
NOTICE_LOG(m_logger) << "Outgoing message: " << typeId.toInt();
|
||||
emit outgoingMessage(baToSend);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::Acknowledge &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandBite &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::Init &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::SetVulnerabilityModel &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandEquipmentConfigurationReport &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::LanguageSelection &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::EquipmentMessage &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::EquipmentMessageOC &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateAreaExplosion &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateMineArea &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::MineAreaSingleMineState &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateNContamination &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateCContamination &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DeactivateEffectSimulation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ModifyAreaEffectSimulationName &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::PauseEffectSimulation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ResumeEffectSimulation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::MineTriggered &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DusMineReactivation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateFunctionalArea &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool TetraRadio::ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CreateDusSingleMine &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ExerciseEnvironmentData &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ExerciseStateData &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ParticipantSwVersionsRequest &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataOut &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::TechnicalArea &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CesHitInformation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ParticipantMode &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandParticipantMode &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ParticipantConfiguration &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::DemandParticipantConfiguration &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::ExerciseEquipmentAssignmentComplete &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::Sanitation &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ConvertToJson::txData SelectiveReammunition";
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data)
|
||||
{
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ConvertToJson::txData OcCommand";
|
||||
return sendToTx(&data);
|
||||
}
|
||||
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data)
|
||||
{
|
||||
Q_UNUSED(data);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ConvertToJson::txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data)
|
||||
{
|
||||
Q_UNUSED(data);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ConvertToJson::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data)
|
||||
{
|
||||
if (!m_bConnected)
|
||||
return false;
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("data")] = data->toJson();
|
||||
obj[QStringLiteral("type")] = data->type();
|
||||
obj[QStringLiteral("typeId")] = data->id();
|
||||
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
obj[QStringLiteral("counter")] = m_sendCounter++;
|
||||
const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
|
||||
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
|
||||
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
|
||||
emit outgoingMessage(ba);
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
Executable → Regular
+69
-65
@@ -9,74 +9,78 @@
|
||||
|
||||
namespace TetraRadio
|
||||
{
|
||||
class ConvertToJson final : public QObject, public TrainingAreaBase::SendToTab
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit ConvertToJson(const char *loggerName);
|
||||
~ConvertToJson();
|
||||
class ConvertToJson final
|
||||
: public QObject
|
||||
, public TrainingAreaBase::SendToTab
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit ConvertToJson(const char *loggerName);
|
||||
~ConvertToJson();
|
||||
|
||||
const char *name() const override { return "Tetra"; }
|
||||
HandleState canHandleTelegram(int equipmentNumber, int telegramId) const override;
|
||||
void resetSendCounter() override;
|
||||
bool sendTele(const QByteArray &ba);
|
||||
const char *name() const override { return "Tetra"; }
|
||||
HandleState canHandleTelegram(int equipmentNumber, int telegramId) const override;
|
||||
void resetSendCounter() override;
|
||||
bool sendTele(const QByteArray &ba);
|
||||
|
||||
void setConnected(bool bConnected) { m_bConnected = bConnected; }
|
||||
public:
|
||||
bool txData(const TrainingAreaBase::TetraIcd::Acknowledge &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandBite &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::Init &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::SetVulnerabilityModel &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandEquipmentConfigurationReport &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::LanguageSelection &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::EquipmentMessage &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::EquipmentMessageOC &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateAreaExplosion &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateMineArea &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::MineAreaSingleMineState &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateNContamination &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateCContamination &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DeactivateEffectSimulation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ModifyAreaEffectSimulationName &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::PauseEffectSimulation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ResumeEffectSimulation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::MineTriggered &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DusMineReactivation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateFunctionalArea &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateDusSingleMine &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExerciseEnvironmentData &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExerciseStateData &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ParticipantSwVersionsRequest &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataOut &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::TechnicalArea &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CesHitInformation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ParticipantMode &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandParticipantMode &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ParticipantConfiguration &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandParticipantConfiguration &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExerciseEquipmentAssignmentComplete &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::Sanitation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &) override ;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &) override { return false; };
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &) override { return false; };
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override { return false; };
|
||||
void setConnected(bool bConnected) { m_bConnected = bConnected; }
|
||||
|
||||
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data);
|
||||
Q_SIGNALS:
|
||||
void outgoingMessage(const QByteArray &msg);
|
||||
protected:
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_sendCounter;
|
||||
bool m_bConnected;
|
||||
};
|
||||
public:
|
||||
bool txData(const TrainingAreaBase::TetraIcd::Acknowledge &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandBite &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::Init &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::SetVulnerabilityModel &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandEquipmentConfigurationReport &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::LanguageSelection &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::EquipmentMessage &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::EquipmentMessageOC &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateAreaExplosion &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateMineArea &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::MineAreaSingleMineState &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateNContamination &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateCContamination &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DeactivateEffectSimulation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ModifyAreaEffectSimulationName &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::PauseEffectSimulation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ResumeEffectSimulation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::MineTriggered &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DusMineReactivation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateFunctionalArea &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CreateDusSingleMine &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExerciseEnvironmentData &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExerciseStateData &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ParticipantSwVersionsRequest &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::OpaquePayloadDataOut &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::TechnicalArea &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CesHitInformation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ParticipantMode &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandParticipantMode &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ParticipantConfiguration &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::DemandParticipantConfiguration &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExerciseEquipmentAssignmentComplete &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::Sanitation &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &) override;
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &) override { return false; };
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &) override { return false; };
|
||||
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override { return false; };
|
||||
|
||||
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data);
|
||||
Q_SIGNALS:
|
||||
void outgoingMessage(const QByteArray &msg);
|
||||
|
||||
protected:
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_sendCounter;
|
||||
bool m_bConnected;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
Executable → Regular
+171
-183
@@ -21,211 +21,199 @@ namespace TetraRadio
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::Plugin::Interface> TetraJsonPlugin::createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::TxMixin> &,
|
||||
const std::shared_ptr<TrainingAreaBase::DdsHandler> &,
|
||||
NGL::Settings *settings)
|
||||
{
|
||||
return std::make_shared<TetraJsonInterfaceImpl>(pdp, recvFromTabCb, settings);
|
||||
}
|
||||
|
||||
TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
NGL::Settings *settings)
|
||||
: m_logger(N_LogView::getLogger("TAB.Plugin.TetraJsonInterfaceImpl"))
|
||||
, m_socketDispatcher(new SocketDispatcher(pdp, recvFromTabCb))
|
||||
, m_pdp(pdp)
|
||||
, m_prtCnvApp(nullptr)
|
||||
, m_exerciseId(0)
|
||||
, m_radioGrpId(0)
|
||||
{
|
||||
Q_UNUSED(settings);
|
||||
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
|
||||
settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
|
||||
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUsePvSan(
|
||||
settings->settings()->value(QLatin1String("TrainingAreaBase/UsePvSan"), false).toBool());
|
||||
ERROR_LOG(m_logger) << "hello i got this!";
|
||||
}
|
||||
|
||||
TetraJsonInterfaceImpl::~TetraJsonInterfaceImpl()
|
||||
{
|
||||
cleanupProcess();
|
||||
}
|
||||
|
||||
bool TetraJsonInterfaceImpl::init()
|
||||
{
|
||||
m_exerciseId = m_pdp->exerciseId();
|
||||
NOTICE_LOG(m_logger) << "Our exercise id is " << m_exerciseId;
|
||||
|
||||
if (m_exerciseId == 0)
|
||||
if (!checkConfigTemplates())
|
||||
return false;
|
||||
|
||||
return updatePrtCnv();
|
||||
}
|
||||
|
||||
void TetraJsonInterfaceImpl::exerciseChanged()
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "TetraJsonInterfaceImpl::exerciseChanged";
|
||||
if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId)
|
||||
if (!updatePrtCnv())
|
||||
ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
|
||||
<< m_radioGrpId
|
||||
<< " to " << m_pdp->exerciseRadioGroup().id();
|
||||
}
|
||||
|
||||
bool TetraJsonInterfaceImpl::updatePrtCnv()
|
||||
{
|
||||
int newRadioGrpId = m_pdp->exerciseRadioGroup().id();
|
||||
|
||||
if (newRadioGrpId == m_radioGrpId)
|
||||
std::shared_ptr<TrainingAreaBase::Plugin::Interface> TetraJsonPlugin::createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::TxMixin> &,
|
||||
const std::shared_ptr<TrainingAreaBase::DdsHandler> &,
|
||||
NGL::Settings *settings)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "No need to update PrtCnv configuration - radio group did not change: " << m_radioGrpId;
|
||||
return std::make_shared<TetraJsonInterfaceImpl>(pdp, recvFromTabCb, settings);
|
||||
}
|
||||
|
||||
TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
NGL::Settings *settings)
|
||||
: m_logger(N_LogView::getLogger("TAB.Plugin.TetraJsonInterfaceImpl"))
|
||||
, m_socketDispatcher(new SocketDispatcher(pdp, recvFromTabCb))
|
||||
, m_pdp(pdp)
|
||||
, m_prtCnvApp(nullptr)
|
||||
, m_exerciseId(0)
|
||||
, m_radioGrpId(0)
|
||||
{
|
||||
Q_UNUSED(settings);
|
||||
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
|
||||
settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
|
||||
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUsePvSan(settings->settings()->value(QLatin1String("TrainingAreaBase/UsePvSan"), false).toBool());
|
||||
ERROR_LOG(m_logger) << "hello i got this!";
|
||||
}
|
||||
|
||||
TetraJsonInterfaceImpl::~TetraJsonInterfaceImpl()
|
||||
{
|
||||
cleanupProcess();
|
||||
}
|
||||
|
||||
bool TetraJsonInterfaceImpl::init()
|
||||
{
|
||||
m_exerciseId = m_pdp->exerciseId();
|
||||
NOTICE_LOG(m_logger) << "Our exercise id is " << m_exerciseId;
|
||||
|
||||
if (m_exerciseId == 0)
|
||||
if (!checkConfigTemplates())
|
||||
return false;
|
||||
|
||||
return updatePrtCnv();
|
||||
}
|
||||
|
||||
void TetraJsonInterfaceImpl::exerciseChanged()
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "TetraJsonInterfaceImpl::exerciseChanged";
|
||||
if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId)
|
||||
if (!updatePrtCnv())
|
||||
ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: " << m_radioGrpId << " to " << m_pdp->exerciseRadioGroup().id();
|
||||
}
|
||||
|
||||
bool TetraJsonInterfaceImpl::updatePrtCnv()
|
||||
{
|
||||
int newRadioGrpId = m_pdp->exerciseRadioGroup().id();
|
||||
|
||||
if (newRadioGrpId == m_radioGrpId)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "No need to update PrtCnv configuration - radio group did not change: " << m_radioGrpId;
|
||||
return true;
|
||||
}
|
||||
|
||||
NOTICE_LOG(m_logger) << "Our radio group id is " << newRadioGrpId;
|
||||
if (newRadioGrpId > 0)
|
||||
{
|
||||
|
||||
QFile::remove(iniFileOut());
|
||||
if (!QFile::copy(iniFileIn(), iniFileOut()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating ini file for PrtCnv: " << iniFileOut();
|
||||
return false;
|
||||
}
|
||||
|
||||
ProjectDataManagement::RadioGroup radioGrp = m_pdp->exerciseRadioGroup();
|
||||
Q_UNUSED(radioGrp);
|
||||
|
||||
{
|
||||
QSettings s(iniFileOut(), QSettings::IniFormat);
|
||||
s.setValue(QStringLiteral("Common/LogTelegramPath"), QStringLiteral("logdata/ex_%1").arg(m_exerciseId));
|
||||
s.setValue(QStringLiteral("Common/LogTelegramPrefix"), QStringLiteral("PrtCnv_ex_%1").arg(m_exerciseId));
|
||||
s.setValue(QStringLiteral("Central/HostName"), QStringLiteral("directConnection"));
|
||||
// RadioGroup API simplified - radio configuration members removed
|
||||
s.setValue(QStringLiteral("Radio/UseScrambling"), m_pdp->useTetraScrambling() ? 1 : 0);
|
||||
s.setValue(QStringLiteral("Injection/Port"), m_socketDispatcher->randomListenPort());
|
||||
NOTICE_LOG(m_logger) << "TetraJson Injection/Port = " << s.value(QStringLiteral("Injection/Port")).toInt();
|
||||
s.sync();
|
||||
}
|
||||
|
||||
|
||||
if (!startPrtCnv())
|
||||
return false;
|
||||
}
|
||||
else
|
||||
cleanupProcess();
|
||||
|
||||
|
||||
m_radioGrpId = newRadioGrpId;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
NOTICE_LOG(m_logger) << "Our radio group id is " << newRadioGrpId;
|
||||
if (newRadioGrpId > 0)
|
||||
bool TetraJsonInterfaceImpl::checkConfigTemplates()
|
||||
{
|
||||
|
||||
QFile::remove(iniFileOut());
|
||||
if (!QFile::copy(iniFileIn(), iniFileOut()))
|
||||
if (!QFile::exists(iniFileIn()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating ini file for PrtCnv: " << iniFileOut();
|
||||
return false;
|
||||
INFO_LOG(m_logger) << "Creating " << iniFileIn();
|
||||
if (!QFile::copy(QStringLiteral(":/PrtCnv.dat"), iniFileIn()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating " << iniFileIn();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
QFile(iniFileIn()).setPermissions(QFile::ReadOwner | QFile::ReadGroup | QFile::ReadOther | QFile::WriteOwner);
|
||||
}
|
||||
|
||||
ProjectDataManagement::RadioGroup radioGrp = m_pdp->exerciseRadioGroup();
|
||||
Q_UNUSED(radioGrp);
|
||||
|
||||
if (!QFile::exists(playerIdsFile()))
|
||||
{
|
||||
QSettings s(iniFileOut(), QSettings::IniFormat);
|
||||
s.setValue(QStringLiteral("Common/LogTelegramPath"), QStringLiteral("logdata/ex_%1").arg(m_exerciseId));
|
||||
s.setValue(QStringLiteral("Common/LogTelegramPrefix"), QStringLiteral("PrtCnv_ex_%1").arg(m_exerciseId));
|
||||
s.setValue(QStringLiteral("Central/HostName"), QStringLiteral("directConnection"));
|
||||
// RadioGroup API simplified - radio configuration members removed
|
||||
s.setValue(QStringLiteral("Radio/UseScrambling"), m_pdp->useTetraScrambling() ? 1 : 0);
|
||||
s.setValue(QStringLiteral("Injection/Port"), m_socketDispatcher->randomListenPort());
|
||||
NOTICE_LOG(m_logger) << "TetraJson Injection/Port = " << s.value(QStringLiteral("Injection/Port")).toInt();
|
||||
s.sync();
|
||||
INFO_LOG(m_logger) << "Creating " << playerIdsFile();
|
||||
if (!QFile::copy(QStringLiteral(":/playerIds.dat"), playerIdsFile()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating " << playerIdsFile();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
QFile(playerIdsFile()).setPermissions(QFile::ReadOwner | QFile::ReadGroup | QFile::ReadOther | QFile::WriteOwner);
|
||||
}
|
||||
|
||||
|
||||
if (!startPrtCnv())
|
||||
return false;
|
||||
}
|
||||
else
|
||||
cleanupProcess();
|
||||
|
||||
|
||||
m_radioGrpId = newRadioGrpId;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TetraJsonInterfaceImpl::checkConfigTemplates()
|
||||
{
|
||||
if (!QFile::exists(iniFileIn()))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Creating " << iniFileIn();
|
||||
if (!QFile::copy(QStringLiteral(":/PrtCnv.dat"), iniFileIn()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating " << iniFileIn();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
QFile(iniFileIn()).setPermissions(QFile::ReadOwner | QFile::ReadGroup | QFile::ReadOther | QFile::WriteOwner);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!QFile::exists(playerIdsFile()))
|
||||
bool TetraJsonInterfaceImpl::startPrtCnv()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Creating " << playerIdsFile();
|
||||
if (!QFile::copy(QStringLiteral(":/playerIds.dat"), playerIdsFile()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating " << playerIdsFile();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
QFile(playerIdsFile()).setPermissions(QFile::ReadOwner | QFile::ReadGroup | QFile::ReadOther | QFile::WriteOwner);
|
||||
NOTICE_LOG(m_logger) << "Starting PrtCnv (intern)";
|
||||
cleanupProcess();
|
||||
m_prtCnvApp = new PrtCnv::PrtCnvApplication;
|
||||
const QSqlDatabase db = m_pdp->databaseConnection();
|
||||
m_prtCnvApp->setDatabaseConnectionParams(db.driverName(), db.hostName(), db.databaseName(), m_pdp->databaseSchemaName(), db.userName(), db.password());
|
||||
m_prtCnvApp->setExerciseId(m_pdp->exerciseId());
|
||||
m_prtCnvApp->setConfigFile(iniFileOut());
|
||||
m_prtCnvApp->startApp();
|
||||
m_socketDispatcher->init(m_prtCnvApp);
|
||||
|
||||
onTetraConnectionChanged(false);
|
||||
connect(m_socketDispatcher.get(), &SocketDispatcher::tetraConnectionChanged, this, &TetraJsonInterfaceImpl::onTetraConnectionChanged);
|
||||
|
||||
connect(m_socketDispatcher.get(), &SocketDispatcher::warehouseMessage, this, &TetraJsonInterfaceImpl::directMessage);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> TetraJsonInterfaceImpl::sendToTab()
|
||||
{
|
||||
return m_socketDispatcher->sendToTab();
|
||||
}
|
||||
|
||||
bool TetraJsonInterfaceImpl::startPrtCnv()
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "Starting PrtCnv (intern)";
|
||||
cleanupProcess();
|
||||
m_prtCnvApp = new PrtCnv::PrtCnvApplication;
|
||||
const QSqlDatabase db = m_pdp->databaseConnection();
|
||||
m_prtCnvApp->setDatabaseConnectionParams(db.driverName(),
|
||||
db.hostName(),
|
||||
db.databaseName(),
|
||||
m_pdp->databaseSchemaName(),
|
||||
db.userName(),
|
||||
db.password());
|
||||
m_prtCnvApp->setExerciseId(m_pdp->exerciseId());
|
||||
m_prtCnvApp->setConfigFile(iniFileOut());
|
||||
m_prtCnvApp->startApp();
|
||||
m_socketDispatcher->init(m_prtCnvApp);
|
||||
bool TetraJsonInterfaceImpl::canSendData() const
|
||||
{
|
||||
return m_socketDispatcher->canSendData() && m_prtCnvApp != nullptr;
|
||||
}
|
||||
|
||||
onTetraConnectionChanged(false);
|
||||
connect(m_socketDispatcher.get(), &SocketDispatcher::tetraConnectionChanged,
|
||||
this, &TetraJsonInterfaceImpl::onTetraConnectionChanged);
|
||||
|
||||
connect(m_socketDispatcher.get(), &SocketDispatcher::warehouseMessage,
|
||||
this, &TetraJsonInterfaceImpl::directMessage);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> TetraJsonInterfaceImpl::sendToTab()
|
||||
{
|
||||
return m_socketDispatcher->sendToTab();
|
||||
}
|
||||
|
||||
bool TetraJsonInterfaceImpl::canSendData() const
|
||||
{
|
||||
return m_socketDispatcher->canSendData() && m_prtCnvApp != nullptr;
|
||||
}
|
||||
|
||||
void TetraJsonInterfaceImpl::onTetraConnectionChanged(bool bConnected)
|
||||
{
|
||||
void TetraJsonInterfaceImpl::onTetraConnectionChanged(bool bConnected)
|
||||
{
|
||||
emit connectionState(QString::fromUtf8(name()), bConnected);
|
||||
}
|
||||
}
|
||||
|
||||
void TetraJsonInterfaceImpl::cleanupProcess()
|
||||
{
|
||||
m_socketDispatcher->init(nullptr);
|
||||
if (!m_prtCnvApp)
|
||||
return;
|
||||
m_prtCnvApp->shutdownApp();
|
||||
delete m_prtCnvApp;
|
||||
m_prtCnvApp = nullptr;
|
||||
onTetraConnectionChanged(false);
|
||||
}
|
||||
void TetraJsonInterfaceImpl::cleanupProcess()
|
||||
{
|
||||
m_socketDispatcher->init(nullptr);
|
||||
if (!m_prtCnvApp)
|
||||
return;
|
||||
m_prtCnvApp->shutdownApp();
|
||||
delete m_prtCnvApp;
|
||||
m_prtCnvApp = nullptr;
|
||||
onTetraConnectionChanged(false);
|
||||
}
|
||||
|
||||
QString TetraJsonInterfaceImpl::iniFileIn()
|
||||
{
|
||||
return iniPath() + QStringLiteral("/PrtCnv.dat");
|
||||
}
|
||||
QString TetraJsonInterfaceImpl::iniFileIn()
|
||||
{
|
||||
return iniPath() + QStringLiteral("/PrtCnv.dat");
|
||||
}
|
||||
|
||||
QString TetraJsonInterfaceImpl::iniFileOut() const
|
||||
{
|
||||
return iniPath() + QStringLiteral("/PrtCnv_ex_%1.dat").arg(m_exerciseId);
|
||||
}
|
||||
QString TetraJsonInterfaceImpl::iniFileOut() const
|
||||
{
|
||||
return iniPath() + QStringLiteral("/PrtCnv_ex_%1.dat").arg(m_exerciseId);
|
||||
}
|
||||
|
||||
QString TetraJsonInterfaceImpl::iniPath()
|
||||
{
|
||||
return QCoreApplication::applicationDirPath() + QLatin1Char('/');
|
||||
}
|
||||
QString TetraJsonInterfaceImpl::iniPath()
|
||||
{
|
||||
return QCoreApplication::applicationDirPath() + QLatin1Char('/');
|
||||
}
|
||||
|
||||
QString TetraJsonInterfaceImpl::playerIdsFile()
|
||||
{
|
||||
return iniPath() + QStringLiteral("/playerIds.dat");
|
||||
}
|
||||
QString TetraJsonInterfaceImpl::playerIdsFile()
|
||||
{
|
||||
return iniPath() + QStringLiteral("/playerIds.dat");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Executable → Regular
+51
-53
@@ -11,58 +11,56 @@
|
||||
|
||||
namespace TetraRadio
|
||||
{
|
||||
class TetraJsonPlugin : public QObject, public TrainingAreaBase::Plugin::Plugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "special:3:tab.jsonsocket")
|
||||
Q_INTERFACES(TrainingAreaBase::Plugin::Plugin)
|
||||
public:
|
||||
TetraJsonPlugin() = default;
|
||||
~TetraJsonPlugin() = default;
|
||||
std::shared_ptr<TrainingAreaBase::Plugin::Interface> createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::DdsHandler> &,
|
||||
NGL::Settings *settings) override;
|
||||
};
|
||||
|
||||
class SocketDispatcher;
|
||||
class TetraJsonInterfaceImpl final : public TrainingAreaBase::Plugin::Interface
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
NGL::Settings *settings);
|
||||
~TetraJsonInterfaceImpl();
|
||||
|
||||
bool init() override;
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab() override;
|
||||
bool isDebugInterface() const override
|
||||
class TetraJsonPlugin
|
||||
: public QObject
|
||||
, public TrainingAreaBase::Plugin::Plugin
|
||||
{
|
||||
return false;
|
||||
}
|
||||
bool canSendData() const override;
|
||||
void exerciseChanged() override;
|
||||
const char *name() const override { return "TETRA"; }
|
||||
private Q_SLOTS:
|
||||
void onTetraConnectionChanged(bool bConnected);
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void cleanupProcess();
|
||||
static QString iniFileIn();
|
||||
QString iniFileOut() const;
|
||||
static QString iniPath();
|
||||
static QString playerIdsFile();
|
||||
bool updatePrtCnv();
|
||||
bool checkConfigTemplates();
|
||||
bool startPrtCnv();
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "special:3:tab.jsonsocket")
|
||||
Q_INTERFACES(TrainingAreaBase::Plugin::Plugin)
|
||||
public:
|
||||
TetraJsonPlugin() = default;
|
||||
~TetraJsonPlugin() = default;
|
||||
std::shared_ptr<TrainingAreaBase::Plugin::Interface> createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
|
||||
const std::shared_ptr<TrainingAreaBase::DdsHandler> &,
|
||||
NGL::Settings *settings) override;
|
||||
};
|
||||
|
||||
private:
|
||||
std::unique_ptr<SocketDispatcher> m_socketDispatcher;
|
||||
TrainingAreaBase::Plugin::DataProvider *m_pdp;
|
||||
PrtCnv::PrtCnvApplication *m_prtCnvApp;
|
||||
int m_exerciseId;
|
||||
int m_radioGrpId;
|
||||
};
|
||||
}
|
||||
class SocketDispatcher;
|
||||
class TetraJsonInterfaceImpl final : public TrainingAreaBase::Plugin::Interface
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb, NGL::Settings *settings);
|
||||
~TetraJsonInterfaceImpl();
|
||||
|
||||
bool init() override;
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab() override;
|
||||
bool isDebugInterface() const override { return false; }
|
||||
bool canSendData() const override;
|
||||
void exerciseChanged() override;
|
||||
const char *name() const override { return "TETRA"; }
|
||||
private Q_SLOTS:
|
||||
void onTetraConnectionChanged(bool bConnected);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void cleanupProcess();
|
||||
static QString iniFileIn();
|
||||
QString iniFileOut() const;
|
||||
static QString iniPath();
|
||||
static QString playerIdsFile();
|
||||
bool updatePrtCnv();
|
||||
bool checkConfigTemplates();
|
||||
bool startPrtCnv();
|
||||
|
||||
private:
|
||||
std::unique_ptr<SocketDispatcher> m_socketDispatcher;
|
||||
TrainingAreaBase::Plugin::DataProvider *m_pdp;
|
||||
PrtCnv::PrtCnvApplication *m_prtCnvApp;
|
||||
int m_exerciseId;
|
||||
int m_radioGrpId;
|
||||
};
|
||||
}
|
||||
Executable → Regular
+104
-115
@@ -10,128 +10,117 @@ namespace TetraRadio
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
SocketDispatcher::SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb)
|
||||
: QObject()
|
||||
, ConvertFromJson(recvFromTabCb, "TAB.Plugin.SocketDispatcher")
|
||||
, m_txHandler(std::make_shared<ConvertToJson>("TxSocketHandler"))
|
||||
, m_dataProvider(pdp)
|
||||
, m_prtCnvApp(nullptr)
|
||||
, m_ackTimer(new QTimer(this))
|
||||
, m_bInitialAck(false)
|
||||
, m_receiveCounter(0)
|
||||
{
|
||||
m_ackTimer->setInterval(1000);
|
||||
m_ackTimer->setSingleShot(false);
|
||||
connect(m_ackTimer, &QTimer::timeout,
|
||||
this, &SocketDispatcher::onAckTimeout);
|
||||
}
|
||||
|
||||
SocketDispatcher::~SocketDispatcher()
|
||||
{
|
||||
delete m_ackTimer;
|
||||
}
|
||||
|
||||
bool SocketDispatcher::init(PrtCnv::PrtCnvApplication *prtCnvApp)
|
||||
{
|
||||
if (m_prtCnvApp == prtCnvApp)
|
||||
return true;
|
||||
if (m_prtCnvApp)
|
||||
m_prtCnvApp->disconnect(this);
|
||||
m_prtCnvApp = prtCnvApp;
|
||||
if (m_prtCnvApp)
|
||||
SocketDispatcher::SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb)
|
||||
: QObject()
|
||||
, ConvertFromJson(recvFromTabCb, "TAB.Plugin.SocketDispatcher")
|
||||
, m_txHandler(std::make_shared<ConvertToJson>("TxSocketHandler"))
|
||||
, m_dataProvider(pdp)
|
||||
, m_prtCnvApp(nullptr)
|
||||
, m_ackTimer(new QTimer(this))
|
||||
, m_bInitialAck(false)
|
||||
, m_receiveCounter(0)
|
||||
{
|
||||
connect(m_txHandler.get(), &ConvertToJson::outgoingMessage,
|
||||
m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromCentralToPrtCnv);
|
||||
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromPrtCnvToCentral,
|
||||
this, &SocketDispatcher::onTextMessageReceived);
|
||||
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::warehouseMessageFromPtrCnv,
|
||||
this, &SocketDispatcher::warehouseMessage);
|
||||
|
||||
m_ackTimer->start();
|
||||
m_bInitialAck = true;
|
||||
m_ackTimer->setInterval(1000);
|
||||
m_ackTimer->setSingleShot(false);
|
||||
connect(m_ackTimer, &QTimer::timeout, this, &SocketDispatcher::onAckTimeout);
|
||||
}
|
||||
else
|
||||
|
||||
SocketDispatcher::~SocketDispatcher()
|
||||
{
|
||||
m_bInitialAck = false;
|
||||
m_ackTimer->stop();
|
||||
delete m_ackTimer;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
quint16 SocketDispatcher::randomListenPort() const
|
||||
{
|
||||
QTcpServer *s = new QTcpServer;
|
||||
s->listen(QHostAddress::Any, 0);
|
||||
while (!s->isListening())
|
||||
QCoreApplication::processEvents();
|
||||
quint16 port = s->serverPort();
|
||||
delete s;
|
||||
return port;
|
||||
}
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> SocketDispatcher::sendToTab()
|
||||
{
|
||||
return std::static_pointer_cast<TrainingAreaBase::SendToTab>(m_txHandler);
|
||||
}
|
||||
|
||||
void SocketDispatcher::onTextMessageReceived(const QByteArray &message)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TetraJson onTextMessageReceived: '" << message << "'";
|
||||
int newRecvCounter = 0;
|
||||
if (!handleTelegram(message, newRecvCounter))
|
||||
return;
|
||||
m_receiveCounter = newRecvCounter;
|
||||
}
|
||||
|
||||
void SocketDispatcher::handleTetraConnectionChanged(bool bConnected)
|
||||
{
|
||||
emit tetraConnectionChanged(bConnected);
|
||||
}
|
||||
|
||||
void SocketDispatcher::handleAcknowledge(qint64 timeStamp, int counter)
|
||||
{
|
||||
TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp
|
||||
<< " with counter " << counter
|
||||
<< ", initial: " << m_bInitialAck;
|
||||
if (m_bInitialAck)
|
||||
bool SocketDispatcher::init(PrtCnv::PrtCnvApplication *prtCnvApp)
|
||||
{
|
||||
m_txHandler->setConnected(true);
|
||||
m_bInitialAck = false;
|
||||
onSendInitialData();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void SocketDispatcher::onAckTimeout()
|
||||
{
|
||||
TrainingAreaBase::TetraIcd::Acknowledge ack;
|
||||
ack.timeStamp = time(nullptr) * 1000;
|
||||
ack.ackCounter = m_receiveCounter;
|
||||
m_txHandler->txData(ack);
|
||||
}
|
||||
|
||||
void SocketDispatcher::onSendInitialData()
|
||||
{
|
||||
if (m_dataProvider)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "sending initial data exerciseId=" << m_dataProvider->exerciseId();
|
||||
|
||||
if (m_dataProvider->exerciseId() > 0)
|
||||
if (m_prtCnvApp == prtCnvApp)
|
||||
return true;
|
||||
if (m_prtCnvApp)
|
||||
m_prtCnvApp->disconnect(this);
|
||||
m_prtCnvApp = prtCnvApp;
|
||||
if (m_prtCnvApp)
|
||||
{
|
||||
|
||||
m_txHandler->txData(m_dataProvider->exerciseEnvironmentData());
|
||||
connect(m_txHandler.get(), &ConvertToJson::outgoingMessage, m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromCentralToPrtCnv);
|
||||
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::textMessageFromPrtCnvToCentral, this, &SocketDispatcher::onTextMessageReceived);
|
||||
connect(m_prtCnvApp, &PrtCnv::PrtCnvApplication::warehouseMessageFromPtrCnv, this, &SocketDispatcher::warehouseMessage);
|
||||
|
||||
m_ackTimer->start();
|
||||
m_bInitialAck = true;
|
||||
}
|
||||
|
||||
m_txHandler->txData(m_dataProvider->exerciseStateData());
|
||||
m_txHandler->txData(m_dataProvider->exerciseEquipmentAssignment());
|
||||
const auto &aesTeles = m_dataProvider->aesTelegrams();
|
||||
for (TrainingAreaBase::TetraIcd::TrainingAreaTelegram *aesTele : aesTeles)
|
||||
m_txHandler->sendToTx(aesTele);
|
||||
|
||||
else
|
||||
{
|
||||
m_bInitialAck = false;
|
||||
m_ackTimer->stop();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
quint16 SocketDispatcher::randomListenPort() const
|
||||
{
|
||||
QTcpServer *s = new QTcpServer;
|
||||
s->listen(QHostAddress::Any, 0);
|
||||
while (!s->isListening())
|
||||
QCoreApplication::processEvents();
|
||||
quint16 port = s->serverPort();
|
||||
delete s;
|
||||
return port;
|
||||
}
|
||||
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> SocketDispatcher::sendToTab()
|
||||
{
|
||||
return std::static_pointer_cast<TrainingAreaBase::SendToTab>(m_txHandler);
|
||||
}
|
||||
|
||||
void SocketDispatcher::onTextMessageReceived(const QByteArray &message)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "TetraJson onTextMessageReceived: '" << message << "'";
|
||||
int newRecvCounter = 0;
|
||||
if (!handleTelegram(message, newRecvCounter))
|
||||
return;
|
||||
m_receiveCounter = newRecvCounter;
|
||||
}
|
||||
|
||||
void SocketDispatcher::handleTetraConnectionChanged(bool bConnected)
|
||||
{
|
||||
emit tetraConnectionChanged(bConnected);
|
||||
}
|
||||
|
||||
void SocketDispatcher::handleAcknowledge(qint64 timeStamp, int counter)
|
||||
{
|
||||
TRACE_LOG(m_logger) << "Ack from Socket for time " << timeStamp << " with counter " << counter << ", initial: " << m_bInitialAck;
|
||||
if (m_bInitialAck)
|
||||
{
|
||||
m_txHandler->setConnected(true);
|
||||
m_bInitialAck = false;
|
||||
onSendInitialData();
|
||||
}
|
||||
}
|
||||
|
||||
void SocketDispatcher::onAckTimeout()
|
||||
{
|
||||
TrainingAreaBase::TetraIcd::Acknowledge ack;
|
||||
ack.timeStamp = time(nullptr) * 1000;
|
||||
ack.ackCounter = m_receiveCounter;
|
||||
m_txHandler->txData(ack);
|
||||
}
|
||||
|
||||
void SocketDispatcher::onSendInitialData()
|
||||
{
|
||||
if (m_dataProvider)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << "sending initial data exerciseId=" << m_dataProvider->exerciseId();
|
||||
|
||||
if (m_dataProvider->exerciseId() > 0)
|
||||
{
|
||||
|
||||
m_txHandler->txData(m_dataProvider->exerciseEnvironmentData());
|
||||
}
|
||||
|
||||
m_txHandler->txData(m_dataProvider->exerciseStateData());
|
||||
m_txHandler->txData(m_dataProvider->exerciseEquipmentAssignment());
|
||||
const auto &aesTeles = m_dataProvider->aesTelegrams();
|
||||
for (TrainingAreaBase::TetraIcd::TrainingAreaTelegram *aesTele : aesTeles)
|
||||
m_txHandler->sendToTx(aesTele);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Executable → Regular
+34
-31
@@ -14,36 +14,39 @@
|
||||
|
||||
namespace TetraRadio
|
||||
{
|
||||
class SocketDispatcher final : public QObject, protected ConvertFromJson
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb);
|
||||
~SocketDispatcher();
|
||||
class SocketDispatcher final
|
||||
: public QObject
|
||||
, protected ConvertFromJson
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit SocketDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb);
|
||||
~SocketDispatcher();
|
||||
|
||||
bool init(PrtCnv::PrtCnvApplication *prtCnvApp);
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab();
|
||||
quint16 randomListenPort() const;
|
||||
bool canSendData() const { return m_prtCnvApp != nullptr; }
|
||||
Q_SIGNALS:
|
||||
void tetraConnectionChanged(bool bConnected);
|
||||
void warehouseMessage(const QByteArray &jsonData);
|
||||
private Q_SLOTS:
|
||||
void onTextMessageReceived(const QByteArray &message);
|
||||
void onAckTimeout();
|
||||
void onSendInitialData();
|
||||
private:
|
||||
void disconnectSocket(QWebSocket *s);
|
||||
void handleTetraConnectionChanged(bool bConnected) override;
|
||||
void handleAcknowledge(qint64 timeStamp, int counter) override;
|
||||
private:
|
||||
std::shared_ptr<ConvertToJson> m_txHandler;
|
||||
TrainingAreaBase::Plugin::DataProvider *m_dataProvider;
|
||||
PrtCnv::PrtCnvApplication *m_prtCnvApp;
|
||||
QTimer *m_ackTimer;
|
||||
bool m_bInitialAck;
|
||||
int m_receiveCounter;
|
||||
};
|
||||
bool init(PrtCnv::PrtCnvApplication *prtCnvApp);
|
||||
std::shared_ptr<TrainingAreaBase::SendToTab> sendToTab();
|
||||
quint16 randomListenPort() const;
|
||||
bool canSendData() const { return m_prtCnvApp != nullptr; }
|
||||
Q_SIGNALS:
|
||||
void tetraConnectionChanged(bool bConnected);
|
||||
void warehouseMessage(const QByteArray &jsonData);
|
||||
private Q_SLOTS:
|
||||
void onTextMessageReceived(const QByteArray &message);
|
||||
void onAckTimeout();
|
||||
void onSendInitialData();
|
||||
|
||||
}
|
||||
private:
|
||||
void disconnectSocket(QWebSocket *s);
|
||||
void handleTetraConnectionChanged(bool bConnected) override;
|
||||
void handleAcknowledge(qint64 timeStamp, int counter) override;
|
||||
|
||||
private:
|
||||
std::shared_ptr<ConvertToJson> m_txHandler;
|
||||
TrainingAreaBase::Plugin::DataProvider *m_dataProvider;
|
||||
PrtCnv::PrtCnvApplication *m_prtCnvApp;
|
||||
QTimer *m_ackTimer;
|
||||
bool m_bInitialAck;
|
||||
int m_receiveCounter;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user