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
+29
-29
@@ -30,16 +30,16 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityStateFromDam
|
||||
switch(status)
|
||||
{
|
||||
case rpr2::DamageStatusEnum32::NoDamage:
|
||||
vs = ProjectDataManagement::VulnerabilityState_def::CombatReady;
|
||||
vs = ProjectDataManagement::VulnerabilityState::CombatReady;
|
||||
break;
|
||||
case rpr2::DamageStatusEnum32::SlightDamage:
|
||||
vs = ProjectDataManagement::VulnerabilityState_def::LightDamage;
|
||||
vs = ProjectDataManagement::VulnerabilityState::LightDamage;
|
||||
break;
|
||||
case rpr2::DamageStatusEnum32::ModerateDamage:
|
||||
vs = ProjectDataManagement::VulnerabilityState_def::HeavyDamage;
|
||||
vs = ProjectDataManagement::VulnerabilityState::HeavyDamage;
|
||||
break;
|
||||
case rpr2::DamageStatusEnum32::Destroyed:
|
||||
vs = ProjectDataManagement::VulnerabilityState_def::CatastrophicKill;
|
||||
vs = ProjectDataManagement::VulnerabilityState::CatastrophicKill;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -63,31 +63,31 @@ rpr2::DamageStatusEnum32::ET DamageModel::damageState(qint64 simTimeMSec) const
|
||||
|
||||
switch (m_vulnerabilityStates.at(idx).vulnerabilityState.underlying())
|
||||
{
|
||||
case ProjectDataManagement::VulnerabilityState_def::CombatReady:
|
||||
case ProjectDataManagement::VulnerabilityState::CombatReady:
|
||||
return rpr2::DamageStatusEnum32::NoDamage;
|
||||
case ProjectDataManagement::VulnerabilityState_def::LightDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::LightDamage:
|
||||
return rpr2::DamageStatusEnum32::SlightDamage;
|
||||
case ProjectDataManagement::VulnerabilityState_def::MediumDamage:
|
||||
case ProjectDataManagement::VulnerabilityState_def::HeavyDamage:
|
||||
case ProjectDataManagement::VulnerabilityState_def::MobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::MediumDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::HeavyDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::MobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill:
|
||||
case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage:
|
||||
case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage:
|
||||
return rpr2::DamageStatusEnum32::ModerateDamage;
|
||||
case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill:
|
||||
case ProjectDataManagement::VulnerabilityState::CatastrophicKill:
|
||||
return rpr2::DamageStatusEnum32::Destroyed;
|
||||
case ProjectDataManagement::VulnerabilityState_def::TemporarySeverance:
|
||||
case ProjectDataManagement::VulnerabilityState_def::NearMiss:
|
||||
case ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect:
|
||||
case ProjectDataManagement::VulnerabilityState::TemporarySeverance:
|
||||
case ProjectDataManagement::VulnerabilityState::NearMiss:
|
||||
case ProjectDataManagement::VulnerabilityState::HitWithNoEffect:
|
||||
return rpr2::DamageStatusEnum32::NoDamage;
|
||||
case ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged:
|
||||
case ProjectDataManagement::VulnerabilityState_def::Reserved:
|
||||
case ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged:
|
||||
case ProjectDataManagement::VulnerabilityState::Reserved:
|
||||
return rpr2::DamageStatusEnum32::NoDamage;
|
||||
case ProjectDataManagement::VulnerabilityState_def::NContamination:
|
||||
case ProjectDataManagement::VulnerabilityState_def::BContamination:
|
||||
case ProjectDataManagement::VulnerabilityState_def::CContamination:
|
||||
case ProjectDataManagement::VulnerabilityState::NContamination:
|
||||
case ProjectDataManagement::VulnerabilityState::BContamination:
|
||||
case ProjectDataManagement::VulnerabilityState::CContamination:
|
||||
return rpr2::DamageStatusEnum32::SlightDamage;
|
||||
case ProjectDataManagement::VulnerabilityState_def::NotReady:
|
||||
case ProjectDataManagement::VulnerabilityState::NotReady:
|
||||
return rpr2::DamageStatusEnum32::NoDamage;
|
||||
}
|
||||
return rpr2::DamageStatusEnum32::NoDamage;
|
||||
@@ -98,9 +98,9 @@ bool DamageModel::immobilized(qint64 simTimeMSec) const
|
||||
int idx = indexForTime(simTimeMSec);
|
||||
if (idx < 0)
|
||||
return false;
|
||||
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::MobilityKill ||
|
||||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill ||
|
||||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
|
||||
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::MobilityKill ||
|
||||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleMobilityKill ||
|
||||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
@@ -110,9 +110,9 @@ bool DamageModel::firePowerDisabled(qint64 simTimeMSec) const
|
||||
int idx = indexForTime(simTimeMSec);
|
||||
if (idx < 0)
|
||||
return false;
|
||||
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage ||
|
||||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage ||
|
||||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
|
||||
if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::WeaponSystemDamage ||
|
||||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage ||
|
||||
m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
@@ -149,7 +149,7 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64
|
||||
{
|
||||
int idx = indexForTime(simTimeMSec);
|
||||
if (idx < 0)
|
||||
return ProjectDataManagement::VulnerabilityState_def::CombatReady;
|
||||
return ProjectDataManagement::VulnerabilityState::CombatReady;
|
||||
return m_vulnerabilityStates.at(idx).vulnerabilityState;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user