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
@@ -117,7 +117,7 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement::
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " Send Jamming to TAB and destroy uasId";
|
||||
//sendCesHitRequest(data.charge().chargeTypeId(), data.participantId(),cesParticipantData);
|
||||
if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
|
||||
if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
jammedUasIds.append(uasId);
|
||||
}
|
||||
else
|
||||
@@ -193,14 +193,14 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
|
||||
<< " equipNo = " << equipNo
|
||||
<< " chargeTypeId =" << chargeTypeId;
|
||||
|
||||
if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)
|
||||
if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "participantPosition.participantId == 0 CatastrophicKill)";
|
||||
return;
|
||||
}
|
||||
|
||||
const TrainingAreaBase::TabPosition pos(participantData.pos(),
|
||||
Core::PositionReportingSource_def::Gps, // irrelevant
|
||||
Core::PositionReportingSource::Gps, // irrelevant
|
||||
participantData.buildingId(),
|
||||
participantData.roomId());
|
||||
|
||||
@@ -216,7 +216,7 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
|
||||
remaining, // remainEffectPercent ( no protection outside Building )
|
||||
pos,
|
||||
effectTime, // effectTime
|
||||
ProjectDataManagement::PdmEventType::Jamming, // EventType
|
||||
ProjectDataManagement::PdmEventType::EventType_Jamming, // EventType
|
||||
originatorPartyId, // originPartyId
|
||||
mineId
|
||||
);
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ struct ParticipantDistance
|
||||
|
||||
struct EnterLeaveType
|
||||
{
|
||||
ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown;
|
||||
ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown;
|
||||
bool isAlreadySupplied = false;
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user