wiretapping defines added

CMakeLists.txt

@@ -20,7 +20,6 @@ if(NOT LIB_FSFW_NAME)
     message(ERROR "LIB_FSFW_NAME needs to be set as a linkable target")
 endif()
 
-
 add_subdirectory(common)
 
 if(FSFW_HAL_ADD_LINUX)
@@ -35,6 +34,10 @@ target_link_libraries(${LIB_FSFW_HAL_NAME} PRIVATE
     ${LIB_FSFW_NAME}
 )
 
+target_include_directories(${LIB_FSFW_HAL_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if(NOT DEFINED FSFW_WARNING_FLAGS)
 	   set(FSFW_WARNING_FLAGS

common/gpio/GpioCookie.cpp

@@ -1,30 +1,33 @@
 #include "GpioCookie.h"
 #include <fsfw/serviceinterface/ServiceInterface.h>
-
 GpioCookie::GpioCookie() {
 }
 
-ReturnValue_t GpioCookie::addGpio(gpioId_t gpioId, GpiodRegular& gpioConfig){
-	auto gpioMapIter = gpioMap.find(gpioId);
-	if(gpioMapIter == gpioMap.end()) {
-		auto statusPair = gpioMap.emplace(gpioId, new GpiodRegular(gpioConfig));
-		if (statusPair.second == false) {
+ReturnValue_t GpioCookie::addGpio(gpioId_t gpioId, GpioBase* gpioConfig) {
+    if (gpioConfig == nullptr) {
+        sif::debug << "GpioCookie::addGpio: gpioConfig is nullpointer" << std::endl;
+        return HasReturnvaluesIF::RETURN_FAILED;
+    }
+    auto gpioMapIter = gpioMap.find(gpioId);
+    if(gpioMapIter == gpioMap.end()) {
+        auto statusPair = gpioMap.emplace(gpioId, gpioConfig);
+        if (statusPair.second == false) {
 #if FSFW_VERBOSE_LEVEL >= 1
-			sif::error << "GpioCookie::addGpio: Failed to add GPIO " << gpioId <<
-			        "to GPIO map" << std::endl;
+            sif::error << "GpioCookie::addGpio: Failed to add GPIO " << gpioId <<
+                    " to GPIO map" << std::endl;
 #endif
-			return HasReturnvaluesIF::RETURN_FAILED;
-		}
-		return HasReturnvaluesIF::RETURN_OK;
-	}
+            return HasReturnvaluesIF::RETURN_FAILED;
+        }
+        return HasReturnvaluesIF::RETURN_OK;
+    }
 #if FSFW_VERBOSE_LEVEL >= 1
-	sif::error << "GpioCookie::addGpio: GPIO already exists in GPIO map " << std::endl;
+    sif::error << "GpioCookie::addGpio: GPIO already exists in GPIO map " << std::endl;
 #endif
-	return HasReturnvaluesIF::RETURN_FAILED;
+    return HasReturnvaluesIF::RETURN_FAILED;
 }
 
 GpioMap GpioCookie::getGpioMap() const {
-	return gpioMap;
+    return gpioMap;
 }
 
 GpioCookie::~GpioCookie() {}

common/gpio/GpioCookie.h

@@ -23,7 +23,8 @@ public:
 
     virtual ~GpioCookie();
 
-    ReturnValue_t addGpio(gpioId_t gpioId, GpiodRegular& gpioConfig);
+    ReturnValue_t addGpio(gpioId_t gpioId, GpioBase* gpioConfig);
+
     /**
      * @brief	Get map with registered GPIOs.
      */

linux/gpio/LinuxLibgpioIF.cpp

@@ -1,6 +1,6 @@
 #include "LinuxLibgpioIF.h"
-#include "../../common/gpio/GpioCookie.h"
-#include "../../common/gpio/gpioDefinitions.h"
+#include <common/gpio/gpioDefinitions.h>
+#include <common/gpio/GpioCookie.h>
 
 #include <fsfw/serviceinterface/ServiceInterface.h>
 
@@ -8,7 +8,6 @@
 #include <unistd.h>
 #include <gpiod.h>
 
-
 LinuxLibgpioIF::LinuxLibgpioIF(object_id_t objectId) : SystemObject(objectId) {
 }
 
@@ -56,11 +55,11 @@ ReturnValue_t LinuxLibgpioIF::configureGpios(GpioMap& mapToAdd) {
             break;
         }
         case(gpio::GpioTypes::CALLBACK): {
-            auto gpioCallback = dynamic_cast<GpioCallback*>(gpioMapIter->second);
+            auto gpioCallback = dynamic_cast<GpioCallback*>(gpioConfig.second);
             if(gpioCallback->callback == nullptr) {
                 return GPIO_INVALID_INSTANCE;
             }
-            gpioCallback->callback(gpioMapIter->first, gpio::GpioOperation::READ,
+            gpioCallback->callback(gpioConfig.first, gpio::GpioOperation::WRITE,
                     gpioCallback->initValue, gpioCallback->callbackArgs);
         }
         }
@@ -88,7 +87,8 @@ ReturnValue_t LinuxLibgpioIF::configureRegularGpio(gpioId_t gpioId, GpiodRegular
     lineNum = regularGpio->lineNum;
     lineHandle = gpiod_chip_get_line(chip, lineNum);
     if (!lineHandle) {
-        sif::error << "LinuxLibgpioIF::configureGpios: Failed to open line" << std::endl;
+        sif::error << "LinuxLibgpioIF::configureGpios: Failed to open line for GPIO with id "
+                    << gpioId << std::endl;
         gpiod_chip_close(chip);
         return RETURN_FAILED;
     }

linux/spi/SpiComIF.cpp

@@ -16,6 +16,14 @@
 #include <cerrno>
 #include <cstring>
 
+#ifndef SPI_SEND_WIRETAPPING
+#define SPI_SEND_WIRETAPPING    0
+#endif
+
+#ifndef SPI_RECV_WIRETAPPING
+#define SPI_RECV_WIRETAPPING    0
+#endif
+
 SpiComIF::SpiComIF(object_id_t objectId, GpioIF* gpioComIF): SystemObject(objectId),
         gpioComIF(gpioComIF) {
     if(gpioComIF == nullptr) {