Complete Qt6/rtiddsgen migration of residual Lts service sources
This commit is contained in:
86 files changed
+1235
-1128
No files matched your search
+55
-55
@@ -41,7 +41,7 @@ HandlerOperatingCondition::~HandlerOperatingCondition()
|
||||
//=============================================================================
|
||||
bool HandlerOperatingCondition::init()
|
||||
{
|
||||
m_operatingCondition.readiness(m_isOperational);
|
||||
m_operatingCondition.readiness = m_isOperational;
|
||||
connect(m_mainHandler->handlerVehicle().get(), &HandlerVehicle::vehicleBattery,
|
||||
this, &HandlerOperatingCondition::onVehicleBattery);
|
||||
connect(m_mainHandler->handlerVehicle().get(), &HandlerVehicle::vehicleSmokeCardridgesFireStatus,
|
||||
@@ -75,7 +75,7 @@ bool HandlerOperatingCondition::init()
|
||||
|
||||
void HandlerOperatingCondition::onVehicleBattery(double battery)
|
||||
{
|
||||
m_operatingCondition.batteryVoltage(battery);
|
||||
m_operatingCondition.batteryVoltage = battery;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data Battery to dds";
|
||||
}
|
||||
@@ -96,8 +96,8 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRid
|
||||
int count = numberOfSmokingCardridgesNew - numberOfSmokingCardridgesOld;
|
||||
if (count > 0)
|
||||
{
|
||||
m_operatingCondition.ammunitionAvailable(std::max(0, m_operatingCondition.ammunitionAvailable() - count));
|
||||
m_operatingCondition.ammunitionMagazine(std::max(0, m_operatingCondition.ammunitionMagazine() - count));
|
||||
m_operatingCondition.ammunitionAvailable = std::max(0, m_operatingCondition.ammunitionAvailable - count);
|
||||
m_operatingCondition.ammunitionMagazine = std::max(0, m_operatingCondition.ammunitionMagazine - count);
|
||||
//we are burning now
|
||||
ConvertToTab::VehicleStatus_t vehicleStatus;
|
||||
getVehicleStatus(vehicleStatus);
|
||||
@@ -106,15 +106,15 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRid
|
||||
} // if
|
||||
|
||||
if (fireStatus.cardrige1)
|
||||
m_operatingCondition.smokeCartridge1(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge1 = StatusSmokeCartridge_e::Smoking;
|
||||
if (fireStatus.cardrige2)
|
||||
m_operatingCondition.smokeCartridge2(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge2 = StatusSmokeCartridge_e::Smoking;
|
||||
if (fireStatus.cardrige3)
|
||||
m_operatingCondition.smokeCartridge3(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge3 = StatusSmokeCartridge_e::Smoking;
|
||||
if (fireStatus.cardrige4)
|
||||
m_operatingCondition.smokeCartridge4(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge4 = StatusSmokeCartridge_e::Smoking;
|
||||
if (fireStatus.cardrige5)
|
||||
m_operatingCondition.smokeCartridge5(StatusSmokeCartridge_e::Smoking);
|
||||
m_operatingCondition.smokeCartridge5 = StatusSmokeCartridge_e::Smoking;
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (Somoking) to dds";
|
||||
@@ -124,15 +124,15 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges
|
||||
{
|
||||
m_readyCardridges = fireStatus;
|
||||
if (!m_smokingCardridges.cardrige1)
|
||||
m_operatingCondition.smokeCartridge1(m_readyCardridges.cardrige1 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge1 = m_readyCardridges.cardrige1 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
if (!m_smokingCardridges.cardrige2)
|
||||
m_operatingCondition.smokeCartridge2(m_readyCardridges.cardrige2 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge2 = m_readyCardridges.cardrige2 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
if (!m_smokingCardridges.cardrige3)
|
||||
m_operatingCondition.smokeCartridge3(m_readyCardridges.cardrige3 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge3 = m_readyCardridges.cardrige3 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
if (!m_smokingCardridges.cardrige4)
|
||||
m_operatingCondition.smokeCartridge4(m_readyCardridges.cardrige4 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge4 = m_readyCardridges.cardrige4 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
if (!m_smokingCardridges.cardrige5)
|
||||
m_operatingCondition.smokeCartridge5(m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady);
|
||||
m_operatingCondition.smokeCartridge5 = m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady;
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data to dds";
|
||||
@@ -140,21 +140,21 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges
|
||||
|
||||
void HandlerOperatingCondition::onVehicleFireUnits(const CardRidges &fireStatus)
|
||||
{
|
||||
m_operatingCondition.firingUnitReadyFwdLh(fireStatus.cardrige1);
|
||||
m_operatingCondition.firingUnitReadyFwdRh(fireStatus.cardrige2);
|
||||
m_operatingCondition.firingUnitReadyAftRh(fireStatus.cardrige3);
|
||||
m_operatingCondition.firingUnitReadyAftLh(fireStatus.cardrige4);
|
||||
m_operatingCondition.firingUnitReadyFwdLh = fireStatus.cardrige1;
|
||||
m_operatingCondition.firingUnitReadyFwdRh = fireStatus.cardrige2;
|
||||
m_operatingCondition.firingUnitReadyAftRh = fireStatus.cardrige3;
|
||||
m_operatingCondition.firingUnitReadyAftLh = fireStatus.cardrige4;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (fireStatus) to dds";
|
||||
}
|
||||
|
||||
void HandlerOperatingCondition::onVehicleErrorStatus(const CardRidges &errorStatus)
|
||||
{
|
||||
m_operatingCondition.errorSmoke(errorStatus.cardrige1);
|
||||
m_operatingCondition.errorFireUnit(errorStatus.cardrige2);
|
||||
m_operatingCondition.errorPanel(errorStatus.cardrige3);
|
||||
m_operatingCondition.errorEquipment(errorStatus.cardrige4);
|
||||
m_operatingCondition.errorGeneral(errorStatus.cardrige5);
|
||||
m_operatingCondition.errorSmoke = errorStatus.cardrige1;
|
||||
m_operatingCondition.errorFireUnit = errorStatus.cardrige2;
|
||||
m_operatingCondition.errorPanel = errorStatus.cardrige3;
|
||||
m_operatingCondition.errorEquipment = errorStatus.cardrige4;
|
||||
m_operatingCondition.errorGeneral = errorStatus.cardrige5;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (errorStatus) to dds";
|
||||
|
||||
@@ -171,40 +171,40 @@ void HandlerOperatingCondition::onOperationalStatusTimeout()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Operational status timeout. Setting operational status to: not operational.";
|
||||
m_isOperational = false;
|
||||
m_operatingCondition.readiness(m_isOperational);
|
||||
m_operatingCondition.readiness = m_isOperational;
|
||||
|
||||
sendStatus();
|
||||
}
|
||||
|
||||
bool HandlerOperatingCondition::isErrorDmf()
|
||||
{
|
||||
return (m_operatingCondition.errorSmoke() ||
|
||||
m_operatingCondition.errorFireUnit() ||
|
||||
m_operatingCondition.errorPanel() ||
|
||||
m_operatingCondition.errorEquipment() ||
|
||||
m_operatingCondition.errorGeneral()
|
||||
return (m_operatingCondition.errorSmoke ||
|
||||
m_operatingCondition.errorFireUnit ||
|
||||
m_operatingCondition.errorPanel ||
|
||||
m_operatingCondition.errorEquipment ||
|
||||
m_operatingCondition.errorGeneral
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
void HandlerOperatingCondition::onConnectionToSerial()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Connected to Serial: send ammunition Magazine to Control Unit Count: " << m_operatingCondition.ammunitionMagazine();
|
||||
m_mainHandler->handlerVehicle()->setAmmunitionParameter(m_operatingCondition.ammunitionMagazine());
|
||||
DEBUG_LOG(m_logger) << "Connected to Serial: send ammunition Magazine to Control Unit Count: " << m_operatingCondition.ammunitionMagazine;
|
||||
m_mainHandler->handlerVehicle()->setAmmunitionParameter(m_operatingCondition.ammunitionMagazine);
|
||||
}
|
||||
|
||||
void HandlerOperatingCondition::onVehicleType(const EffectShowManagement::Feature_e &type)
|
||||
{
|
||||
m_operatingCondition.vehicleFeature(type);
|
||||
m_operatingCondition.vehicleFeature = type;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (vehicle type) to dds";
|
||||
}
|
||||
|
||||
void HandlerOperatingCondition::onSafetyStatus(const SafetyStatus &status)
|
||||
{
|
||||
m_operatingCondition.temperatureWarning(status.temperaturWarning);
|
||||
m_operatingCondition.loadingBoardWall(status.loadingBoardWall);
|
||||
m_operatingCondition.emergencyStop(status.emergencyStop);
|
||||
m_operatingCondition.temperatureWarning = status.temperaturWarning;
|
||||
m_operatingCondition.loadingBoardWall = status.loadingBoardWall;
|
||||
m_operatingCondition.emergencyStop = status.emergencyStop;
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (SafetyStatus) to dds";
|
||||
@@ -213,7 +213,7 @@ void HandlerOperatingCondition::onSafetyStatus(const SafetyStatus &status)
|
||||
void HandlerOperatingCondition::onVehicleRoundCount(int loadedRounds)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got RoundCount Reply from Unit " << loadedRounds;
|
||||
m_operatingCondition.ammunitionMagazine(loadedRounds);
|
||||
m_operatingCondition.ammunitionMagazine = loadedRounds;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (ammunition magazine) to dds";
|
||||
}
|
||||
@@ -221,12 +221,12 @@ void HandlerOperatingCondition::onVehicleRoundCount(int loadedRounds)
|
||||
void HandlerOperatingCondition::onVolleyRounds(int usedRounds)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got used rounds " << usedRounds;
|
||||
m_operatingCondition.ammunitionMagazine(m_operatingCondition.ammunitionMagazine() - usedRounds);
|
||||
if (m_operatingCondition.ammunitionMagazine() < 0)
|
||||
m_operatingCondition.ammunitionMagazine(0);
|
||||
m_operatingCondition.ammunitionAvailable(m_operatingCondition.ammunitionAvailable() - usedRounds);
|
||||
if (m_operatingCondition.ammunitionAvailable() < 0)
|
||||
m_operatingCondition.ammunitionAvailable(0);
|
||||
m_operatingCondition.ammunitionMagazine = m_operatingCondition.ammunitionMagazine - usedRounds;
|
||||
if (m_operatingCondition.ammunitionMagazine < 0)
|
||||
m_operatingCondition.ammunitionMagazine = 0;
|
||||
m_operatingCondition.ammunitionAvailable = m_operatingCondition.ammunitionAvailable - usedRounds;
|
||||
if (m_operatingCondition.ammunitionAvailable < 0)
|
||||
m_operatingCondition.ammunitionAvailable = 0;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (ammunition magazine used) to dds";
|
||||
}
|
||||
@@ -240,12 +240,12 @@ void HandlerOperatingCondition::sendStatus()
|
||||
|
||||
void HandlerOperatingCondition::getVehicleStatus(ConvertToTab::VehicleStatus_t &vehicleStatus)
|
||||
{
|
||||
vehicleStatus.ammunitionAvailable = m_operatingCondition.ammunitionAvailable();
|
||||
vehicleStatus.ammunitionMagazine = m_operatingCondition.ammunitionMagazine();
|
||||
vehicleStatus.feature = static_cast<int>(m_operatingCondition.vehicleFeature().underlying());
|
||||
vehicleStatus.operational = (!m_operatingCondition.errorGeneral() && m_isOperational);
|
||||
vehicleStatus.ammunitionAvailable = m_operatingCondition.ammunitionAvailable;
|
||||
vehicleStatus.ammunitionMagazine = m_operatingCondition.ammunitionMagazine;
|
||||
vehicleStatus.feature = static_cast<int>(m_operatingCondition.vehicleFeature);
|
||||
vehicleStatus.operational = (!m_operatingCondition.errorGeneral && m_isOperational);
|
||||
vehicleStatus.magazineFail = m_oldErrorState;
|
||||
vehicleStatus.controlComputerFail = m_operatingCondition.errorPanel();
|
||||
vehicleStatus.controlComputerFail = m_operatingCondition.errorPanel;
|
||||
}
|
||||
|
||||
|
||||
@@ -256,20 +256,20 @@ void HandlerOperatingCondition::onSendAmmunitionRequest(const rti::core::SampleI
|
||||
DEBUG_LOG(m_logger) << "onSendAmmunitionRequest";
|
||||
//take available ammo and send excon
|
||||
//then wait for reply from unit
|
||||
m_operatingCondition.ammunitionAvailable(request.ammunitionAvailable());
|
||||
m_operatingCondition.ammunitionAvailable = request.ammunitionAvailable;
|
||||
|
||||
m_mainHandler->dds()->fts()->sendAmmunitionReply(cookie, Core::FunctionReplyObject());
|
||||
|
||||
// provision of the control computer with the equipped shots
|
||||
m_mainHandler->handlerVehicle()->setAmmunitionParameter(request.ammunitionMagazine());
|
||||
m_mainHandler->handlerVehicle()->setAmmunitionParameter(request.ammunitionMagazine);
|
||||
|
||||
// Sending of telegram: DMF-Einsatzbereitschafts-Status to the operating application
|
||||
ConvertToTab::VehicleStatus_t vehicleStatus;
|
||||
getVehicleStatus(vehicleStatus);
|
||||
if (vehicleStatus.feature == EffectShowManagement::Feature_e::Smoke)
|
||||
if (vehicleStatus.feature == static_cast<int>(EffectShowManagement::Feature_e::Smoke))
|
||||
{
|
||||
//as smoke did not answer
|
||||
vehicleStatus.ammunitionMagazine = request.ammunitionMagazine();
|
||||
vehicleStatus.ammunitionMagazine = request.ammunitionMagazine;
|
||||
}
|
||||
m_mainHandler->handlerTabData()->vehicleStatus(vehicleStatus);
|
||||
}
|
||||
@@ -277,9 +277,9 @@ void HandlerOperatingCondition::onSendAmmunitionRequest(const rti::core::SampleI
|
||||
void HandlerOperatingCondition::onSendSafetyRevokeRequest(const rti::core::SampleIdentity &cookie,
|
||||
const SendSafetyRevokeRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onSendSafetyRevokeRequest with " << request.revoke();
|
||||
DEBUG_LOG(m_logger) << "onSendSafetyRevokeRequest with " << request.revoke;
|
||||
m_mainHandler->dds()->fts()->sendSafetyRevokeReply(cookie, Core::FunctionReplyObject());
|
||||
if (request.revoke())
|
||||
if (request.revoke)
|
||||
{
|
||||
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::StopTimer);
|
||||
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SICHERHEIT_WIDERRUFEN);
|
||||
@@ -293,7 +293,7 @@ void HandlerOperatingCondition::onSendReadinessRequest(const rti::core::SampleId
|
||||
DEBUG_LOG(m_logger) << "onSendReadinessRequest";
|
||||
//Confirm or Revoke Readiness
|
||||
//send to EXCON
|
||||
m_isOperational = request.readiness();
|
||||
m_isOperational = request.readiness;
|
||||
m_mainHandler->dds()->fts()->sendReadinessReply(cookie, Core::FunctionReplyObject());
|
||||
|
||||
// Sending of telegram: DMF-Einsatzbereitschafts-Status to the operating application
|
||||
@@ -303,7 +303,7 @@ void HandlerOperatingCondition::onSendReadinessRequest(const rti::core::SampleId
|
||||
m_mainHandler->handlerTabData()->vehicleStatus(vehicleStatus);
|
||||
|
||||
//now change operating condition in hope that tetra worked
|
||||
m_operatingCondition.readiness(m_isOperational);
|
||||
m_operatingCondition.readiness = m_isOperational;
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition))
|
||||
ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data readiness) to dds";
|
||||
|
||||
|
||||
Reference in new issue
Block a user