Adds further migration results and moves generated tests in
This commit is contained in:
442 files changed
+17126
-246
No files matched your search
@@ -17,6 +17,12 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCnrHelper
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/AudioVideoManagement/
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCnrHelper
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
@@ -27,7 +33,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCnrHelper
|
||||
# ddsfts
|
||||
PUBLIC
|
||||
svcAvmCommon
|
||||
Qt6::Core
|
||||
|
||||
# svcAesCommon
|
||||
# ngldb
|
||||
)
|
||||
@@ -95,6 +101,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCombatNetRadio
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
ngltools
|
||||
|
||||
+9
-3
@@ -1,9 +1,15 @@
|
||||
#pragma once
|
||||
#include <QJsonDocument>
|
||||
#include <AudioVideoManagement/avm_enums.hpp>
|
||||
#include "svccnrhelper_export.h"
|
||||
#include <CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
|
||||
// Use stub enums when BUILD_RTI is OFF (avm_enums.hpp is generated by RTI DDS tools)
|
||||
#ifdef BUILD_RTI
|
||||
#include <AudioVideoManagement/avm_enums.hpp>
|
||||
#else
|
||||
#include <AudioVideoManagement/avm_enums_stub.hpp>
|
||||
#endif
|
||||
|
||||
namespace AudioVideoManagement {
|
||||
|
||||
struct SVCCNRHELPER_EXPORT RadioCircuit
|
||||
@@ -12,7 +18,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuit
|
||||
virtual ~RadioCircuit() = default;
|
||||
|
||||
QString name;
|
||||
FrequencyBand freqBand {FrequencyBand_def::VHF};
|
||||
FrequencyBand freqBand {FrequencyBand::VHF_v};
|
||||
int radioStationId {0};
|
||||
|
||||
|
||||
@@ -71,7 +77,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuitUHF: public RadioCircuit
|
||||
|
||||
struct SVCCNRHELPER_EXPORT RadioCircuitVHF: public RadioCircuit
|
||||
{
|
||||
RcOperatingMode operatingMode {RcOperatingMode_def::FixedFreqEncNone};
|
||||
RcOperatingMode operatingMode {RcOperatingMode::FixedFreqEncNone_v};
|
||||
int freqSetDataId {0};
|
||||
bool pilotTone {false};
|
||||
|
||||
|
||||
Reference in new issue
Block a user