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

resolve merge conflict
EIVE/eive-obsw/pipeline/pr-develop This commit looks good Details

This commit is contained in:
Robin Müller 2022-08-20 12:24:24 +02:00
parent 5aa0b3530a
commit f2190f8aa1
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -685,11 +685,7 @@ 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;