src/fsfw/cfdp/pdu/HeaderReader.cpp

@@ -11,12 +11,12 @@ PduHeaderReader::PduHeaderReader(const uint8_t *pduBuf, size_t maxSize) {
 }
 
 ReturnValue_t PduHeaderReader::parseData() {
-  if (pointers.rawPtr == nullptr) {
-    return returnvalue::FAILED;
-  }
   if (maxSize < 7) {
     return SerializeIF::STREAM_TOO_SHORT;
   }
+  if (pointers.rawPtr == nullptr) {
+    return returnvalue::FAILED;
+  }
   pointers.fixedHeader =
       reinterpret_cast<PduHeaderFixedStruct *>(const_cast<uint8_t *>(pointers.rawPtr));
   sourceIdRaw = &pointers.fixedHeader->variableFieldsStart;

src/fsfw/datapoollocal/LocalPoolDataSetBase.cpp

@@ -17,7 +17,8 @@ LocalPoolDataSetBase::LocalPoolDataSetBase(HasLocalDataPoolIF *hkOwner, uint32_t
   if (hkOwner == nullptr) {
     // Configuration error.
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "LocalPoolDataSetBase::LocalPoolDataSetBase: Owner " << "invalid!" << std::endl;
+    sif::error << "LocalPoolDataSetBase::LocalPoolDataSetBase: Owner "
+               << "invalid!" << std::endl;
 #else
     sif::printError(
         "LocalPoolDataSetBase::LocalPoolDataSetBase: Owner "
@@ -186,8 +187,8 @@ ReturnValue_t LocalPoolDataSetBase::serializeLocalPoolIds(uint8_t **buffer, size
         SerializeAdapter::serialize(&currentPoolId, buffer, size, maxSize, streamEndianness);
     if (result != returnvalue::OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-      sif::warning << "LocalPoolDataSetBase::serializeLocalPoolIds: " << "Serialization error!"
-                   << std::endl;
+      sif::warning << "LocalPoolDataSetBase::serializeLocalPoolIds: "
+                   << "Serialization error!" << std::endl;
 #else
       sif::printWarning(
           "LocalPoolDataSetBase::serializeLocalPoolIds: "

src/fsfw/datapoollocal/LocalPoolObjectBase.cpp

@@ -17,8 +17,8 @@ LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId, HasLocalDataPoolIF* hkO
   }
   if (hkOwner == nullptr) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "LocalPoolVar<T>::LocalPoolVar: The supplied pool " << "owner is a invalid!"
-               << std::endl;
+    sif::error << "LocalPoolVar<T>::LocalPoolVar: The supplied pool "
+               << "owner is a invalid!" << std::endl;
 #endif
     return;
   }

src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.cpp

@@ -243,8 +243,8 @@ bool DeviceHandlerFailureIsolation::isFdirInActionOrAreWeFaulty(EventMessage* ev
   if (owner == nullptr) {
     // Configuration error.
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "DeviceHandlerFailureIsolation::" << "isFdirInActionOrAreWeFaulty: Owner not set!"
-               << std::endl;
+    sif::error << "DeviceHandlerFailureIsolation::"
+               << "isFdirInActionOrAreWeFaulty: Owner not set!" << std::endl;
 #endif
     return false;
   }

src/fsfw/fdir/FailureIsolationBase.cpp

@@ -62,7 +62,8 @@ ReturnValue_t FailureIsolationBase::initialize() {
         ObjectManager::instance()->get<ConfirmsFailuresIF>(faultTreeParent);
     if (parentIF == nullptr) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-      sif::error << "FailureIsolationBase::intialize: Parent object " << "invalid" << std::endl;
+      sif::error << "FailureIsolationBase::intialize: Parent object "
+                 << "invalid" << std::endl;
       sif::error << "Make sure it implements ConfirmsFailuresIF" << std::endl;
 #else
       sif::printError("FailureIsolationBase::intialize: Parent object invalid\n");

src/fsfw/osal/common/TcpTmTcServer.cpp

@@ -321,8 +321,8 @@ ReturnValue_t TcpTmTcServer::handleTcRingBufferData(size_t availableReadData) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     // Possible configuration error, too much data or/and data coming in too fast,
     // requiring larger buffers
-    sif::warning << "TcpTmTcServer::handleServerOperation: Ring buffer reached " << "fill count"
-                 << std::endl;
+    sif::warning << "TcpTmTcServer::handleServerOperation: Ring buffer reached "
+                 << "fill count" << std::endl;
 #else
     sif::printWarning(
         "TcpTmTcServer::handleServerOperation: Ring buffer reached "

src/fsfw/pus/Service20ParameterManagement.cpp

@@ -49,8 +49,8 @@ ReturnValue_t Service20ParameterManagement::checkAndAcquireTargetID(object_id_t*
   if (SerializeAdapter::deSerialize(objectIdToSet, &tcData, &tcDataLen,
                                     SerializeIF::Endianness::BIG) != returnvalue::OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "Service20ParameterManagement::checkAndAcquireTargetID: " << "Invalid data."
-               << std::endl;
+    sif::error << "Service20ParameterManagement::checkAndAcquireTargetID: "
+               << "Invalid data." << std::endl;
 #else
     sif::printError(
         "Service20ParameterManagement::"

src/fsfw/pus/Service3Housekeeping.cpp

@@ -196,8 +196,8 @@ ReturnValue_t Service3Housekeeping::handleReply(const CommandMessage* reply,
 
     default:
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-      sif::warning << "Service3Housekeeping::handleReply: Invalid reply with " << "reply command "
-                   << command << std::endl;
+      sif::warning << "Service3Housekeeping::handleReply: Invalid reply with "
+                   << "reply command " << command << std::endl;
 #else
       sif::printWarning(
           "Service3Housekeeping::handleReply: Invalid reply with "

src/fsfw/storagemanager/LocalPool.cpp

@@ -12,7 +12,8 @@ LocalPool::LocalPool(object_id_t setObjectId, const LocalPoolConfig& poolConfig,
       spillsToHigherPools(spillsToHigherPools) {
   if (NUMBER_OF_SUBPOOLS == 0) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "LocalPool::LocalPool: Passed pool configuration is " << " invalid!" << std::endl;
+    sif::error << "LocalPool::LocalPool: Passed pool configuration is "
+               << " invalid!" << std::endl;
 #endif
   }
   max_subpools_t index = 0;

src/fsfw/subsystem/Subsystem.cpp

@@ -38,9 +38,10 @@ ReturnValue_t Subsystem::checkSequence(HybridIterator<ModeListEntry> iter,
     if (!existsModeTable(iter->getTableId())) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
       using namespace std;
-      sif::warning << "Subsystem::checkSequence: " << "Object " << setfill('0') << hex << "0x"
-                   << setw(8) << getObjectId() << setw(0) << ": Mode table for mode ID " << "0x"
-                   << setw(8) << iter->getTableId() << " does not exist" << dec << endl;
+      sif::warning << "Subsystem::checkSequence: "
+                   << "Object " << setfill('0') << hex << "0x" << setw(8) << getObjectId()
+                   << setw(0) << ": Mode table for mode ID "
+                   << "0x" << setw(8) << iter->getTableId() << " does not exist" << dec << endl;
 #endif
       return TABLE_DOES_NOT_EXIST;
     } else {

src/fsfw/tasks/FixedSlotSequence.cpp

@@ -101,7 +101,8 @@ ReturnValue_t FixedSlotSequence::checkSequence() const {
     if (result != returnvalue::OK) {
       // Continue for now but print error output.
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-      sif::error << "FixedSlotSequence::checkSequence:" << " Custom check failed!" << std::endl;
+      sif::error << "FixedSlotSequence::checkSequence:"
+                 << " Custom check failed!" << std::endl;
 #endif
     }
   }

src/fsfw/tmtcservices/SpacePacketParser.cpp

@@ -1,3 +1,4 @@
+#include <fsfw/globalfunctions/CRC.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 #include <fsfw/tmtcservices/SpacePacketParser.h>
 
@@ -6,6 +7,8 @@
 SpacePacketParser::SpacePacketParser(std::vector<uint16_t> validPacketIds)
     : validPacketIds(validPacketIds) {}
 
+void SpacePacketParser::enableCrcCheck() { checkCrc = true; }
+
 ReturnValue_t SpacePacketParser::parseSpacePackets(const uint8_t** buffer, const size_t maxSize,
                                                    FoundPacketInfo& packetInfo) {
   if (buffer == nullptr or nextStartIdx > maxSize) {
@@ -31,6 +34,11 @@ ReturnValue_t SpacePacketParser::parseSpacePackets(const uint8_t** buffer, const
     }
     *buffer += packetInfo.sizeFound;
     packetInfo.startIdx = localIdx + amountRead;
+    if (checkCrc) {
+      if (CRC::crc16ccitt(bufPtr + localIdx, packetSize) != 0) {
+        return CRC_CHECK_FAILED;
+      }
+    }
     nextStartIdx = localIdx + amountRead + packetInfo.sizeFound;
     amountRead = nextStartIdx;
     return result;

src/fsfw/tmtcservices/SpacePacketParser.h

@@ -25,6 +25,13 @@ class SpacePacketParser {
   static constexpr uint8_t INTERFACE_ID = CLASS_ID::SPACE_PACKET_PARSER;
   static constexpr ReturnValue_t NO_PACKET_FOUND = MAKE_RETURN_CODE(0x00);
   static constexpr ReturnValue_t SPLIT_PACKET = MAKE_RETURN_CODE(0x01);
+  static constexpr ReturnValue_t CRC_CHECK_FAILED = MAKE_RETURN_CODE(0x02);
+
+  /**
+   * brief If the last to bytes of a space packet hold a CRC16, this function can be used to enable
+   * 			 the CRC16 check when parsing the data.
+   */
+  void enableCrcCheck();
 
   /**
    * @brief   Parser constructor.
@@ -61,6 +68,7 @@ class SpacePacketParser {
   std::vector<uint16_t> validPacketIds;
   size_t nextStartIdx = 0;
   size_t amountRead = 0;
+  bool checkCrc = false;
 };
 
 #endif /* FRAMEWORK_TMTCSERVICES_PUSPARSER_H_ */

src/fsfw/tmtcservices/TmTcBridge.cpp

@@ -34,7 +34,8 @@ ReturnValue_t TmTcBridge::setMaxNumberOfPacketsStored(unsigned int maxNumberOfPa
   } else {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::warning << "TmTcBridge::setMaxNumberOfPacketsStored: Number of "
-                 << "packets stored exceeds limits. " << "Keeping default value." << std::endl;
+                 << "packets stored exceeds limits. "
+                 << "Keeping default value." << std::endl;
 #endif
     return returnvalue::FAILED;
   }
@@ -78,13 +79,15 @@ ReturnValue_t TmTcBridge::performOperation(uint8_t operationCode) {
   result = handleTc();
   if (result != returnvalue::OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::debug << "TmTcBridge::performOperation: " << "Error handling TCs" << std::endl;
+    sif::debug << "TmTcBridge::performOperation: "
+               << "Error handling TCs" << std::endl;
 #endif
   }
   result = handleTm();
   if (result != returnvalue::OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::debug << "TmTcBridge::performOperation: " << "Error handling TMs" << std::endl;
+    sif::debug << "TmTcBridge::performOperation: "
+               << "Error handling TMs" << std::endl;
 #endif
   }
   return result;

src/fsfw_hal/linux/gpio/LinuxLibgpioIF.cpp

@@ -418,8 +418,8 @@ ReturnValue_t LinuxLibgpioIF::checkForConflictsById(gpioId_t gpioIdToCheck,
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::warning << "LinuxLibgpioIF::checkForConflictsRegularGpio: Duplicate GPIO "
                     "definition with ID "
-                 << gpioIdToCheck << " detected. " << "Duplicate will be removed from map to add"
-                 << std::endl;
+                 << gpioIdToCheck << " detected. "
+                 << "Duplicate will be removed from map to add" << std::endl;
 #else
     sif::printWarning(
         "LinuxLibgpioIF::checkForConflictsRegularGpio: Duplicate GPIO definition "

src/fsfw_hal/linux/i2c/I2cComIF.cpp

@@ -49,7 +49,8 @@ ReturnValue_t I2cComIF::initializeInterface(CookieIF* cookie) {
     if (not statusPair.second) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
       sif::error << "I2cComIF::initializeInterface: Failed to insert device with address "
-                 << i2cAddress << "to I2C device " << "map" << std::endl;
+                 << i2cAddress << "to I2C device "
+                 << "map" << std::endl;
 #endif
       return returnvalue::FAILED;
     }
@@ -90,8 +91,8 @@ ReturnValue_t I2cComIF::sendMessage(CookieIF* cookie, const uint8_t* sendData, s
   auto i2cDeviceMapIter = i2cDeviceMap.find(i2cAddress);
   if (i2cDeviceMapIter == i2cDeviceMap.end()) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "I2cComIF::sendMessage: i2cAddress of Cookie not " << "registered in i2cDeviceMap"
-               << std::endl;
+    sif::error << "I2cComIF::sendMessage: i2cAddress of Cookie not "
+               << "registered in i2cDeviceMap" << std::endl;
 #endif
     return returnvalue::FAILED;
   }

src/fsfw_hal/linux/spi/SpiComIF.cpp

@@ -197,8 +197,9 @@ ReturnValue_t SpiComIF::performRegularSendOperation(SpiCookie* spiCookie, const
       if (result == MutexIF::MUTEX_TIMEOUT) {
         sif::error << "SpiComIF::sendMessage: Lock timeout" << std::endl;
       } else {
-        sif::error << "SpiComIF::sendMessage: Failed to lock mutex with code " << "0x" << std::hex
-                   << std::setfill('0') << std::setw(4) << result << std::dec << std::endl;
+        sif::error << "SpiComIF::sendMessage: Failed to lock mutex with code "
+                   << "0x" << std::hex << std::setfill('0') << std::setw(4) << result << std::dec
+                   << std::endl;
       }
 #else
       sif::printError("SpiComIF::sendMessage: Failed to lock mutex with code %d\n", result);
@@ -306,8 +307,9 @@ ReturnValue_t SpiComIF::performHalfDuplexReception(SpiCookie* spiCookie) {
     if (result != returnvalue::OK) {
 #if FSFW_VERBOSE_LEVEL >= 1
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-      sif::error << "SpiComIF::sendMessage: Failed to lock mutex with code " << "0x" << std::hex
-                 << std::setfill('0') << std::setw(4) << result << std::dec << std::endl;
+      sif::error << "SpiComIF::sendMessage: Failed to lock mutex with code "
+                 << "0x" << std::hex << std::setfill('0') << std::setw(4) << result << std::dec
+                 << std::endl;
 #else
       sif::printError("SpiComIF::sendMessage: Failed to lock mutex with code %d\n", result);
 #endif