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
@@ -51,7 +51,8 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QMap<int, int> m_tetraId2ddsId;
|
||||
QMap<int, int> m_ddsId2TetraId;
|
||||
QSet<int> m_aesInTetraAvailable;
|
||||
@@ -149,8 +150,7 @@ private:
|
||||
|
||||
void doSpecialization(const AreaEffectSimulation::ExplosionArea &data, std::unordered_map<int, AreaEffectSimulation::ExplosionArea> &cont)
|
||||
{
|
||||
cont[data.id()].remainExplosionNumber(data.remainExplosionNumber());
|
||||
}
|
||||
cont[data.id].remainExplosionNumber = data.remainExplosionNumber; }
|
||||
template<typename T>
|
||||
void doSpecialization(const T &data, std::unordered_map<int, T> &cont)
|
||||
{
|
||||
@@ -161,20 +161,18 @@ private:
|
||||
bool dataChanged(const T &data, std::unordered_map<int, T> &cont, bool &onlyNameChanged)
|
||||
{
|
||||
onlyNameChanged = false;
|
||||
auto it = cont.find(data.id());
|
||||
auto it = cont.find(data.id);
|
||||
T dataTmp(data);
|
||||
dataTmp.sampleTime(0);
|
||||
|
||||
dataTmp.sampleTime = 0;
|
||||
if (it == cont.end())
|
||||
{
|
||||
cont.emplace(std::make_pair(data.id(), std::move(dataTmp)));
|
||||
cont.emplace(std::make_pair(data.id, std::move(dataTmp)));
|
||||
DEBUG_LOG(m_logger) << "new AES Item: " << data;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
it->second.effectStateId(data.effectStateId());
|
||||
|
||||
it->second.effectStateId = data.effectStateId;
|
||||
|
||||
doSpecialization(data, cont);
|
||||
|
||||
@@ -186,9 +184,7 @@ private:
|
||||
|
||||
|
||||
T tmp(it->second);
|
||||
tmp.name(data.name());
|
||||
tmp.sampleTime(data.sampleTime());
|
||||
onlyNameChanged = (tmp == data);
|
||||
tmp.name = data.name; tmp.sampleTime = data.sampleTime; onlyNameChanged = (tmp == data);
|
||||
|
||||
std::swap(it->second, dataTmp);
|
||||
|
||||
@@ -207,15 +203,13 @@ private:
|
||||
{
|
||||
AreaEffectSimulation::ExplosionArea copy(current);
|
||||
|
||||
copy.remainExplosionNumber(0);
|
||||
return dataChanged(copy, m_currentExplosionArea, onlyNameChanged);
|
||||
copy.remainExplosionNumber = 0; return dataChanged(copy, m_currentExplosionArea, onlyNameChanged);
|
||||
}
|
||||
bool dataChanged(const AreaEffectSimulation::ExplosionCluster ¤t, bool &onlyNameChanged)
|
||||
{
|
||||
AreaEffectSimulation::ExplosionCluster copy(current);
|
||||
|
||||
copy.remainExplosionNumber(0);
|
||||
return dataChanged(copy, m_currentExplosionCluster, onlyNameChanged);
|
||||
copy.remainExplosionNumber = 0; return dataChanged(copy, m_currentExplosionCluster, onlyNameChanged);
|
||||
}
|
||||
|
||||
bool dataChanged(const AreaEffectSimulation::ExplosionSingle ¤t, bool &onlyNameChanged)
|
||||
@@ -270,60 +264,59 @@ private:
|
||||
auto it = cont.find(aesDdsId);
|
||||
if (it == cont.end())
|
||||
return;
|
||||
it->second.effectStart(0);
|
||||
}
|
||||
it->second.effectStart = 0; }
|
||||
|
||||
void resetStartTime(const AreaEffectSimulation::AirSupportImpact ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentBCContaminations);
|
||||
resetStartTime(current.id, m_currentBCContaminations);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::BCContamination ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentBCContaminations);
|
||||
resetStartTime(current.id, m_currentBCContaminations);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::ExplosionArea ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentExplosionArea);
|
||||
resetStartTime(current.id, m_currentExplosionArea);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::ExplosionCluster ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentExplosionCluster);
|
||||
resetStartTime(current.id, m_currentExplosionCluster);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::ExplosionSingle ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentExplosionSingle);
|
||||
resetStartTime(current.id, m_currentExplosionSingle);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::MineArea ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentMineArea);
|
||||
resetStartTime(current.id, m_currentMineArea);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::NContamination ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentNContamination);
|
||||
resetStartTime(current.id, m_currentNContamination);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::FunctionalArea ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentFunctionalArea);
|
||||
resetStartTime(current.id, m_currentFunctionalArea);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::TechnicalArea ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentTechnicalArea);
|
||||
resetStartTime(current.id, m_currentTechnicalArea);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::DusSingleMine ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentDusSingleMine);
|
||||
resetStartTime(current.id, m_currentDusSingleMine);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::GasPipe ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentGasPipes);
|
||||
resetStartTime(current.id, m_currentGasPipes);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::BoobyTrap ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentBoobyTraps);
|
||||
resetStartTime(current.id, m_currentBoobyTraps);
|
||||
}
|
||||
void resetStartTime(const AreaEffectSimulation::OffRouteMine ¤t)
|
||||
{
|
||||
resetStartTime(current.id(), m_currentOffRouteMines);
|
||||
resetStartTime(current.id, m_currentOffRouteMines);
|
||||
}
|
||||
|
||||
std::shared_ptr<PdmHandler> pdm();
|
||||
@@ -342,6 +335,7 @@ private:
|
||||
void onSendDusMineReactivationTimeout();
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::unordered_map<int, AreaEffectSimulation::AirSupportImpact> m_currentAirSupportImpacts;
|
||||
std::unordered_map<int, AreaEffectSimulation::BCContamination> m_currentBCContaminations;
|
||||
std::unordered_map<int, AreaEffectSimulation::ExplosionArea> m_currentExplosionArea;
|
||||
|
||||
Reference in new issue
Block a user