some bugfixes
EIVE/eive-obsw/pipeline/head There was a failure building this commit Details

This commit is contained in:
Robin Müller 2024-04-17 14:52:00 +02:00
parent 520b8d0700
commit c64dae06d3
Signed by: muellerr
GPG Key ID: A649FB78196E3849
2 changed files with 10 additions and 9 deletions

View File

@ -462,14 +462,15 @@ ReturnValue_t FreshMpsocHandler::executeRegularCmd(ActionId_t actionId,
break;
}
case (mpsoc::TC_VERIFY_BOOT): {
uint8_t cmdData[6]{};
uint8_t cmdDataForDeadbeefCheck[6]{};
size_t serLen = 0;
uint16_t wordLen = 1;
SerializeAdapter::serialize(&mpsoc::DEADBEEF_ADDR, cmdData, &serLen, 4,
SerializeAdapter::serialize(&mpsoc::DEADBEEF_ADDR, cmdDataForDeadbeefCheck, &serLen, 4,
SerializeIF::Endianness::NETWORK);
SerializeAdapter::serialize(&wordLen, cmdData + 4, &serLen, 2,
SerializeAdapter::serialize(&wordLen, cmdDataForDeadbeefCheck + 4, &serLen, 2,
SerializeIF::Endianness::NETWORK);
result = commandTcMemRead(commandData, commandDataLen);
result = commandTcMemRead(cmdDataForDeadbeefCheck, 6);
break;
}
case (mpsoc::TC_MEM_READ): {
result = commandTcMemRead(commandData, commandDataLen);
@ -797,13 +798,13 @@ ReturnValue_t FreshMpsocHandler::handleDeviceReply() {
if (replyReader.getFullPacketLen() >= 6 + 4 + 2 + 4) {
uint32_t readBack = 0;
size_t deserLen = 0;
ReturnValue_t result =
SerializeAdapter::deSerialize(&readBack, replyReader.getFullData() + 6 + 4 + 2,
&deserLen, SerializeIF::Endianness::NETWORK);
result = SerializeAdapter::deSerialize(&readBack, replyReader.getFullData() + 6 + 4 + 2,
&deserLen, SerializeIF::Endianness::NETWORK);
if (result != returnvalue::OK or readBack != mpsoc::DEADBEEF_VALUE) {
cmdDoneHandler(false, result);
} else {
cmdDoneHandler(true, returnvalue::OK);
}
cmdDoneHandler(true, returnvalue::OK);
} else {
cmdDoneHandler(false, result);
}

2
tmtc

@ -1 +1 @@
Subproject commit 05d595523624e0388d74e5f09ac3e4d3657ebf91
Subproject commit 0c51cad81390bc66e23f6765b5efca7537b12b20