eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 4 Pull Requests 2 Releases 119 Wiki Activity

PLOC SUPV Update to newer firmware #316

Merged
muellerr merged 99 commits from mueller/tas_ploc_supv_update into develop 2022-11-18 14:27:13 +01:00
Conversation 0 Commits 99 Files Changed 58 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ffc4a3456b - Show all commits

2
linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
View File

@ -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; }

8
linux/devices/ploc/PlocSupvUartMan.cpp
View File

@ -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<uint8_t>(supv::tm::TmtcId::ACK)) {
return 1;
} else if (serviceId == static_cast<uint8_t>(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<uint8_t>(supv::tm::TmtcId::EXEC_ACK)) {
return 1;
} else if (serviceId == static_cast<uint8_t>(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;
}