important bugfix for PUS TM creator

Reviewed-on: #155
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Fixes
 
-
+- The `PusTmCreator` API only accepted 255 bytes of source data. It can now accept source
+  data with a size limited only by the size of `size_t`.
 - Important bugfix in CFDP PDU header format: The entity length field and the transaction sequence
   number fields stored the actual length of the field instead of the length minus 1 like specified
   in the CFDP standard.
@@ -26,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - add CFDP subsystem ID
   https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/742
+- `PusTmZcWriter` now exposes API to set message counter field.
 
 ## Changed
 - Bump ETL version to 20.35.14

src/fsfw/globalfunctions/math/VectorOperations.h

@@ -53,8 +53,9 @@ class VectorOperations {
     mulScalar(vector, 1 / norm(vector, size), normalizedVector, size);
   }
 
-  static T maxAbsValue(const T *vector, uint8_t size, uint8_t *index = 0) {
-    T max = -1;
+  static T maxAbsValue(const T *vector, uint8_t size, uint8_t *index = nullptr) {
+    T max = vector[size - 1];
+    uint8_t foundIndex = size - 1;
 
     for (; size > 0; size--) {
       T abs = vector[size - 1];
@@ -64,24 +65,35 @@ class VectorOperations {
       if (abs > max) {
         max = abs;
         if (index != 0) {
-          *index = size - 1;
+          foundIndex = size - 1;
         }
       }
     }
+
+    if (index != nullptr) {
+      *index = foundIndex;
+    }
+
     return max;
   }
 
-  static T maxValue(const T *vector, uint8_t size, uint8_t *index = 0) {
-    T max = -1;
+  static T maxValue(const T *vector, uint8_t size, uint8_t *index = nullptr) {
+    T max = vector[size - 1];
+    uint8_t foundIndex = size - 1;
 
     for (; size > 0; size--) {
       if (vector[size - 1] > max) {
         max = vector[size - 1];
         if (index != 0) {
-          *index = size - 1;
+          foundIndex = size - 1;
         }
       }
     }
+
+    if (index != nullptr) {
+      *index = foundIndex;
+    }
+
     return max;
   }
 

src/fsfw/internalerror/InternalErrorReporter.cpp

@@ -5,9 +5,12 @@
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
-InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth)
+InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth,
+                                             bool enableSetByDefault, float generationFrequency)
     : SystemObject(setObjectId),
       poolManager(this, commandQueue),
+      enableSetByDefault(enableSetByDefault),
+      generationFrequency(generationFrequency),
       internalErrorSid(setObjectId, InternalErrorDataset::ERROR_SET_ID),
       internalErrorDataset(this) {
   commandQueue = QueueFactory::instance()->createMessageQueue(messageQueueDepth);
@@ -134,9 +137,8 @@ ReturnValue_t InternalErrorReporter::initializeLocalDataPool(localpool::DataPool
   localDataPoolMap.emplace(errorPoolIds::TM_HITS, &tmHitsEntry);
   localDataPoolMap.emplace(errorPoolIds::QUEUE_HITS, &queueHitsEntry);
   localDataPoolMap.emplace(errorPoolIds::STORE_HITS, &storeHitsEntry);
-  poolManager.subscribeForDiagPeriodicPacket(subdp::DiagnosticsHkPeriodicParams(
-      internalErrorSid, false,
-      static_cast<float>(getPeriodicOperationFrequency()) / static_cast<float>(1000.0)));
+  poolManager.subscribeForRegularPeriodicPacket(
+      subdp::RegularHkPeriodicParams(internalErrorSid, enableSetByDefault, generationFrequency));
   internalErrorDataset.setValidity(true, true);
   return returnvalue::OK;
 }

src/fsfw/internalerror/InternalErrorReporter.h

@@ -21,7 +21,8 @@ class InternalErrorReporter : public SystemObject,
                               public InternalErrorReporterIF,
                               public HasLocalDataPoolIF {
  public:
-  InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth = 5);
+  InternalErrorReporter(object_id_t setObjectId, uint32_t messageQueueDepth,
+                        bool enableSetByDefault, float generationFrequency);
 
   /**
    * Enable diagnostic printout. Please note that this feature will
@@ -63,6 +64,8 @@ class InternalErrorReporter : public SystemObject,
   MutexIF* mutex = nullptr;
   MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING;
   uint32_t timeoutMs = 20;
+  bool enableSetByDefault;
+  float generationFrequency;
 
   sid_t internalErrorSid;
   InternalErrorDataset internalErrorDataset;

src/fsfw/pus/Service3Housekeeping.cpp

@@ -5,8 +5,8 @@
 #include "fsfw/pus/servicepackets/Service3Packets.h"
 
 Service3Housekeeping::Service3Housekeeping(object_id_t objectId, uint16_t apid, uint8_t serviceId,
-                                           uint32_t queueDepth)
-    : CommandingServiceBase(objectId, apid, "PUS 3 HK", serviceId, NUM_OF_PARALLEL_COMMANDS,
+                                           uint32_t queueDepth, uint8_t numParallelCommands)
+    : CommandingServiceBase(objectId, apid, "PUS 3 HK", serviceId, numParallelCommands,
                             COMMAND_TIMEOUT_SECONDS, queueDepth) {}
 
 Service3Housekeeping::~Service3Housekeeping() {}

src/fsfw/pus/Service3Housekeeping.h

@@ -28,7 +28,8 @@ class Service3Housekeeping : public CommandingServiceBase, public AcceptsHkPacke
   static constexpr uint8_t NUM_OF_PARALLEL_COMMANDS = 4;
   static constexpr uint16_t COMMAND_TIMEOUT_SECONDS = 60;
 
-  Service3Housekeeping(object_id_t objectId, uint16_t apid, uint8_t serviceId, uint32_t queueDepth);
+  Service3Housekeeping(object_id_t objectId, uint16_t apid, uint8_t serviceId, uint32_t queueDepth,
+                       uint8_t numParallelCommands);
   virtual ~Service3Housekeeping();
 
  protected:

src/fsfw/tmtcpacket/pus/tm/PusTmCreator.h

@@ -40,7 +40,7 @@ struct PusTmParams {
               size_t dataLen)
       : secHeader(service, subservice, timeStamper), adapter(data, dataLen), sourceData(&adapter) {}
   PusTmSecHeader secHeader;
-  SerialBufferAdapter<uint8_t> adapter;
+  SerialBufferAdapter<size_t> adapter;
   const SerializeIF* sourceData = nullptr;
 };
 

src/fsfw/tmtcpacket/pus/tm/PusTmZcWriter.cpp

@@ -24,3 +24,9 @@ void PusTmZeroCopyWriter::updateErrorControl() {
   crcStart[0] = (crc16 >> 8) & 0xff;
   crcStart[1] = crc16 & 0xff;
 }
+
+void PusTmZeroCopyWriter::setMessageCount(uint16_t msgCount) {
+  size_t serSize = 0;
+  SerializeAdapter::serialize(&msgCount, const_cast<uint8_t*>(pointers.secHeaderStart + 3),
+                              &serSize, 2, SerializeIF::Endianness::NETWORK);
+}

src/fsfw/tmtcpacket/pus/tm/PusTmZcWriter.h

@@ -14,6 +14,7 @@ class PusTmZeroCopyWriter : public PusTmReader {
   PusTmZeroCopyWriter(TimeReaderIF& timeReader, uint8_t* data, size_t size);
 
   void setSequenceCount(uint16_t seqCount);
+  void setMessageCount(uint16_t msgCount);
   void updateErrorControl();
 
  private:

src/fsfw_hal/host/HostFilesystem.cpp

@@ -165,7 +165,8 @@ ReturnValue_t HostFilesystem::truncateFile(FilesystemParams params) {
   if (not filesystem::exists(path, e)) {
     return FILE_DOES_NOT_EXIST;
   }
-  ofstream of(path);
+  // Specify truncation flug explicitely.
+  ofstream of(path, std::ios::out | std::ios::trunc);
   return returnvalue::OK;
 }