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
+2
-2
@@ -253,14 +253,14 @@ void HandlerOcAesData::handleIedPositions(const QByteArray &data, size_t pos)
|
||||
LtsUtils::get2Byte(data, pos, eqNumber);
|
||||
const GuezIedManagement::Ied &ied = ieds.value(IedEqNumberToDdsId.value(eqNumber));
|
||||
def.iedId = eqNumber;
|
||||
def.type = ied.type;
|
||||
def.type = static_cast<int32_t>(ied.type);
|
||||
def.tautWireTrigger = ied.tautWireTrigger;
|
||||
def.lightBarrierTrigger = ied.lightBarrierTrigger;
|
||||
def.switchTrigger = ied.switchTrigger;
|
||||
def.remoteTrigger = ied.remoteTrigger;
|
||||
def.explosiveForce = ied.explosiveForce;
|
||||
def.partyId = ied.partyId;
|
||||
def.tacticalState = ied.tacticalState;
|
||||
def.tacticalState = static_cast<int32_t>(ied.tacticalState);
|
||||
LtsUtils::get3Byte(data, pos, x);
|
||||
LtsUtils::get3Byte(data, pos, y);
|
||||
def.position = relativeFromGeoPosition(x, y);
|
||||
|
||||
@@ -328,7 +328,7 @@ void HandlerOcData::onOwnPosition(const TrainingAreaBaseOC::OwnPosition &data, D
|
||||
|
||||
TrainingAreaBase::EquipmentPosition out;
|
||||
out.sampleTime = data.timeStamp;
|
||||
out.position.position(Core::GeoPosition(data.position.lon, data.position.lat, 0));
|
||||
out.position.position = Core::GeoPosition(data.position.lon, data.position.lat, 0);
|
||||
if (data.moutObjectId.is_set())
|
||||
out.position.moutObjectId.set(data.moutObjectId.get());
|
||||
if (data.moutRoomId.is_set())
|
||||
|
||||
+3
-3
@@ -429,7 +429,7 @@ bool HandlerOcSituationData::getVBG(const QByteArray &buf, size_t &pos, Training
|
||||
// vulnerabilityState, vulnerabilityBits, originatorParty, sampleTime
|
||||
uint64_t tmp;
|
||||
bRet &= LtsUtils::get1Byte(buf, pos, tmp);
|
||||
equipmentState.vulnerabilityState = ProjectDataManagement::VulnerabilityState::inner_enum(tmp);
|
||||
equipmentState.vulnerabilityState = static_cast<ProjectDataManagement::VulnerabilityState>(tmp);
|
||||
bRet &= LtsUtils::get4Byte(buf, pos, tmp);
|
||||
equipmentState.vulnerabilityKindId = tmp;
|
||||
bRet &= LtsUtils::get2Byte(buf, pos, tmp);
|
||||
@@ -459,7 +459,7 @@ bool HandlerOcSituationData::getVBG(const QByteArray &buf, size_t &pos, Training
|
||||
{
|
||||
int vit = (vitRest & 0x0F) * 10;
|
||||
equipmentState.vitality = vit;
|
||||
TrainingAreaBase::SanitationResult result = static_cast<TrainingAreaBase::SanitationResult_def::type>(vitRest >> 4);
|
||||
TrainingAreaBase::SanitationResult result = static_cast<TrainingAreaBase::SanitationResult>(vitRest >> 4);
|
||||
sanitation.sanitationResult = result;
|
||||
sanitation.proceduresTaken = 1;
|
||||
sanitation.qualification = TrainingAreaBase::Qualification::SANPers;
|
||||
@@ -468,7 +468,7 @@ bool HandlerOcSituationData::getVBG(const QByteArray &buf, size_t &pos, Training
|
||||
qint8 originator = 0;
|
||||
bRet &= LtsUtils::get1Byte(buf, pos, originator);
|
||||
if (bRet)
|
||||
equipmentState.originatorType = ProjectDataManagement::StateChangeOriginator::inner_enum(originator);
|
||||
equipmentState.originatorType = static_cast<ProjectDataManagement::StateChangeOriginator>(originator);
|
||||
|
||||
return bRet;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user