Removes .IDL warnings: multiple enum definitons and builtin-type collisions

This commit is contained in:
torsten committed 2026-09-14 15:45:58 +00:00
1 parent eb02c1f001
commit be912de9d6
135 files changed
+1122 -1122

No files matched your search

@@ -110,7 +110,7 @@ void MsgCompares::compareFeuerkommandoGeschosse(const AdlerJson::FeuerkommandoGe
void MsgCompares::compareFeuerHaltDaten(const AdlerJson::FeuerHaltDaten &feuerHaltDaten)
{
QCOMPARE(feuerHaltDaten.kategorie, ProjectDataManagement::L22_FireHaltCategory::E);
QCOMPARE(feuerHaltDaten.kategorie, ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E);
QCOMPARE(feuerHaltDaten.feuerkampfReferenz, QStringLiteral("feuerHaltDaten"));
QCOMPARE(feuerHaltDaten.zpNummer, 5);
QCOMPARE(feuerHaltDaten.koordinate.latitude, 53.37791);
@@ -147,7 +147,7 @@ void MsgCompares::compareFeuerstellungsdaten(const AdlerJson::Feuerstellungsdate
QCOMPARE(feuerstellungsdaten.status, ProjectDataManagement::L28_Status::Einsatzbereit);
QCOMPARE(feuerstellungsdaten.feuereinheit.verein, QStringLiteral("verein ExFeuerstellungFS"));
QCOMPARE(feuerstellungsdaten.feuereinheit.r, 5);
QCOMPARE(feuerstellungsdaten.feuereinheit.oi, ProjectDataManagement::L19_Oi::F3);
QCOMPARE(feuerstellungsdaten.feuereinheit.oi, ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
QCOMPARE(feuerstellungsdaten.mittelpunkt.koordinate.latitude, 53.37791);
QCOMPARE(feuerstellungsdaten.mittelpunkt.koordinate.longitude, 8.759);
QCOMPARE(feuerstellungsdaten.mittelpunkt.hoehe, 20);
@@ -163,7 +163,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
QCOMPARE(waffensystemdaten.status, ProjectDataManagement::L28_Status::NichtEinsatzbereit);
QCOMPARE(waffensystemdaten.einheit.verein, QStringLiteral("AB7X"));
QCOMPARE(waffensystemdaten.einheit.r, 6);
QCOMPARE(waffensystemdaten.einheit.oi, ProjectDataManagement::L19_Oi::F6);
QCOMPARE(waffensystemdaten.einheit.oi, ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6);
MsgCompares::compareGeschosse(waffensystemdaten.geschosse);
QCOMPARE(waffensystemdaten.koordinate.koordinate.latitude, 53.088354);
QCOMPARE(waffensystemdaten.koordinate.koordinate.longitude, 8.853092);
@@ -176,7 +176,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
void MsgCompares::compareLadeplatzdaten(const AdlerJson::Ladeplatzdaten &ladeplatzdaten)
{
QCOMPARE(ladeplatzdaten.einheit.oi , ProjectDataManagement::L19_Oi::F3);
QCOMPARE(ladeplatzdaten.einheit.oi , ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
QCOMPARE(ladeplatzdaten.einheit.r, 5);
QCOMPARE(ladeplatzdaten.einheit.verein, QStringLiteral("verein StellungsmeldungLP"));
QCOMPARE(ladeplatzdaten.koordinate.koordinate.latitude, 53.37791);
@@ -187,7 +187,7 @@ void MsgCompares::compareWaffensystemdaten(const AdlerJson::Waffensystemdaten &w
void MsgCompares::compareStellungswechseldaten(const AdlerJson::Stellungswechseldaten &stellungswechseldaten)
{
QCOMPARE(stellungswechseldaten.oi, ProjectDataManagement::L19_Oi::F3);
QCOMPARE(stellungswechseldaten.oi, ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3);
QCOMPARE(stellungswechseldaten.r, 5);
QCOMPARE(stellungswechseldaten.verein, QStringLiteral("verein ExStellungswechsel"));
}
@@ -474,7 +474,7 @@ void GenerateTelegrams::generateFeuerhalt(AdlerJson::ExFeuerhalt &req)
{
req.feuerHaltDaten.verein = QStringLiteral("123456");
req.feuerHaltDaten.kenner = ProjectDataManagement::L27_EffectorId::A;
req.feuerHaltDaten.kategorie = ProjectDataManagement::L22_FireHaltCategory::R;
req.feuerHaltDaten.kategorie = ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_R;
req.feuerHaltDaten.feuerkampfReferenz = QStringLiteral("feuerHaltDaten");
req.feuerHaltDaten.zpNummer = 5;
req.feuerHaltDaten.koordinate.latitude = 53.11172;
@@ -489,7 +489,7 @@ void GenerateTelegrams::generateStellungsmeldungFS(AdlerJson::ExFeuerstellungFS
req.feuerstellungsdaten.status = ProjectDataManagement::L28_Status::Einsatzbereit;
req.feuerstellungsdaten.feuereinheit.verein = QStringLiteral("verein ExFeuerstellungFS");
req.feuerstellungsdaten.feuereinheit.r = 5;
req.feuerstellungsdaten.feuereinheit.oi = ProjectDataManagement::L19_Oi::F3;
req.feuerstellungsdaten.feuereinheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
req.feuerstellungsdaten.mittelpunkt.koordinate.latitude = 53.37791;
req.feuerstellungsdaten.mittelpunkt.koordinate.longitude = 8.759;
req.feuerstellungsdaten.mittelpunkt.hoehe = 20;
@@ -526,7 +526,7 @@ void GenerateTelegrams::generateStellungsmeldungWS(AdlerJson::ExFeuerstellungWS
req.waffensystemdaten.status = ProjectDataManagement::L28_Status::Einsatzbereit;
req.waffensystemdaten.einheit.verein = QStringLiteral("AB7X");
req.waffensystemdaten.einheit.r = 6;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::F6;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6;
AdlerJson::Geschoss geschoss1;
AdlerJson::Geschoss geschoss2;
@@ -558,7 +558,7 @@ void GenerateTelegrams::generateStellungsmeldungWS_Gmlrs(AdlerJson::ExFeuerstell
req.waffensystemdaten.status = ProjectDataManagement::L28_Status::NichtEinsatzbereit;
req.waffensystemdaten.einheit.verein = QStringLiteral("AB13X");
req.waffensystemdaten.einheit.r = 6;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::F6;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6;
AdlerJson::Geschoss geschoss1;
AdlerJson::Geschoss geschoss2;
@@ -591,7 +591,7 @@ void GenerateTelegrams::generateStellungsmeldungWS_Dm72(AdlerJson::ExFeuerstellu
req.waffensystemdaten.status = ProjectDataManagement::L28_Status::NichtEinsatzbereit;
req.waffensystemdaten.einheit.verein = QStringLiteral("AB72X");
req.waffensystemdaten.einheit.r = 1;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::F1;
req.waffensystemdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F1;
AdlerJson::Geschoss geschoss1;
AdlerJson::Geschoss geschoss2;
@@ -622,7 +622,7 @@ void GenerateTelegrams::generateStellungsmeldungLP(AdlerJson::ExFeuerstellungLP
{
req.ladeplatzdaten.einheit.r = 5;
req.ladeplatzdaten.einheit.verein = QStringLiteral("verein StellungsmeldungLP");
req.ladeplatzdaten.einheit.oi = ProjectDataManagement::L19_Oi::F3;
req.ladeplatzdaten.einheit.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
req.ladeplatzdaten.koordinate.koordinate.latitude = 53.37791;
req.ladeplatzdaten.koordinate.koordinate.longitude = 8.759;
@@ -644,7 +644,7 @@ void GenerateTelegrams::generateStellungsmeldungLP(AdlerJson::ExFeuerstellungLP
void GenerateTelegrams::generateStellungswechsel(AdlerJson::ExStellungswechsel &req)
{
req.stellungswechseldaten.oi = ProjectDataManagement::L19_Oi::F3;
req.stellungswechseldaten.oi = ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3;
req.stellungswechseldaten.r = 5;
req.stellungswechseldaten.verein = QStringLiteral("verein ExStellungswechsel");
}
@@ -645,7 +645,7 @@ void JsonDispatcher::onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuer
const bool bRet = m_mainDispatcher->aesHandler()->getFtc()->effectClusterFireHaltRequest(req);
if (bRet && kategorie == ProjectDataManagement::L22_FireHaltCategory::E && !feuerhaltdaten.entladenSchuss)
if (bRet && kategorie == ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E && !feuerhaltdaten.entladenSchuss)
{
Feuerkampfdaten fkd;
fkd.feuerkampfReferenz = feuerhaltdaten.feuerkampfReferenz;
@@ -80,7 +80,7 @@ bool MainDispatcher::init()
void MainDispatcher::onWebsocketConnected(quint16 port)
{
ERROR_LOG(m_logger) << "ApAdler started, Domain Id: " << QString::number(port);
m_ddsHandler->pacemaker()->addPort(port, Core::PortType::WebSocketAdlerServer);
m_ddsHandler->pacemaker()->addPort(port, Core::CorePortType::WebSocketAdlerServer);
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
}
@@ -1439,17 +1439,17 @@ const QMap<QString, ProjectDataManagement::L7_Request> ForderungMap = {
const QMap<QString, ProjectDataManagement::L19_Oi> ortsIdMap = {
{QStringLiteral("Empty"), ProjectDataManagement::L19_Oi::Empty},
{QStringLiteral("F1"), ProjectDataManagement::L19_Oi::F1},
{QStringLiteral("F2"), ProjectDataManagement::L19_Oi::F2},
{QStringLiteral("F3"), ProjectDataManagement::L19_Oi::F3},
{QStringLiteral("F4"), ProjectDataManagement::L19_Oi::F4},
{QStringLiteral("F5"), ProjectDataManagement::L19_Oi::F5},
{QStringLiteral("F6"), ProjectDataManagement::L19_Oi::F6},
{QStringLiteral("F7"), ProjectDataManagement::L19_Oi::F7},
{QStringLiteral("F8"), ProjectDataManagement::L19_Oi::F8},
{QStringLiteral("F9"), ProjectDataManagement::L19_Oi::F9},
{QStringLiteral("L"), ProjectDataManagement::L19_Oi::L}
{QStringLiteral("Empty"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_Empty},
{QStringLiteral("F1"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F1},
{QStringLiteral("F2"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F2},
{QStringLiteral("F3"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F3},
{QStringLiteral("F4"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F4},
{QStringLiteral("F5"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F5},
{QStringLiteral("F6"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F6},
{QStringLiteral("F7"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F7},
{QStringLiteral("F8"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F8},
{QStringLiteral("F9"), ProjectDataManagement::L19_Oi::L19_Oi_L19_Oi_F9},
{QStringLiteral("L"), ProjectDataManagement::L19_Oi::L19_Oi_L}
};
@@ -1457,11 +1457,11 @@ const QMap<QString, ProjectDataManagement::L19_Oi> ortsIdMap = {
const QMap<QString, ProjectDataManagement::L22_FireHaltCategory> feuerHaltKategorieMap = {
{QStringLiteral("A"), ProjectDataManagement::L22_FireHaltCategory::A},
{QStringLiteral("R"), ProjectDataManagement::L22_FireHaltCategory::R},
{QStringLiteral("E"), ProjectDataManagement::L22_FireHaltCategory::E},
{QStringLiteral("C"), ProjectDataManagement::L22_FireHaltCategory::C},
{QStringLiteral("F"), ProjectDataManagement::L22_FireHaltCategory::F},
{QStringLiteral("A"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_A},
{QStringLiteral("R"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_R},
{QStringLiteral("E"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E},
{QStringLiteral("C"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_C},
{QStringLiteral("F"), ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_F},
};
@@ -138,7 +138,7 @@ bool MainHandler::init(int domainId, int exerciseId)
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
return false;
}
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}"));
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::CorePortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}"));
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful.";
@@ -101,7 +101,7 @@ ProjectDataManagement::ChargeType PdmHandler::chargeTypeFromId(int chargeTypeId)
ProjectDataManagement::GearClass PdmHandler::gearClassFromChargeTypeId(int chargeTypeId)
{
if (chargeTypeId <= 0)
return ProjectDataManagement::GearClass::Unknown;
return ProjectDataManagement::GearClass::GearClass_Unknown;
initializePdm();
@@ -113,7 +113,7 @@ ProjectDataManagement::GearClass PdmHandler::gearClassFromChargeTypeId(int charg
return gearType.gearClassId();
}
}
return ProjectDataManagement::GearClass::Unknown;
return ProjectDataManagement::GearClass::GearClass_Unknown;
}
ProjectDataManagement::RadioGroup PdmHandler::radioGroup(int radioGroupId)
@@ -250,7 +250,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
{
DEBUG_LOG(m_logger) << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime()
<< " request.chargeTypeId=" << request.chargeTypeId()
<< " request.eventType()=" << request.eventType()
<< " request.pdmEventType()=" << request.pdmEventType()
<< " request.aesId()=" << request.aesId()
<< " aesTypeFromId=" << m_mainHandler->aesHandler()->aesTypeFromId(request.aesId());
@@ -283,7 +283,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) && (ct.legacyId() > 0))
if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::HitBuilding) && (ct.legacyId() > 0))
{
data.chargeTasCodeDirect = 201;
data.chargeTasCodeIndirect = 201;
@@ -309,14 +309,14 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if ((request.eventType() == ProjectDataManagement::EventType::LeaveHazardDistance) ||
(request.eventType() == ProjectDataManagement::EventType::EnterHazardDistance))
if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::LeaveHazardDistance) ||
(request.pdmEventType() == ProjectDataManagement::PdmEventType::EnterHazardDistance))
{
INFO_LOG(m_logger) << "HarzardArea: " << request.effectTime();
data.reserve1 = request.mineId();
data.aesType = TetraIcd::AreaEffectSimulationType::DangerZoneExplosion;
}
else if (request.eventType() == ProjectDataManagement::EventType::AirSupport)
else if (request.pdmEventType() == ProjectDataManagement::PdmEventType::AirSupport)
{
data.aesType = TetraIcd::AreaEffectSimulationType::AirSupport;
}
@@ -333,12 +333,12 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId(),0,0}))
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
else if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) ||
(request.eventType() == ProjectDataManagement::EventType::HitEffectSimulation)
else if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::HitBuilding) ||
(request.pdmEventType() == ProjectDataManagement::PdmEventType::HitEffectSimulation)
)
{
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.eventType()
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.pdmEventType()
<< " equipmentNumber=" << request.equipmentNumber()
<< " originatorEquipmentNumber=" << data.originatorEquipmentNumber
<< " chargeType=" << ct.id()
@@ -254,8 +254,8 @@ void SendToDds::rxData(const TetraIcd::StateChangeDirect &inData)
if (gearClass == ProjectDataManagement::GearClass::MineSingle ||
gearClass == ProjectDataManagement::GearClass::MineArea)
if (gearClass == ProjectDataManagement::GearClass::GearClass_MineSingle ||
gearClass == ProjectDataManagement::GearClass::GearClass_MineArea)
{
TetraIcd::MineTriggered mt;
mt.header.timeStamp = inData.header.timeStamp;
@@ -935,22 +935,22 @@ void SendToDds::rxData(const TetraIcd::UAVRadioLinkConnectionStatus &inData)
switch (inData.uavConnectionState)
{
case TetraIcd::UAVRadioLinkConnectionStatusType::Connected:
outData.connectionStatus(ProjectDataManagement::UasState::On);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_On);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Disconnected:
outData.connectionStatus(ProjectDataManagement::UasState::Off);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Off);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Connecting:
outData.connectionStatus(ProjectDataManagement::UasState::Init);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Init);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Diconnecting:
outData.connectionStatus(ProjectDataManagement::UasState::Shutdown);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Shutdown);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Error:
outData.connectionStatus(ProjectDataManagement::UasState::Undefined);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Undefined);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Undefined:
outData.connectionStatus(ProjectDataManagement::UasState::Undefined);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Undefined);
break;
}
@@ -988,37 +988,37 @@ void SendToDds::rxData(const TetraIcd::UAVStatus &inData)
switch (inData.uavState)
{
case TetraIcd::UAVState::On:
outData.uasState(ProjectDataManagement::UasState::On);
outData.uasState(ProjectDataManagement::UasState::UasState_On);
break;
case TetraIcd::UAVState::Off:
outData.uasState(ProjectDataManagement::UasState::Off);
outData.uasState(ProjectDataManagement::UasState::UasState_Off);
break;
case TetraIcd::UAVState::Init:
outData.uasState(ProjectDataManagement::UasState::Init);
outData.uasState(ProjectDataManagement::UasState::UasState_Init);
break;
case TetraIcd::UAVState::Shutdown:
outData.uasState(ProjectDataManagement::UasState::Shutdown);
outData.uasState(ProjectDataManagement::UasState::UasState_Shutdown);
break;
case TetraIcd::UAVState::Calibrating:
outData.uasState(ProjectDataManagement::UasState::Calibrating);
outData.uasState(ProjectDataManagement::UasState::UasState_Calibrating);
break;
case TetraIcd::UAVState::Manual:
outData.uasState(ProjectDataManagement::UasState::Manual);
outData.uasState(ProjectDataManagement::UasState::UasState_Manual);
break;
case TetraIcd::UAVState::Maintenance:
outData.uasState(ProjectDataManagement::UasState::Maintenance);
outData.uasState(ProjectDataManagement::UasState::UasState_Maintenance);
break;
case TetraIcd::UAVState::Standby:
outData.uasState(ProjectDataManagement::UasState::Standby);
outData.uasState(ProjectDataManagement::UasState::UasState_Standby);
break;
case TetraIcd::UAVState::Normal:
outData.uasState(ProjectDataManagement::UasState::Normal);
outData.uasState(ProjectDataManagement::UasState::UasState_Normal);
break;
case TetraIcd::UAVState::Auto:
outData.uasState(ProjectDataManagement::UasState::Auto);
outData.uasState(ProjectDataManagement::UasState::UasState_Auto);
break;
case TetraIcd::UAVState::Undefined:
outData.uasState(ProjectDataManagement::UasState::Undefined);
outData.uasState(ProjectDataManagement::UasState::UasState_Undefined);
break;
}
@@ -695,7 +695,7 @@
<column name="remainEffectPercent" idlType="long"/>
<column name="position" idlType="TabPosition"/>
<column name="effectTime" idlType="long long"/>
<column name="eventType" idlType="ProjectDataManagement::EventType"/>
<column name="pdmEventType" idlType="ProjectDataManagement::PdmEventType"/>
<column name="partyId" idlType="long"/>
<column name="mineId" idlType="long"/>
</topicType>
@@ -885,7 +885,7 @@
<attribute key="withHelmetWithVest" value="3"/>
</enumeration>
<enumeration name="FaultPositionHandling">
<attribute key="NoChange" value="0"/>
<attribute key="FaultPositionHandling_NoChange" value="0"/>
<attribute key="NoPositions" value="1"/>
<attribute key="InvalidPositionValue" value="2"/>
<attribute key="EstimatedPosition" value="3"/>
@@ -896,24 +896,24 @@
<attribute key="FirSpzMarder" value="2"/>
</enumeration>
<enumeration name="L19_Oi">
<attribute key="Empty" value="1"/>
<attribute key="F1" value="2"/>
<attribute key="F2" value="3"/>
<attribute key="F3" value="4"/>
<attribute key="F4" value="5"/>
<attribute key="F5" value="6"/>
<attribute key="F6" value="7"/>
<attribute key="F7" value="8"/>
<attribute key="F8" value="9"/>
<attribute key="F9" value="10"/>
<attribute key="L" value="11"/>
<attribute key="L19_Oi_Empty" value="1"/>
<attribute key="L19_Oi_F1" value="2"/>
<attribute key="L19_Oi_F2" value="3"/>
<attribute key="L19_Oi_F3" value="4"/>
<attribute key="L19_Oi_F4" value="5"/>
<attribute key="L19_Oi_F5" value="6"/>
<attribute key="L19_Oi_F6" value="7"/>
<attribute key="L19_Oi_F7" value="8"/>
<attribute key="L19_Oi_F8" value="9"/>
<attribute key="L19_Oi_F9" value="10"/>
<attribute key="L19_Oi_L" value="11"/>
</enumeration>
<enumeration name="L22_FireHaltCategory">
<attribute key="A" value="1"/>
<attribute key="R" value="2"/>
<attribute key="E" value="3"/>
<attribute key="C" value="4"/>
<attribute key="F" value="5"/>
<attribute key="L22_FireHaltCategory_A" value="1"/>
<attribute key="L22_FireHaltCategory_R" value="2"/>
<attribute key="L22_FireHaltCategory_E" value="3"/>
<attribute key="L22_FireHaltCategory_C" value="4"/>
<attribute key="L22_FireHaltCategory_F" value="5"/>
</enumeration>
<enumeration name="L25_KindGuidingLine">
<attribute key="FFA" value="1"/>
@@ -1082,7 +1082,7 @@
<attribute key="MinelayerThrower" value="2"/>
</enumeration>
<enumeration name="OpticalCode">
<attribute key="NoChange" value="0"/>
<attribute key="OpticalCode_NoChange" value="0"/>
<attribute key="Osag10" value="1"/>
<attribute key="Osag20Basic" value="2"/>
<attribute key="SisoStandard" value="3"/>
@@ -1110,7 +1110,7 @@
<attribute key="MRF" value="7"/>
</enumeration>
<enumeration name="SwitichingPositionIntervall">
<attribute key="NoChange" value="0"/>
<attribute key="SwitichingPositionIntervall_NoChange" value="0"/>
<attribute key="On" value="1"/>
<attribute key="Off" value="2"/>
</enumeration>
@@ -733,9 +733,9 @@ bool get(const QJsonObject &obj, const QString &key, ParticipantModeBase::Intern
get(obj, key, iVal, bOptional);
switch (static_cast<ParticipantModeBase::InternationalMode>(iVal))
{
case ParticipantModeBase::InternationalMode::NoChange:
case ParticipantModeBase::InternationalMode::On:
case ParticipantModeBase::InternationalMode::Off:
case ParticipantModeBase::InternationalMode::InternationalMode_NoChange:
case ParticipantModeBase::InternationalMode::InternationalMode_On:
case ParticipantModeBase::InternationalMode::InternationalMode_Off:
val = static_cast<ParticipantModeBase::InternationalMode>(iVal);
return true;
}
@@ -1863,7 +1863,7 @@ struct ParticipantModeBase
NoChange = 0,
Off = 1,
On = 2
} internationalMode = InternationalMode::NoChange;
} internationalMode = InternationalMode::InternationalMode_NoChange;
enum class ABCProtectionMode
{