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

v1.9.0 #175

Merged
muellerr merged 623 commits from develop into main 2022-03-08 10:32:41 +01:00
Conversation 0 Commits 623 Files Changed 417 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 08b369f667 - Show all commits

16
linux/obc/PdecHandler.cpp
View File

@ -256,7 +256,7 @@ bool PdecHandler::checkFrameAna(uint32_t pdecFar) {
break; break;
} }
default: { default: {
sif::debug << "PdecHandler::checkFrameAna: Invaid frame analysis report" << std::endl; sif::debug << "PdecHandler::checkFrameAna: Invalid frame analysis report" << std::endl;
break; break;
} }
} }
@ -311,7 +311,7 @@ void PdecHandler::handleIReason(uint32_t pdecFar, ReturnValue_t parameter1) {
break; break;
} }
default: { default: {
sif::debug << "PdecHandler::handleIReason: Invaid reason id" << std::endl; sif::debug << "PdecHandler::handleIReason: Invalid reason id" << std::endl;
break; break;
} }
} }
@ -382,16 +382,16 @@ ReturnValue_t PdecHandler::readTc(uint32_t& tcLength) {
tcSegment[idx + 2] = static_cast<uint8_t>(tcData & 0xFF); tcSegment[idx + 2] = static_cast<uint8_t>(tcData & 0xFF);
} }
else if (tcLength - idx + 1 == 3) { else if (tcLength - idx + 1 == 3) {
tcSegment[idx - 1] = static_cast<uint8_t>((tcData >> 16) & 0xFF); tcSegment[idx - 1] = static_cast<uint8_t>((tcData >> 24) & 0xFF);
tcSegment[idx] = static_cast<uint8_t>((tcData >> 8) & 0xFF); tcSegment[idx] = static_cast<uint8_t>((tcData >> 16) & 0xFF);
tcSegment[idx + 1] = static_cast<uint8_t>(tcData & 0xFF); tcSegment[idx + 1] = static_cast<uint8_t>((tcData >> 8) & 0xFF);
} }
else if (tcLength - idx + 1 == 2) { else if (tcLength - idx + 1 == 2) {
tcSegment[idx - 1] = static_cast<uint8_t>((tcData >> 8) & 0xFF); tcSegment[idx - 1] = static_cast<uint8_t>((tcData >> 24) & 0xFF);
tcSegment[idx + 1] = static_cast<uint8_t>(tcData & 0xFF); tcSegment[idx] = static_cast<uint8_t>((tcData >> 16) & 0xFF);
} }
else if (tcLength - idx + 1 == 1) { else if (tcLength - idx + 1 == 1) {
tcSegment[idx - 1] = static_cast<uint8_t>(tcData & 0xFF); tcSegment[idx - 1] = static_cast<uint8_t>((tcData >> 24) & 0xFF);
} }
else { else {
tcSegment[idx - 1] = static_cast<uint8_t>((tcData >> 24) & 0xFF); tcSegment[idx - 1] = static_cast<uint8_t>((tcData >> 24) & 0xFF);