From ffc4a3456b263a2a4ceec3545c8d06633b619e8b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 17 Nov 2022 13:26:03 +0100 Subject: [PATCH] some better names --- .../devices/devicedefinitions/PlocSupervisorDefinitions.h | 2 +- linux/devices/ploc/PlocSupvUartMan.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h index d4ec1caa..c3223833 100644 --- a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h +++ b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h @@ -1339,7 +1339,7 @@ class VerificationReport { /** * @brief Gets the APID of command which caused the transmission of this verification report. */ - uint8_t getRefApid() const { return refApid; } + uint8_t getRefModuleApid() const { return refApid; } uint8_t getRefServiceId() const { return refServiceId; } diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/devices/ploc/PlocSupvUartMan.cpp index 2ec117c5..b3ac004c 100644 --- a/linux/devices/ploc/PlocSupvUartMan.cpp +++ b/linux/devices/ploc/PlocSupvUartMan.cpp @@ -626,14 +626,14 @@ int PlocSupvUartManager::handleAckReception(supv::TcBase& tc, uint8_t serviceId, triggerEvent(ACK_RECEPTION_FAILURE); return -1; } - if (ackReport.getRefApid() == tc.getApid() and + if (ackReport.getRefModuleApid() == tc.getModuleApid() and ackReport.getRefServiceId() == tc.getServiceId()) { if (serviceId == static_cast(supv::tm::TmtcId::ACK)) { return 1; } else if (serviceId == static_cast(supv::tm::TmtcId::NAK)) { ackReport.printStatusInformation(); triggerEvent(SUPV_ACK_FAILURE_REPORT, - buildApidServiceParam1(ackReport.getRefApid(), ackReport.getRefServiceId()), + buildApidServiceParam1(ackReport.getRefModuleApid(), ackReport.getRefServiceId()), ackReport.getStatusCode()); return -1; } @@ -657,14 +657,14 @@ int PlocSupvUartManager::handleExeAckReception(supv::TcBase& tc, uint8_t service triggerEvent(EXE_RECEPTION_FAILURE); return -1; } - if (exeReport.getRefApid() == tc.getApid() and + if (exeReport.getRefModuleApid() == tc.getApid() and exeReport.getRefServiceId() == tc.getServiceId()) { if (serviceId == static_cast(supv::tm::TmtcId::EXEC_ACK)) { return 1; } else if (serviceId == static_cast(supv::tm::TmtcId::EXEC_NAK)) { exeReport.printStatusInformation(); triggerEvent(SUPV_EXE_FAILURE_REPORT, - buildApidServiceParam1(exeReport.getRefApid(), exeReport.getRefServiceId()), + buildApidServiceParam1(exeReport.getRefModuleApid(), exeReport.getRefServiceId()), exeReport.getStatusCode()); return -1; }