eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

important bugfix

Browse Source
This commit is contained in:
Robin Müller 2023-11-28 15:31:37 +01:00
parent fa21790003
commit 112fa2b8ff
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux/payload/FreshSupvHandler.cpp
View File

@ -90,6 +90,7 @@ void FreshSupvHandler::performDeviceOperation(uint8_t opCode) {
} else if (opCode == OpCode::PARSE_TM) { } else if (opCode == OpCode::PARSE_TM) {
for (auto& activeCmd : activeActionCmds) { for (auto& activeCmd : activeActionCmds) {
if (activeCmd.second.isPending and activeCmd.second.cmdCountdown.hasTimedOut()) { if (activeCmd.second.isPending and activeCmd.second.cmdCountdown.hasTimedOut()) {
sif::warning << "hello im stupid" << std::endl;
if (activeCmd.second.commandedBy != MessageQueueIF::NO_QUEUE) { if (activeCmd.second.commandedBy != MessageQueueIF::NO_QUEUE) {
actionHelper.finish(false, activeCmd.second.commandedBy, activeCmd.first, actionHelper.finish(false, activeCmd.second.commandedBy, activeCmd.first,
DeviceHandlerIF::TIMEOUT); DeviceHandlerIF::TIMEOUT);
@ -567,6 +568,7 @@ ReturnValue_t FreshSupvHandler::sendCommand(DeviceCommandId_t commandId, TcBase&
info.isPending = true; info.isPending = true;
info.replyPacketExpected = replyExpected; info.replyPacketExpected = replyExpected;
info.commandedBy = commandedByCached; info.commandedBy = commandedByCached;
info.cmdCountdown.resetTimer();
activeActionCmds.emplace(buildActiveCmdKey(tc.getModuleApid(), tc.getServiceId()), info); activeActionCmds.emplace(buildActiveCmdKey(tc.getModuleApid(), tc.getServiceId()), info);
} else { } else {
if (activeCmdIter->second.isPending) { if (activeCmdIter->second.isPending) {
@ -901,6 +903,7 @@ ReturnValue_t FreshSupvHandler::parseTmPackets() {
} }
case (Apid::ADC_MON): { case (Apid::ADC_MON): {
if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::AdcMonId::ADC_REPORT)) { if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::AdcMonId::ADC_REPORT)) {
sif::debug << "recv ADC report" << std::endl;
genericHandleTm("ADC", receivedData, adcReport, supv::Apid::ADC_MON, genericHandleTm("ADC", receivedData, adcReport, supv::Apid::ADC_MON,
static_cast<uint8_t>(supv::tc::AdcMonId::REQUEST_ADC_SAMPLE)); static_cast<uint8_t>(supv::tc::AdcMonId::REQUEST_ADC_SAMPLE));
continue; continue;
@ -1295,8 +1298,7 @@ void FreshSupvHandler::handleExecutionFailureReport(ActiveCmdInfo& info, Executi
} }
void FreshSupvHandler::confirmReplyPacketReceived(supv::Apid apid, uint8_t serviceId) { void FreshSupvHandler::confirmReplyPacketReceived(supv::Apid apid, uint8_t serviceId) {
auto infoIter = activeActionCmds.find( auto infoIter = activeActionCmds.find(buildActiveCmdKey(apid, serviceId));
buildActiveCmdKey(supv::Apid::HK, static_cast<uint8_t>(supv::tc::HkId::GET_REPORT)));
if (infoIter != activeActionCmds.end()) { if (infoIter != activeActionCmds.end()) {
ActiveCmdInfo& info = infoIter->second; ActiveCmdInfo& info = infoIter->second;
info.replyPacketReceived = true; info.replyPacketReceived = true;