trying to fuse header / inc

hal/CMakeLists.txt

@@ -12,7 +12,6 @@ set(LINUX_HAL_PATH_NAME linux)
 set(STM32H7_PATH_NAME stm32h7)
 
 add_subdirectory(src)
-add_subdirectory(inc)
 
 foreach(INCLUDE_PATH ${FSFW_HAL_ADDITIONAL_INC_PATHS})
     if(IS_ABSOLUTE ${INCLUDE_PATH})

hal/inc/CMakeLists.txt

@@ -1,7 +0,0 @@
-target_include_directories(${LIB_FSFW_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-target_include_directories(${LIB_FSFW_NAME} INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)

hal/src/CMakeLists.txt

@@ -1,10 +1,9 @@
-add_subdirectory(devicehandlers)
-add_subdirectory(common)
+target_include_directories(${LIB_FSFW_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
-if(FSFW_HAL_ADD_LINUX)
-    add_subdirectory(${LINUX_HAL_PATH_NAME})
-endif()
+target_include_directories(${LIB_FSFW_NAME} INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
-if(FSFW_HAL_ADD_STM32H7)
-    add_subdirectory(${STM32H7_PATH_NAME})
-endif()
+add_subdirectory(fsfw)

hal/src/fsfw/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(hal)

hal/src/fsfw/hal/CMakeLists.txt

@@ -0,0 +1,10 @@
+add_subdirectory(devicehandlers)
+add_subdirectory(common)
+
+if(FSFW_HAL_ADD_LINUX)
+    add_subdirectory(linux)
+endif()
+
+if(FSFW_HAL_ADD_STM32H7)
+    add_subdirectory(stm32h7)
+endif()

inc/fsfw/action.h

@@ -1,11 +0,0 @@
-#ifndef FSFW_INC_FSFW_ACTION_H_
-#define FSFW_INC_FSFW_ACTION_H_
-
-#include "action/ActionHelper.h"
-#include "action/ActionMessage.h"
-#include "action/CommandActionHelper.h"
-#include "action/HasActionsIF.h"
-#include "action/CommandsActionsIF.h"
-#include "action/SimpleActionHelper.h"
-
-#endif /* FSFW_INC_FSFW_ACTION_H_ */

inc/fsfw/datapoollocal.h

@@ -1,12 +0,0 @@
-#ifndef FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_
-#define FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_
-
-/* Collected related headers */
-#include "datapoollocal/LocalPoolVariable.h"
-#include "datapoollocal/LocalPoolVector.h"
-#include "datapoollocal/StaticLocalDataSet.h"
-#include "datapoollocal/LocalDataSet.h"
-#include "datapoollocal/SharedLocalDataSet.h"
-
-
-#endif /* FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ */

inc/fsfw/osal/host/Mutex.cpp

@@ -1,32 +0,0 @@
-#include "Mutex.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
-
-Mutex::Mutex() {}
-
-ReturnValue_t Mutex::lockMutex(TimeoutType timeoutType, uint32_t timeoutMs) {
-	if(timeoutType == TimeoutType::BLOCKING) {
-		mutex.lock();
-		return HasReturnvaluesIF::RETURN_OK;
-	}
-	else if(timeoutType == TimeoutType::POLLING) {
-		if(mutex.try_lock()) {
-			return HasReturnvaluesIF::RETURN_OK;
-		}
-	}
-	else if(timeoutType == TimeoutType::WAITING){
-		auto chronoMs = std::chrono::milliseconds(timeoutMs);
-		if(mutex.try_lock_for(chronoMs)) {
-			return HasReturnvaluesIF::RETURN_OK;
-		}
-	}
-	return MutexIF::MUTEX_TIMEOUT;
-}
-
-ReturnValue_t Mutex::unlockMutex() {
-	mutex.unlock();
-	return HasReturnvaluesIF::RETURN_OK;
-}
-
-std::timed_mutex* Mutex::getMutexHandle() {
-	return &mutex;
-}

inc/fsfw/osal/rtems/BinarySemaphore.h

@@ -1,21 +0,0 @@
-#ifndef FSFW_INC_FSFW_OSAL_RTEMS_BINARYSEMAPHORE_H_
-#define FSFW_INC_FSFW_OSAL_RTEMS_BINARYSEMAPHORE_H_
-
-#include "fsfw/tasks/SemaphoreIF.h"
-
-class BinarySemaphore: public SemaphoreIF {
-public:
-    BinarySemaphore();
-    virtual ~BinarySemaphore();
-
-    // Interface implementation
-    ReturnValue_t acquire(TimeoutType timeoutType =
-            TimeoutType::BLOCKING, uint32_t timeoutMs = 0) override;
-    ReturnValue_t release() override;
-    uint8_t getSemaphoreCounter() const override;
-private:
-};
-
-
-
-#endif /* FSFW_INC_FSFW_OSAL_RTEMS_BINARYSEMAPHORE_H_ */

src/CMakeLists.txt

@@ -1,3 +1,9 @@
-add_subdirectory(core)
-add_subdirectory(opt)
-add_subdirectory(osal)
+target_include_directories(${LIB_FSFW_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_include_directories(${LIB_FSFW_NAME} INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_subdirectory(fsfw)

src/core/devicehandlers/CMakeLists.txt

@@ -1,10 +0,0 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    AssemblyBase.cpp
-    ChildHandlerBase.cpp
-    ChildHandlerFDIR.cpp
-    DeviceHandlerBase.cpp
-    DeviceHandlerFailureIsolation.cpp
-    DeviceHandlerMessage.cpp
-    DeviceTmReportingWrapper.cpp
-    HealthDevice.cpp
-)

src/core/housekeeping/CMakeLists.txt

@@ -1,4 +0,0 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
-    HousekeepingMessage.cpp
-    PeriodicHousekeepingHelper.cpp
-)

src/fsfw/CMakeLists.txt

@@ -1,3 +1,5 @@
+# Core
+
 add_subdirectory(action)
 add_subdirectory(container)
 add_subdirectory(controller)
@@ -26,3 +28,16 @@ add_subdirectory(thermal)
 add_subdirectory(timemanager)
 add_subdirectory(tmtcpacket)
 add_subdirectory(tmtcservices)
+
+# Optional
+
+add_subdirectory(coordinates)
+add_subdirectory(datalinklayer)
+add_subdirectory(monitoring)
+add_subdirectory(pus)
+add_subdirectory(rmap)
+add_subdirectory(tmstorage)
+
+# OSAL
+
+add_subdirectory(osal)

src/fsfw/action.h

@@ -0,0 +1,11 @@
+#ifndef FSFW_INC_FSFW_ACTION_H_
+#define FSFW_INC_FSFW_ACTION_H_
+
+#include "fsfw/action/ActionHelper.h"
+#include "fsfw/action/ActionMessage.h"
+#include "fsfw/action/CommandActionHelper.h"
+#include "fsfw/action/HasActionsIF.h"
+#include "fsfw/action/CommandsActionsIF.h"
+#include "fsfw/action/SimpleActionHelper.h"
+
+#endif /* FSFW_INC_FSFW_ACTION_H_ */