Fix some of the last MISRA infractions

Finish fixing Message errors

Fix 3 of the last 4 errors of TimeHelper

CMakeLists.txt

@@ -11,6 +11,7 @@ add_custom_target(check
         COMMAND ./cppcheck.sh
         COMMAND ./vera.sh
         COMMAND ./clang-tidy.sh
+        COMMAND ./cppcheck-misra.sh
         WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/ci")
 
 # Specify the .cpp files common across all targets

src/Helpers/TimeHelper.cpp

@@ -122,14 +122,14 @@ uint64_t TimeHelper::generateCDStimeFormat(TimeAndDate &TimeInfo) {
 }
 
 TimeAndDate TimeHelper::parseCDStimeFormat(const uint8_t *data) {
-	uint16_t elapsedDays = (static_cast<uint16_t >(data[0])) << 8) | (static_cast<uint16_t >
+	uint16_t elapsedDays = ((static_cast<uint16_t >(data[0])) << 8) | (static_cast<uint16_t >
 		(data[1]));
-	uint32_t msOfDay = (static_cast<uint32_t >(data[2])) << 24 |
-	                   (static_cast<uint32_t >(data[3])) << 16 |
-	                   (static_cast<uint32_t >(data[4])) << 8 |
-	                   static_cast<uint32_t >(data[5]);
+	uint32_t msOfDay = ((static_cast<uint32_t >(data[2])) << 24) |
+	                   ((static_cast<uint32_t >(data[3]))) << 16 |
+	                   ((static_cast<uint32_t >(data[4]))) << 8 |
+	                   (static_cast<uint32_t >(data[5]));
 
-	uint32_t seconds = elapsedDays * SECONDS_PER_DAY + msOfDay / 1000;
+	uint32_t seconds = (elapsedDays * SECONDS_PER_DAY) + (msOfDay / 1000u);
 
 	return secondsToUTC(seconds);
 }

src/Message.cpp

@@ -86,7 +86,7 @@ uint16_t Message::readBits(uint8_t numBits) {
 		if ((currentBit + numBits) >= 8) {
 			uint8_t bitsToAddNow = static_cast<uint8_t>(8 - currentBit);
 
-			uint8_t mask = ((1 << bitsToAddNow) - 1);
+			uint8_t mask = ((1u << bitsToAddNow) - 1u);
 			uint8_t maskedData = data[readPosition] & mask;
 			value |= maskedData << (numBits - bitsToAddNow);
 
@@ -113,7 +113,7 @@ uint8_t Message::readByte() {
 }
 
 uint16_t Message::readHalfword() {
-	ASSERT_REQUEST(readPosition + 2 <= ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
+	ASSERT_REQUEST((readPosition + 2) <= ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
 
 	uint16_t value = (data[readPosition] << 8) | data[readPosition + 1];
 	readPosition += 2;
@@ -122,7 +122,7 @@ uint16_t Message::readHalfword() {
 }
 
 uint32_t Message::readWord() {
-	ASSERT_REQUEST(readPosition + 4 <= ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
+	ASSERT_REQUEST((readPosition + 4) <= ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
 
 	uint32_t value = (data[readPosition] << 24) | (data[readPosition + 1] << 16) |
 	                 (data[readPosition + 2] << 8) | data[readPosition + 3];
@@ -132,7 +132,7 @@ uint32_t Message::readWord() {
 }
 
 void Message::readString(char *string, uint8_t size) {
-	ASSERT_REQUEST(readPosition + size <= ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
+	ASSERT_REQUEST((readPosition + size) <= ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
 	ASSERT_REQUEST(size < ECSS_MAX_STRING_SIZE, ErrorHandler::StringTooShort);
 
 	memcpy(string, data + readPosition, size);
@@ -142,7 +142,7 @@ void Message::readString(char *string, uint8_t size) {
 }
 
 void Message::readString(uint8_t *string, uint16_t size) {
-	ASSERT_REQUEST(readPosition + size <= ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
+	ASSERT_REQUEST((readPosition + size) <= ECSS_MAX_MESSAGE_SIZE, ErrorHandler::MessageTooShort);
 	ASSERT_REQUEST(size < ECSS_MAX_STRING_SIZE, ErrorHandler::StringTooShort);
 
 	memcpy(string, data + readPosition, size);