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
@@ -182,7 +182,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
|
||||
Database::GimIed newData;
|
||||
|
||||
assignBaseData(data, newData);
|
||||
newData.typeId = static_cast<IedType::inner_enum>(data.type());
|
||||
newData.typeId = static_cast<IedType>(data.type());
|
||||
newData.remoteTrigger = data.remoteTrigger();
|
||||
newData.switchTrigger = data.switchTrigger();
|
||||
newData.lightBarrierTrigger = data.lightBarrierTrigger();
|
||||
@@ -194,16 +194,16 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
|
||||
else
|
||||
newData.partyId = getPartyIdFromParticipantEquipmentNumber(data.equipmentNumber()); // use party from equipmentNumber
|
||||
|
||||
newData.pairingStateId = static_cast<IedPairingState::inner_enum>(data.pairingState());
|
||||
newData.pairingStateId = static_cast<IedPairingState>(data.pairingState());
|
||||
switch (newData.pairingStateId.underlying())
|
||||
{
|
||||
case IedPairingState_def::PairedToParticipant:
|
||||
case IedPairingState::PairedToParticipant:
|
||||
newData.pairedParticipantId.setValue(data.pairedId().get());
|
||||
break;
|
||||
case IedPairingState_def::PairedToOps:
|
||||
case IedPairingState::PairedToOps:
|
||||
newData.pairedOpsId.setValue(data.pairedId().get());
|
||||
break;
|
||||
case IedPairingState_def::NotPaired:
|
||||
case IedPairingState::NotPaired:
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -217,11 +217,11 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
|
||||
// handled at guez_ied_to_map.cpp and gim_info_dialog.cpp
|
||||
switch (newData.typeId.underlying())
|
||||
{
|
||||
case IedType_def::SuicideIed:
|
||||
case IedType::SuicideIed:
|
||||
newData.symbol = QStringLiteral("AP6D|CMPL|10014000001103040000"); //SIDC for suicide bomber
|
||||
break;
|
||||
case IedType_def::IedSmallPyro:
|
||||
case IedType_def::IedBigPyro:
|
||||
case IedType::IedSmallPyro:
|
||||
case IedType::IedBigPyro:
|
||||
newData.symbol = QStringLiteral("AP6D|CMPL|10014000001103000000"); // SIDC for IED (OHNE ZickZack)
|
||||
break;
|
||||
} // switch
|
||||
@@ -319,18 +319,18 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie,
|
||||
|
||||
switch (request.pairingState().underlying())
|
||||
{
|
||||
case IedPairingState_def::PairedToParticipant:
|
||||
case IedPairingState::PairedToParticipant:
|
||||
{
|
||||
data.pairedParticipantId.setValue(request.pairedParticipantId.get());
|
||||
data.partyId = m_ppmDtc->participant(request.pairedParticipantId.get()).partyId();
|
||||
break;
|
||||
}
|
||||
case IedPairingState_def::PairedToOps:
|
||||
case IedPairingState::PairedToOps:
|
||||
{
|
||||
data.pairedOpsId.setValue(request.pairedOpsId.get());
|
||||
break;
|
||||
}
|
||||
case IedPairingState_def::NotPaired:
|
||||
case IedPairingState::NotPaired:
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user