Adds first successful release run (tbc)
This commit is contained in:
22 files changed
+89
-34
No files matched your search
+1
@@ -32,6 +32,7 @@ NGL_ADD_LIBRARY(AAR SV tabPluginTetraJson MODULE ${SRCS})
|
||||
NGL_INSTALL_TARGET(tabPluginTetraJson)
|
||||
NGL_TARGET_LINK_LIBRARIES(tabPluginTetraJson
|
||||
CoPrtCnv
|
||||
LogViewLogger
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
|
||||
+2
-2
@@ -6,6 +6,7 @@
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <TetraIF/LogView/logger.h>
|
||||
|
||||
namespace TetraRadio
|
||||
{
|
||||
@@ -13,8 +14,7 @@ namespace TetraRadio
|
||||
ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler,
|
||||
const char *loggerName) : m_rxHandler(rxHandler)
|
||||
, m_bWarnedOnce(false)
|
||||
.getNGLLogger(loggerName)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
, m_logger(N_LogView::getLogger(loggerName)) {}
|
||||
|
||||
bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
|
||||
{
|
||||
|
||||
+2
-1
@@ -5,6 +5,7 @@
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <TetraIF/LogView/logger.h>
|
||||
|
||||
namespace TetraRadio
|
||||
{
|
||||
@@ -12,7 +13,7 @@ ConvertToJson::ConvertToJson(const char *loggerName)
|
||||
: QObject()
|
||||
, SendToTab()
|
||||
, m_bConnected(false)
|
||||
.getNGLLogger(loggerName))
|
||||
, m_logger(N_LogView::getLogger(loggerName))
|
||||
{
|
||||
resetSendCounter();
|
||||
}
|
||||
|
||||
+6
-9
@@ -15,6 +15,7 @@
|
||||
#include <QtCore/QSettings>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <qglobal.h>
|
||||
#include <TetraIF/LogView/logger.h>
|
||||
|
||||
namespace TetraRadio
|
||||
{
|
||||
@@ -34,13 +35,14 @@ std::shared_ptr<TrainingAreaBase::Plugin::Interface> TetraJsonPlugin::createInte
|
||||
TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp,
|
||||
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
||||
NGL::Settings *settings)
|
||||
: m_socketDispatcher(new SocketDispatcher(pdp, recvFromTabCb))
|
||||
: 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)
|
||||
.getNGLLogger("TAB.Plugin.TetraJsonInterfaceImpl"))
|
||||
{
|
||||
Q_UNUSED(settings);
|
||||
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
|
||||
settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
|
||||
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUsePvSan(
|
||||
@@ -97,19 +99,14 @@ bool TetraJsonInterfaceImpl::updatePrtCnv()
|
||||
}
|
||||
|
||||
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"));
|
||||
s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname()));
|
||||
s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort());
|
||||
s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname()));
|
||||
s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort());
|
||||
s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi());
|
||||
s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1());
|
||||
s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2());
|
||||
// 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();
|
||||
|
||||
Reference in new issue
Block a user