Merge pull request 'Update FSFW' (#12) from mueller/update-fsfw into eive/develop

Reviewed-on: eive/fsfw#12

hal/src/fsfw_hal/linux/UnixFileGuard.cpp

@@ -1,5 +1,10 @@
+#include "fsfw/FSFW.h"
+#include "fsfw/serviceinterface.h"
 #include "fsfw_hal/linux/UnixFileGuard.h"
 
+#include <cerrno>
+#include <cstring>
+
 UnixFileGuard::UnixFileGuard(std::string device, int* fileDescriptor, int flags,
         std::string diagnosticPrefix):
         fileDescriptor(fileDescriptor) {
@@ -10,12 +15,11 @@ UnixFileGuard::UnixFileGuard(std::string device, int* fileDescriptor, int flags,
     if (*fileDescriptor < 0) {
 #if FSFW_VERBOSE_LEVEL >= 1
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::warning << diagnosticPrefix <<"Opening device failed with error code " << errno <<
+        sif::warning << diagnosticPrefix << "Opening device failed with error code " <<
-                "." << std::endl;
+                errno << ": " << strerror(errno) << std::endl;
-        sif::warning << "Error description: " << strerror(errno) << std::endl;
 #else
-        sif::printError("%sOpening device failed with error code %d.\n", diagnosticPrefix);
+        sif::printWarning("%sOpening device failed with error code %d: %s\n",
-        sif::printWarning("Error description: %s\n", strerror(errno));
+                diagnosticPrefix, errno, strerror(errno));
 #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
 #endif /* FSFW_VERBOSE_LEVEL >= 1 */
         openStatus = OPEN_FILE_FAILED;

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

@@ -15,11 +15,6 @@
 #include <cerrno>
 #include <cstring>
 
-/* Can be used for low-level debugging of the SPI bus */
-#ifndef FSFW_HAL_LINUX_SPI_WIRETAPPING
-#define FSFW_HAL_LINUX_SPI_WIRETAPPING                  0
-#endif
-
 SpiComIF::SpiComIF(object_id_t objectId, GpioIF* gpioComIF):
         SystemObject(objectId), gpioComIF(gpioComIF) {
     if(gpioComIF == nullptr) {

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

@@ -1,6 +1,7 @@
 #ifndef LINUX_SPI_SPICOMIF_H_
 #define LINUX_SPI_SPICOMIF_H_
 
+#include "fsfw/FSFW.h"
 #include "spiDefinitions.h"
 #include "returnvalues/classIds.h"
 #include "fsfw_hal/common/gpio/GpioIF.h"

src/fsfw/FSFW.h.in

@@ -11,6 +11,11 @@
 #cmakedefine FSFW_ADD_MONITORING
 #cmakedefine FSFW_ADD_SGP4_PROPAGATOR
 
+/* Can be used for low-level debugging of the SPI bus */
+#ifndef FSFW_HAL_LINUX_SPI_WIRETAPPING
+#define FSFW_HAL_LINUX_SPI_WIRETAPPING 0
+#endif
+
 #ifndef FSFW_HAL_L3GD20_GYRO_DEBUG
 #define FSFW_HAL_L3GD20_GYRO_DEBUG   0
 #endif /* FSFW_HAL_L3GD20_GYRO_DEBUG */

src/fsfw/action/ActionHelper.cpp

@@ -32,17 +32,6 @@ ReturnValue_t ActionHelper::initialize(MessageQueueIF* queueToUse_) {
         setQueueToUse(queueToUse_);
     }
 
-    if(queueToUse == nullptr) {
-#if FSFW_VERBOSE_LEVEL >= 1
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::warning << "ActionHelper::initialize: No queue set" << std::endl;
-#else
-        sif::printWarning("ActionHelper::initialize: No queue set\n");
-#endif
-#endif /* FSFW_VERBOSE_LEVEL >= 1 */
-        return HasReturnvaluesIF::RETURN_FAILED;
-    }
-
     return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -66,19 +55,7 @@ void ActionHelper::setQueueToUse(MessageQueueIF* queue) {
 
 void ActionHelper::prepareExecution(MessageQueueId_t commandedBy,
         ActionId_t actionId, store_address_t dataAddress) {
-    if(ipcStore == nullptr) {
+    const uint8_t* dataPtr = NULL;
-#if FSFW_VERBOSE_LEVEL >= 1
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::warning << "ActionHelper::prepareExecution: IPC Store not set. Call initialize first"
-                << std::endl;
-#else
-        sif::printWarning("ActionHelper::prepareExecution: "
-                "IPC Store not set. Call initialize first\n");
-#endif
-#endif /* FSFW_VERBOSE_LEVEL >= 1 */
-        return;
-    }
-    const uint8_t* dataPtr = nullptr;
     size_t size = 0;
     ReturnValue_t result = ipcStore->getData(dataAddress, &dataPtr, &size);
     if (result != HasReturnvaluesIF::RETURN_OK) {