Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
@@ -65,7 +65,8 @@ public:
|
||||
|
||||
|
||||
ExerciseManager::ExerciseManager(ActiveExercises *activeExercises, DdsHandler *ddsHandler)
|
||||
: m_activeExercises(activeExercises)
|
||||
: m_logger(getLogger("ExerciseManager"))
|
||||
, m_activeExercises(activeExercises)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
{
|
||||
Q_ASSERT(activeExercises);
|
||||
@@ -216,15 +217,15 @@ void ExerciseManager::stopPositionsUpdate()
|
||||
void ExerciseManager::onNewClientConnection(qint64 id)
|
||||
{
|
||||
AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request;
|
||||
request.client(id);
|
||||
request.isActive(true);
|
||||
request.client = id;
|
||||
request.isActive = true;
|
||||
m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this);
|
||||
}
|
||||
|
||||
void ExerciseManager::onClientConnectionClosed(qint64 id)
|
||||
{
|
||||
AudioVideoManagement::RemoveFrequencyPlanningStatusByClientRequest request;
|
||||
request.client(id);
|
||||
request.client = id;
|
||||
m_ddsHandler->avmFtc()->removeFrequencyPlanningStatusByClientRequest(request, this);
|
||||
}
|
||||
|
||||
@@ -237,33 +238,33 @@ void ExerciseManager::onClearFrequencyPlanningStatus()
|
||||
void ExerciseManager::onConfigCnrSent(qint64 id, const QString &uuid, const QString &requester, bool isActiveClient)
|
||||
{
|
||||
AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request;
|
||||
request.client(id);
|
||||
request.uuid(uuid.toStdString());
|
||||
request.sent(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||
request.requester(requester.toStdString());
|
||||
request.isActive(isActiveClient);
|
||||
request.client = id;
|
||||
request.uuid = uuid.toStdString();
|
||||
request.sent = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
|
||||
request.requester = requester.toStdString();
|
||||
request.isActive = isActiveClient;
|
||||
m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this);
|
||||
}
|
||||
|
||||
void ExerciseManager::onConfigCnrReceived(qint64 id, const QString &uuid)
|
||||
{
|
||||
AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request;
|
||||
request.client(id);
|
||||
request.uuid(uuid.toStdString());
|
||||
request.received(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||
request.client = id;
|
||||
request.uuid = uuid.toStdString();
|
||||
request.received = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
|
||||
m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this);
|
||||
}
|
||||
|
||||
void ExerciseManager::onConfigCnrProcessed(qint64 id, const QString &uuid, const QJsonObject &configCnrData)
|
||||
{
|
||||
AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request;
|
||||
request.client(id);
|
||||
request.uuid(uuid.toStdString());
|
||||
request.activated(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||
request.content(QJsonDocument(configCnrData).toJson().toStdString());
|
||||
request.requester(QJsonDocument(configCnrData).object()[QStringLiteral("requester")].toString().toStdString());
|
||||
request.reason(static_cast<AudioVideoManagement::TransmissionReason::inner_enum>(QJsonDocument(configCnrData).object()[QStringLiteral("reason")].toInt(0)));
|
||||
request.isActive(true);
|
||||
request.client = id;
|
||||
request.uuid = uuid.toStdString();
|
||||
request.activated = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
|
||||
request.content = QJsonDocument(configCnrData).toJson().toStdString();
|
||||
request.requester = QJsonDocument(configCnrData).object()[QStringLiteral("requester")].toString().toStdString();
|
||||
request.reason = static_cast<AudioVideoManagement::TransmissionReason>(QJsonDocument(configCnrData).object()[QStringLiteral("reason")].toInt(0));
|
||||
request.isActive = true;
|
||||
m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this);
|
||||
}
|
||||
|
||||
@@ -291,7 +292,7 @@ void ExerciseManager::onExerciseActivated(int exerciseId)
|
||||
if (isFirstActiveExercise)
|
||||
{
|
||||
ExerciseManagement::Exercise exercise = m_ddsHandler->exmDtc()->exercise(exerciseId);
|
||||
m_trainingArea.reset(new TrainingArea(exercise.trainingAreaId(), m_ddsHandler->asmDtc(), m_ddsHandler->ismDtc()));
|
||||
m_trainingArea.reset(new TrainingArea(exercise.trainingAreaId, m_ddsHandler->asmDtc(), m_ddsHandler->ismDtc()));
|
||||
}
|
||||
|
||||
emit essentialsUpdate();
|
||||
|
||||
Reference in new issue
Block a user