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
@@ -817,9 +817,9 @@ Core::FunctionReplyObject ObjectEffectCluster::checkObjectData(const Database::A
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
|
||||
using geoType = AreaEffectSimulation::AesExplosionGeometry_def;
|
||||
const geoType::type curExGeoType = data.explosionGeometryId.underlying();
|
||||
static const QVector<geoType::type> ecValidGeos = {AreaEffectSimulation::AesExplosionGeometry::EgAimPoint, // 0 -> default
|
||||
using geoType = AreaEffectSimulation::AesExplosionGeometry;
|
||||
const geoType curExGeoType = data.explosionGeometryId;
|
||||
static const QVector<geoType> ecValidGeos = {AreaEffectSimulation::AesExplosionGeometry::EgAimPoint, // 0 -> default
|
||||
AreaEffectSimulation::AesExplosionGeometry::EgPoint,
|
||||
AreaEffectSimulation::AesExplosionGeometry::EgArea,
|
||||
AreaEffectSimulation::AesExplosionGeometry::EgRadial,
|
||||
@@ -1089,7 +1089,7 @@ void ObjectEffectCluster::onPublishData()
|
||||
0, // partitionTimeMSec(),
|
||||
{m_effectorData.begin().value().chargeTypeId, m_effectorData.begin().value().igniterTypeId, m_effectorData.begin().value().igniterFunctionId},
|
||||
m_data.effectDuration, // pause/resume: remainDuration
|
||||
toOptional(toMSec(m_data.effectStart)),
|
||||
toOptional<int64_t>(toMSec(m_data.effectStart)),
|
||||
m_data.effectStateId,
|
||||
m_data.effectSourceId,
|
||||
toOptional(m_data.partyId),
|
||||
@@ -1289,7 +1289,7 @@ void ObjectEffectCluster::adjustTrajectoryToDetonationLocation(int explosionInde
|
||||
// Effects:
|
||||
std::vector<AreaEffectSimulation::SingleEffect> &singleEffectsRef = m_effects.singleEffects;
|
||||
SingleEffect &ref = singleEffectsRef[explosionIndex];
|
||||
// ref.effectState(AesSingleEffectState_def::SesScheduled);
|
||||
// ref.effectState(AesSingleEffectState::SesScheduled);
|
||||
ref.position = intersectionLocation;
|
||||
ref.zPlacement = AesZPlacement::ZpAbsolute; // intersection: change from draped to relative
|
||||
// m_effectsHaveChanged = true;
|
||||
@@ -1478,7 +1478,7 @@ void ObjectEffectCluster::publishAiv()
|
||||
// AtEffectClusterGunToTargetLine is suppressed at map display, when main object changes to EsActivated
|
||||
// So it does not have to be changed/published anymore.
|
||||
// Especially helpful while restarting scvAes!
|
||||
static QVector<AesEffectState::type> relevantEffStates = {AesEffectState::EsReceived,
|
||||
static QVector<AesEffectState> relevantEffStates = {AesEffectState::EsReceived,
|
||||
AesEffectState::EsCreated,
|
||||
AesEffectState::EsPrepared,
|
||||
AesEffectState::EsFired,
|
||||
@@ -3298,7 +3298,7 @@ bool ObjectEffectCluster::overrideEffectorStates(const AesEffectorState &newStat
|
||||
case AesEffectorState::EsReadyToFire:
|
||||
{
|
||||
// Override internal state in case DMF is not ready yet
|
||||
m_data.effectorState = AesEffectorState::EsReadyToFire;
|
||||
m_data.effectorState = static_cast<int>(AesEffectorState::EsReadyToFire);
|
||||
DEBUG_LOG(m_logger) << "Set Ready to Fire !";
|
||||
onPublishData();
|
||||
|
||||
|
||||
Reference in new issue
Block a user