typo

Reviewed-on: #153

CHANGELOG.md

@@ -8,14 +8,34 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 # [unreleased]
 
-## Fixed
+## Fixes
+
 
 - 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.
+- PUS Health Service: Size check for set health command.
+  Perform operation completion for announce health command.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/746
+- Linux OSAL `getUptime` fix: Check validity of `/proc/uptime` file before reading uptime.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/745
+- Small tweak for version getter
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/744
+
+## Added
+
+- add CFDP subsystem ID
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/742
 
 ## Changed
-
+- Bump ETL version to 20.35.14
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/748
+- Renamed `PCDU_2` subsystem ID to `POWER_SWITCH_IF`.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/743
+- Add new `PowerSwitchIF::SWITCH_UNKNOWN` returnvalue.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/743
+- Assert that `FixedArrayList` is larger than 0 at compile time.
+  https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/740
 - Health functions are virtual now.
 
 # [v6.0.0] 2023-02-10

CMakeLists.txt

@@ -72,7 +72,7 @@ set(FSFW_ETL_LIB_MAJOR_VERSION
     20
     CACHE STRING "ETL library major version requirement")
 set(FSFW_ETL_LIB_VERSION
-    ${FSFW_ETL_LIB_MAJOR_VERSION}.28.0
+    ${FSFW_ETL_LIB_MAJOR_VERSION}.35.14
     CACHE STRING "ETL library exact version requirement")
 set(FSFW_ETL_LINK_TARGET etl::etl)
 

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) {
+  static T maxAbsValue(const T *vector, uint8_t size, uint8_t *index = nullptr) {
-    T max = -1;
+    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) {
+  static T maxValue(const T *vector, uint8_t size, uint8_t *index = nullptr) {
-    T max = -1;
+    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/osal/linux/Clock.cpp

@@ -89,8 +89,6 @@ timeval Clock::getUptime() {
 }
 
 ReturnValue_t Clock::getUptime(timeval* uptime) {
-  // TODO This is not posix compatible and delivers only seconds precision
-  //  Linux specific file read but more precise.
   double uptimeSeconds;
   std::ifstream ifile("/proc/uptime");
   if (ifile.bad()) {

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)
+                                           uint32_t queueDepth, uint8_t numParallelCommands)
-    : CommandingServiceBase(objectId, apid, "PUS 3 HK", serviceId, NUM_OF_PARALLEL_COMMANDS,
+    : 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/pus/Service8FunctionManagement.cpp

@@ -9,11 +9,11 @@
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
 Service8FunctionManagement::Service8FunctionManagement(object_id_t objectId, uint16_t apid,
-                                                       uint8_t serviceId,
+                                                       uint8_t serviceId, size_t queueDepth,
                                                        uint8_t numParallelCommands,
                                                        uint16_t commandTimeoutSeconds)
     : CommandingServiceBase(objectId, apid, "PUS 8 Functional Commanding", serviceId,
-                            numParallelCommands, commandTimeoutSeconds) {}
+                            numParallelCommands, commandTimeoutSeconds, queueDepth) {}
 
 Service8FunctionManagement::~Service8FunctionManagement() {}
 

src/fsfw/pus/Service8FunctionManagement.h

@@ -31,7 +31,8 @@
 class Service8FunctionManagement : public CommandingServiceBase {
  public:
   Service8FunctionManagement(object_id_t objectId, uint16_t apid, uint8_t serviceId,
-                             uint8_t numParallelCommands = 4, uint16_t commandTimeoutSeconds = 60);
+                             size_t queueDepth, uint8_t numParallelCommands = 4,
+                             uint16_t commandTimeoutSeconds = 60);
   ~Service8FunctionManagement() override;
 
  protected:

src/fsfw_hal/devicehandlers/devicedefinitions/gyroL3gHelpers.h

@@ -73,8 +73,10 @@ static constexpr uint8_t CTRL_REG_4_VAL = SET_BLE;
 /* Register 5 */
 static constexpr uint8_t SET_REBOOT_MEM = 1 << 7;
 static constexpr uint8_t SET_FIFO_ENB = 1 << 6;
+static constexpr uint8_t SET_OUT_SEL_1 = 1 << 1;
+static constexpr uint8_t SET_OUT_SEL_0 = 1 << 0;
 
-static constexpr uint8_t CTRL_REG_5_VAL = 0b00000000;
+static constexpr uint8_t CTRL_REG_5_VAL = SET_OUT_SEL_1 | SET_OUT_SEL_0;
 
 /* Possible range values in degrees per second (DPS). */
 static constexpr uint16_t RANGE_DPS_00 = 245;

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;
 }
 

unittests/action/TestActionHelper.cpp

@@ -28,7 +28,6 @@ TEST_CASE("Action Helper", "[action]") {
     REQUIRE(actionHelper.handleActionMessage(&actionMessage) == returnvalue::OK);
     CHECK(testDhMock.executeActionCalled);
     CHECK(not testMqMock.wasMessageSent());
-    CHECK(not testMqMock.wasMessageSent());
     const uint8_t* ptr = nullptr;
     size_t size = 0;
     REQUIRE(ipcStore->getData(paramAddress, &ptr, &size) ==