eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests Releases 118 Wiki Activity

TMTC Refactoring #276

Merged
muellerr merged 64 commits from mueller/tmtc-stack-refactoring into develop 2022-08-24 16:52:23 +02:00
Conversation 2 Commits 64 Files Changed 51 +5 -1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f9061d5494 - Show all commits

4
linux/devices/ploc/PlocMPSoCHandler.cpp
View File

@ -685,7 +685,11 @@ ReturnValue_t PlocMPSoCHandler::handleCamCmdRpt(const uint8_t* data) {
reinterpret_cast<const char*>(dataFieldPtr),
tmCamCmdRpt.rememberSpacePacketSize - mpsoc::SPACE_PACKET_HEADER_SIZE - sizeof(uint16_t) - 3);
#if OBSW_DEBUG_PLOC_MPSOC == 1
<<<<<<< HEAD
uint8_t ackValue = *(packetReader.getPacketData() + packetReader.getPacketDataLen() - 2);
=======
uint8_t ackValue = *(packetReader.getFullData() + packetReader.getFullPacketLen() - 2);
>>>>>>> 9eb21079 (fix)
sif::info << "PlocMPSoCHandler: CamCmdRpt message: " << camCmdRptMsg << std::endl;
sif::info << "PlocMPSoCHandler: CamCmdRpt Ack value: 0x" << std::hex
<< static_cast<unsigned int>(ackValue) << std::endl;

2
tmtc

@ -1 +1 @@
Subproject commit 00e99292cc158a347f485507537fa5b63262243b
Subproject commit 1b39bb2ad2421db89487b4ea352edbd4d420b9b1