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

MPSoC Handler Update #219

Merged
muellerr merged 7 commits from meier/plocMPSoC into develop 2022-04-21 16:36:03 +02:00
Conversation 0 Commits 7 Files Changed 8 +2 -25
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 73ba4a39b0 - Show all commits

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

@ -264,30 +264,6 @@ ReturnValue_t PlocMPSoCHandler::scanForReply(const uint8_t* start, size_t remain
SpacePacket spacePacket; SpacePacket spacePacket;
std::memcpy(spacePacket.getWholeData(), start, remainingSize); std::memcpy(spacePacket.getWholeData(), start, remainingSize);
// if (tmBuffer.length + remainingSize < SpacePacket::PACKET_MAX_SIZE) {
// std::memcpy(tmBuffer, start, remainingSize);
// tmBuffer.length += remainingSize;
// *foundLen = remainingSize;
// } else {
// std::memcpy(tmBuffer, start, remainingSize - (SpacePacket::PACKET_MAX_SIZE - tmBuffer.length));
// tmBuffer.length += (remainingSize - (SpacePacket::PACKET_MAX_SIZE - tmBuffer.length));
// }
//
// if (remainingSize < mpsoc::MIN_SPACE_PACKET_LENGTH) {
// std::memcpy(tmBuffer, start + tmBuffer.length, remainingSize);
// tmBuffer.length += remainingSize;
// return IGNORE_REPLY_DATA;
// }
// else {
// spacePacket.addWholeData(start, remainingSize);
// if (spacePacket.getPacketDataLength() + 1 != remainingSize - mpsoc::SPACE_PACKET_HEADER_SIZE) {
// std::memcpy(tmBuffer, start + tmBuffer.length, remainingSize);
// tmBuffer.length += remainingSize;
// return IGNORE_REPLY_DATA;
// }
// }
uint16_t apid = spacePacket.getAPID(); uint16_t apid = spacePacket.getAPID();
switch (apid) { switch (apid) {
@ -805,7 +781,8 @@ size_t PlocMPSoCHandler::getNextReplyLength(DeviceCommandId_t commandId) {
break; break;
} }
case mpsoc::TM_CAM_CMD_RPT: case mpsoc::TM_CAM_CMD_RPT:
// Read ACK, TM and EXE report in one go // Read acknowledgment, camera and execution report in one go because length of camera
// report is not fixed
replyLen = SpacePacket::PACKET_MAX_SIZE; replyLen = SpacePacket::PACKET_MAX_SIZE;
break; break;
default: { default: {