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
+7
-7
@@ -161,17 +161,17 @@ void HandlerNasatAircraftParticipant::participantRemoved(int exerciseId, int par
|
||||
}
|
||||
}
|
||||
|
||||
bool isExerciseStateValid(ExerciseManagement::ExerciseState::type state)
|
||||
bool isExerciseStateValid(ExerciseManagement::ExerciseState state)
|
||||
{
|
||||
switch (state)
|
||||
{
|
||||
case ExerciseManagement::ExerciseState_def::Created:
|
||||
case ExerciseManagement::ExerciseState_def::Paused:
|
||||
case ExerciseManagement::ExerciseState_def::Started:
|
||||
case ExerciseManagement::ExerciseState_def::Stopped:
|
||||
case ExerciseManagement::ExerciseState::Created:
|
||||
case ExerciseManagement::ExerciseState::Paused:
|
||||
case ExerciseManagement::ExerciseState::Started:
|
||||
case ExerciseManagement::ExerciseState::Stopped:
|
||||
return true;
|
||||
case ExerciseManagement::ExerciseState_def::Unknown:
|
||||
case ExerciseManagement::ExerciseState_def::Terminated:
|
||||
case ExerciseManagement::ExerciseState::Unknown:
|
||||
case ExerciseManagement::ExerciseState::Terminated:
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -137,7 +137,7 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
|
||||
ecReq.effectStart = impactTimeMsec > tNow ? impactTimeMsec : tNow;
|
||||
ecReq.name = QStringLiteral("NASAT_%1_%2_%3").arg(nasatId).arg(munitionCode).arg(dtNow.toString(QStringLiteral("dd hh:mm:ss"))).toStdString();
|
||||
ecReq.element = ecReq.name;
|
||||
ecReq.impactPosition(Core::GeoPosition2D(pos.lon, pos.lat));
|
||||
ecReq.impactPosition = Core::GeoPosition2D(pos.lon, pos.lat);
|
||||
ecReq.chargeTypeId = chargeTypeIdVal;
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
|
||||
ecCommonModifyRequest.chargeStruct.chargeTypeId = chargeTypeIdVal;
|
||||
ecCommonModifyRequest.chargeStruct.igniterTypeId = fuseTypeToPdmIgniterType(fuseType);
|
||||
|
||||
ecCommonModifyRequest.area.cornerBottomLeft(Core::GeoPosition2D(pos.lon, pos.lat));
|
||||
ecCommonModifyRequest.area.cornerBottomLeft = Core::GeoPosition2D(pos.lon, pos.lat);
|
||||
|
||||
ecCommonModifyRequest.name = QStringLiteral("NASAT_%1_%2_%3").arg(nasatId).arg(munitionCode).arg(dtNow.toString(QStringLiteral("dd hh:mm:ss"))).toStdString();
|
||||
ecCommonModifyRequest.element = ecReq.name;
|
||||
|
||||
Reference in new issue
Block a user