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
+4
-4
@@ -591,8 +591,8 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
|
||||
bool remove = false;
|
||||
if (it.value()->getIdAES() == idAes)
|
||||
{
|
||||
if ((it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution))) &&
|
||||
(it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))
|
||||
if ((it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::Execution)) &&
|
||||
(it.value()->getData().orderConfirmation != static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)))
|
||||
remove = true;
|
||||
else
|
||||
INFO_LOG(m_logger) << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT";
|
||||
@@ -897,8 +897,8 @@ void HandlerEffectShow::onSendMeteoData()
|
||||
if (effectShow.esmParticipantId == -1)
|
||||
continue; // no actor allocated
|
||||
|
||||
if ((effectShow.orderConfirmation < static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff))) ||
|
||||
(effectShow.orderConfirmation >= static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))
|
||||
if ((effectShow.orderConfirmation < static_cast<int>(EffectShowManagement::OrderConfirmation_e::DriveOff)) ||
|
||||
(effectShow.orderConfirmation >= static_cast<int>(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)))
|
||||
continue; // effect show not processed
|
||||
|
||||
triggerMeteoData(obj);
|
||||
|
||||
Reference in new issue
Block a user