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

fixed conflicts

Browse Source
This commit is contained in:
Jakob Meier
2021-04-26 17:59:26 +02:00
parent 986ee97721 cdde3e29a8
commit bf1f2ae1b5
7 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mission/devices/PlocHandler.cpp
View File

@ -151,7 +151,10 @@ ReturnValue_t PlocHandler::prepareTcMemWriteCommand(const uint8_t * commandData,
| *(commandData + 2) << 8 | *(commandData + 3);
const uint32_t memoryData = *(commandData + 4) << 24 | *(commandData + 5) << 16
| *(commandData + 6) << 8 | *(commandData + 7);
PLOC::TcMemWrite tcMemWrite(memoryAddress, memoryData);
if (subsequenceCount != 0) {
subsequenceCount++;
}
PLOC::TcMemWrite tcMemWrite(memoryAddress, memoryData, subsequenceCount);
if (tcMemWrite.getFullSize() > PLOC::MAX_COMMAND_SIZE) {
sif::debug << "PlocHandler::prepareTcMemWriteCommand: Command too big" << std::endl;
return RETURN_FAILED;
@ -167,7 +170,10 @@ ReturnValue_t PlocHandler::prepareTcMemReadCommand(const uint8_t * commandData,
size_t commandDataLen) {
const uint32_t memoryAddress = *(commandData) << 24 | *(commandData + 1) << 16
| *(commandData + 2) << 8 | *(commandData + 3);
PLOC::TcMemRead tcMemRead(memoryAddress);
if (subsequenceCount != 0) {
subsequenceCount++;
}
PLOC::TcMemRead tcMemRead(memoryAddress, subsequenceCount);
if (tcMemRead.getFullSize() > PLOC::MAX_COMMAND_SIZE) {
sif::debug << "PlocHandler::prepareTcMemReadCommand: Command too big" << std::endl;
return RETURN_FAILED;
@ -176,6 +182,7 @@ ReturnValue_t PlocHandler::prepareTcMemReadCommand(const uint8_t * commandData,
rawPacket = commandBuffer;
rawPacketLen = tcMemRead.getFullSize();
nextReplyId = PLOC::ACK_REPORT;
return RETURN_OK;
}
@ -183,7 +190,7 @@ ReturnValue_t PlocHandler::verifyPacket(const uint8_t* start, size_t foundLen) {
uint16_t receivedCrc = *(start + foundLen - 2) << 8 | *(start + foundLen - 1);
uint16_t recalculatedCrc = CRC::crc16ccitt(start, foundLen - 2, 0);
uint16_t recalculatedCrc = CRC::crc16ccitt(start, foundLen - 2);
if (receivedCrc != recalculatedCrc) {
return CRC_FAILURE;
@ -221,10 +228,12 @@ ReturnValue_t PlocHandler::handleAckReport(const uint8_t* data) {
disableAllReplies();
nextReplyId = PLOC::NONE;
result = IGNORE_REPLY_DATA;
subsequenceCount = ((*(data + 2) & 0x3F) << 8) | *(data + 3);
break;
}
case PLOC::APID_ACK_SUCCESS: {
setNextReplyId();
subsequenceCount = ((*(data + 2) & 0x3F) << 8) | *(data + 3);
break;
}
default: {
@ -252,6 +261,7 @@ ReturnValue_t PlocHandler::handleExecutionReport(const uint8_t* data) {
switch (apid) {
case (PLOC::APID_EXE_SUCCESS): {
subsequenceCount = ((*(data + 2) & 0x3F) << 8) | *(data + 3);
break;
}
case (PLOC::APID_EXE_FAILURE): {
@ -268,6 +278,7 @@ ReturnValue_t PlocHandler::handleExecutionReport(const uint8_t* data) {
sendFailureReport(PLOC::EXE_REPORT, RECEIVED_EXE_FAILURE);
disableExeReportReply();
result = IGNORE_REPLY_DATA;
subsequenceCount = ((*(data + 2) & 0x3F) << 8) | *(data + 3);
break;
}
default: {
@ -298,6 +309,8 @@ ReturnValue_t PlocHandler::handleMemoryReadReport(const uint8_t* data) {
nextReplyId = PLOC::EXE_REPORT;
subsequenceCount = ((*(data + 2) & 0x3F) << 8) | *(data + 3);
return result;
}