some more improvements
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit

This commit is contained in:
Robin Müller 2023-11-15 11:46:08 +01:00
parent 14813441dc
commit 03a6a06e48
Signed by: muellerr
GPG Key ID: A649FB78196E3849

View File

@ -526,8 +526,12 @@ void FreshSupvHandler::handleTransitionToOff() {
ReturnValue_t FreshSupvHandler::sendCommand(DeviceCommandId_t commandId, TcBase& tc,
bool replyExpected, uint32_t cmdCountdownMs) {
if (supv::DEBUG_PLOC_SUPV) {
sif::debug << "PLOC SUPV: SEND PACKET Size " << tc.getFullPacketLen() << " Module APID "
<< (int)tc.getModuleApid() << " Service ID " << (int)tc.getServiceId() << std::endl;
if (not(supv::REDUCE_NORMAL_MODE_PRINTOUT and mode == MODE_NORMAL and
commandId == supv::GET_HK_REPORT)) {
sif::debug << "PLOC SUPV: SEND PACKET Size " << tc.getFullPacketLen() << " Module APID "
<< (int)tc.getModuleApid() << " Service ID " << (int)tc.getServiceId()
<< std::endl;
}
}
ActiveCmdInfo info(commandId, cmdCountdownMs);
auto activeCmdIter =
@ -924,7 +928,7 @@ void FreshSupvHandler::handlePacketPrint() {
<< std::endl;
}
}
if (supv::REDUCE_NORMAL_MODE_PRINTOUT and
if (mode == MODE_NORMAL and supv::REDUCE_NORMAL_MODE_PRINTOUT and
ack.getRefModuleApid() == (uint8_t)supv::Apid::HK and
ack.getRefServiceId() == (uint8_t)supv::tc::HkId::GET_REPORT) {
return;
@ -965,6 +969,11 @@ void FreshSupvHandler::handlePacketPrint() {
return;
}
}
if (mode == MODE_NORMAL and supv::REDUCE_NORMAL_MODE_PRINTOUT and
tmReader.getModuleApid() == supv::Apid::HK and
tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::HkId::REPORT)) {
return;
}
sif::debug << "PlocSupervisorHandler: RECV PACKET Size " << tmReader.getFullPacketLen()
<< " Module APID " << (int)tmReader.getModuleApid() << " Service ID "
<< (int)tmReader.getServiceId() << std::endl;