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
+11
-11
@@ -139,9 +139,9 @@ void HandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Parti
|
||||
|
||||
// No OC in CES
|
||||
ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.typeId());
|
||||
if (typeClass == ParticipantManagement::TypeClass_def::SupportEntity
|
||||
|| typeClass == ParticipantManagement::TypeClass_def::SupportUnit
|
||||
|| typeClass == ParticipantManagement::TypeClass_def::Unit)
|
||||
if (typeClass == ParticipantManagement::TypeClass::SupportEntity
|
||||
|| typeClass == ParticipantManagement::TypeClass::SupportUnit
|
||||
|| typeClass == ParticipantManagement::TypeClass::Unit)
|
||||
return;
|
||||
m_participantData[data.id()] = data;
|
||||
|
||||
@@ -153,7 +153,7 @@ void HandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Parti
|
||||
<< " id=" << data.id()
|
||||
<< " typeId=" << data.typeId()
|
||||
<< " designator=" << data.designator();
|
||||
if (typeClass == ParticipantManagement::TypeClass_def::Target)
|
||||
if (typeClass == ParticipantManagement::TypeClass::Target)
|
||||
DEBUG_LOG(m_logger) << "Typeclass = Target";
|
||||
}
|
||||
|
||||
@@ -423,7 +423,7 @@ void HandlerTargetAreas::sendRequestsToTab(int participantId,
|
||||
int32_t effectPercentFt = effectPercent;
|
||||
rti::core::int64 effectTimeFt = m_ddsHandler->currentPartitionTime();
|
||||
|
||||
TrainingAreaBase::ControlDataCode controlCodeFt = TrainingAreaBase::ControlDataCode_def::Flashing;
|
||||
TrainingAreaBase::ControlDataCode controlCodeFt = TrainingAreaBase::ControlDataCode::Flashing;
|
||||
std::vector< uint8_t > controlDataFt;
|
||||
|
||||
|
||||
@@ -471,19 +471,19 @@ void HandlerTargetAreas::on_preWarningIntervalFinished(int participantId, int ta
|
||||
|
||||
switch (shootbackTarget.targetInformation.prewarningEffect().underlying())
|
||||
{
|
||||
case ProjectDataManagement::VulnerabilityState_def::NoChange:
|
||||
case ProjectDataManagement::VulnerabilityState::NoChange:
|
||||
countBlink = 1;
|
||||
effectPercent = 0;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState_def::MobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::MobilityKill:
|
||||
effectPercent = 30;
|
||||
countBlink = 2;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState_def::NearMiss:
|
||||
case ProjectDataManagement::VulnerabilityState::NearMiss:
|
||||
countBlink = 3;
|
||||
effectPercent = 60;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill:
|
||||
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
|
||||
countBlink = 4;
|
||||
effectPercent = 100;
|
||||
break;
|
||||
@@ -520,11 +520,11 @@ void HandlerTargetAreas::on_TimeToEffectFinished(int participantId, int targetPa
|
||||
|
||||
switch (shootbackTarget.targetInformation.takedownEffect().underlying())
|
||||
{
|
||||
case ProjectDataManagement::VulnerabilityState_def::MobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::MobilityKill:
|
||||
effectPercent = 50;
|
||||
countBlink = 5;
|
||||
break;
|
||||
case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill:
|
||||
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
|
||||
countBlink = 6;
|
||||
effectPercent = 100;
|
||||
break;
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@ public:
|
||||
|
||||
struct ParticipantPosition : public ParticipantManagement::ParticipantPosition
|
||||
{
|
||||
ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::CombatReady;
|
||||
ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::CombatReady;
|
||||
Core::GeoPosition lastGeoPosition;
|
||||
bool positionValid = false;
|
||||
|
||||
|
||||
Reference in new issue
Block a user