Merge branch 'meier/sequenceCount' into meier/develop

CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.13)
-set(LIB_FSFW_NAME fsfw)
 project(${LIB_FSFW_NAME})
 
 set(FSFW_VERSION_IF_GIT_FAILS 4)
@@ -59,7 +58,7 @@ option(FSFW_ADD_TMSTORAGE "Compile with tm storage components" OFF)
 # Contrib sources
 option(FSFW_ADD_SGP4_PROPAGATOR "Add SGP4 propagator code" OFF)
 
-
+set(LIB_FSFW_NAME fsfw)
 set(FSFW_TEST_TGT fsfw-tests)
 set(FSFW_DUMMY_TGT fsfw-dummy)
 

hal/src/fsfw_hal/linux/spi/SpiComIF.cpp

@@ -174,7 +174,6 @@ ReturnValue_t SpiComIF::performRegularSendOperation(SpiCookie* spiCookie, const
                                                     size_t sendLen) {
   address_t spiAddress = spiCookie->getSpiAddress();
   auto iter = spiDeviceMap.find(spiAddress);
-  std::memset(iter->second.replyBuffer.data(), 0, sendLen);
   if (iter != spiDeviceMap.end()) {
     spiCookie->assignReadBuffer(iter->second.replyBuffer.data());
   }

src/fsfw/osal/freertos/FixedTimeslotTask.cpp

@@ -46,7 +46,7 @@ void FixedTimeslotTask::missedDeadlineCounter() {
   FixedTimeslotTask::deadlineMissedCount++;
   if (FixedTimeslotTask::deadlineMissedCount % 10 == 0) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "PST missed " << FixedTimeslotTask::deadlineMissedCount << " deadlines"
+    sif::error << "PST missed " << FixedTimeslotTask::deadlineMissedCount << " deadlines."
                << std::endl;
 #endif
   }

src/fsfw/osal/linux/FixedTimeslotTask.cpp

@@ -87,7 +87,7 @@ void FixedTimeslotTask::missedDeadlineCounter() {
   FixedTimeslotTask::deadlineMissedCount++;
   if (FixedTimeslotTask::deadlineMissedCount % 10 == 0) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "PST missed " << FixedTimeslotTask::deadlineMissedCount << " deadlines"
+    sif::error << "PST missed " << FixedTimeslotTask::deadlineMissedCount << " deadlines."
                << std::endl;
 #endif
   }

src/fsfw/osal/rtems/FixedTimeslotTask.cpp

@@ -50,7 +50,7 @@ void FixedTimeslotTask::missedDeadlineCounter() {
   FixedTimeslotTask::deadlineMissedCount++;
   if (FixedTimeslotTask::deadlineMissedCount % 10 == 0) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::warning << "PST missed " << FixedTimeslotTask::deadlineMissedCount << " deadlines"
+    sif::error << "PST missed " << FixedTimeslotTask::deadlineMissedCount << " deadlines."
                << std::endl;
 #endif
   }

src/fsfw/tmtcservices/SourceSequenceCounter.h

@@ -8,7 +8,7 @@ class SourceSequenceCounter {
   uint16_t sequenceCount;
 
  public:
-  SourceSequenceCounter() : sequenceCount(0) {}
+  SourceSequenceCounter(uint16_t initialSequenceCount = 0) : sequenceCount(initialSequenceCount) {}
   void increment() {
     sequenceCount = (sequenceCount + 1) % (SpacePacketBase::LIMIT_SEQUENCE_COUNT);
   }
@@ -31,6 +31,7 @@ class SourceSequenceCounter {
     sequenceCount = newCount;
     return *this;
   }
+
   operator uint16_t() { return this->get(); }
 };