From 08b369f667c8c233dd8d5cf5c1bf932a4ad64fa0 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sat, 6 Nov 2021 20:28:33 +0100 Subject: [PATCH] fix in pdec tc reading --- linux/obc/PdecHandler.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/linux/obc/PdecHandler.cpp b/linux/obc/PdecHandler.cpp index e20cdb95..86493ce8 100644 --- a/linux/obc/PdecHandler.cpp +++ b/linux/obc/PdecHandler.cpp @@ -256,7 +256,7 @@ bool PdecHandler::checkFrameAna(uint32_t pdecFar) { break; } default: { - sif::debug << "PdecHandler::checkFrameAna: Invaid frame analysis report" << std::endl; + sif::debug << "PdecHandler::checkFrameAna: Invalid frame analysis report" << std::endl; break; } } @@ -311,7 +311,7 @@ void PdecHandler::handleIReason(uint32_t pdecFar, ReturnValue_t parameter1) { break; } default: { - sif::debug << "PdecHandler::handleIReason: Invaid reason id" << std::endl; + sif::debug << "PdecHandler::handleIReason: Invalid reason id" << std::endl; break; } } @@ -382,16 +382,16 @@ ReturnValue_t PdecHandler::readTc(uint32_t& tcLength) { tcSegment[idx + 2] = static_cast(tcData & 0xFF); } else if (tcLength - idx + 1 == 3) { - tcSegment[idx - 1] = static_cast((tcData >> 16) & 0xFF); - tcSegment[idx] = static_cast((tcData >> 8) & 0xFF); - tcSegment[idx + 1] = static_cast(tcData & 0xFF); + tcSegment[idx - 1] = static_cast((tcData >> 24) & 0xFF); + tcSegment[idx] = static_cast((tcData >> 16) & 0xFF); + tcSegment[idx + 1] = static_cast((tcData >> 8) & 0xFF); } else if (tcLength - idx + 1 == 2) { - tcSegment[idx - 1] = static_cast((tcData >> 8) & 0xFF); - tcSegment[idx + 1] = static_cast(tcData & 0xFF); + tcSegment[idx - 1] = static_cast((tcData >> 24) & 0xFF); + tcSegment[idx] = static_cast((tcData >> 16) & 0xFF); } else if (tcLength - idx + 1 == 1) { - tcSegment[idx - 1] = static_cast(tcData & 0xFF); + tcSegment[idx - 1] = static_cast((tcData >> 24) & 0xFF); } else { tcSegment[idx - 1] = static_cast((tcData >> 24) & 0xFF);