fixed merge conflicts

osal/FreeRTOS/CMakeLists.txt

@@ -22,10 +22,11 @@ target_sources(${LIB_FSFW_NAME}
 # FreeRTOS as a static library and set LIB_OS_NAME to the target name of the 
 # library.
 if(NOT LIB_OS_NAME)
-	message(FATAL_ERROR 
-		"FreeRTOS needs to be linked as a target and "
-		"LIB_OS_NAME needs to be set to the target"
+	message(STATUS
+		"LIB_OS_NAME is empty. Make sure to include the FreeRTOS header path properly."
 	)
+else()
+    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+        ${LIB_OS_NAME}
+    )
 endif()
-
-target_link_libraries(${LIB_FSWFW_NAME} ${LIB_OS_NAME})

osal/FreeRTOS/CountingSemaphore.cpp

@@ -3,6 +3,7 @@
 
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 
+#include "FreeRTOS.h"
 #include "semphr.h"
 
 // Make sure #define configUSE_COUNTING_SEMAPHORES 1 is set in

osal/FreeRTOS/MessageQueue.h

@@ -6,10 +6,13 @@
 #include "../../internalError/InternalErrorReporterIF.h"
 #include "../../ipc/MessageQueueIF.h"
 #include "../../ipc/MessageQueueMessageIF.h"
+#include "../../ipc/MessageQueueMessage.h"
+
+#include "FreeRTOS.h"
+#include "queue.h"
 
 #include "FreeRTOS.h"
 #include "queue.h"
-#include <fsfw/ipc/MessageQueueMessage.h>
 
 /**
  * @brief		This class manages sending and receiving of

osal/FreeRTOS/QueueMapManager.cpp

@@ -17,7 +17,13 @@ QueueMapManager* QueueMapManager::instance() {
 
 ReturnValue_t QueueMapManager::addMessageQueue(QueueHandle_t queue, MessageQueueId_t* id) {
     MutexGuard lock(mapLock);
-    uint32_t currentId = queueCounter++;
+    uint32_t currentId = queueCounter;
+    queueCounter++;
+    if(currentId == MessageQueueIF::NO_QUEUE) {
+        // Skip the NO_QUEUE value
+        currentId = queueCounter;
+        queueCounter++;
+    }
     auto returnPair = queueMap.emplace(currentId, queue);
     if(not returnPair.second) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1

osal/FreeRTOS/QueueMapManager.h

@@ -39,7 +39,7 @@ private:
     QueueMapManager();
     ~QueueMapManager();
 
-    uint32_t queueCounter = 0;
+    uint32_t queueCounter = MessageQueueIF::NO_QUEUE + 1;
     MutexIF* mapLock;
     QueueMap queueMap;
     static QueueMapManager* mqManagerInstance;

osal/FreeRTOS/SemaphoreFactory.cpp

@@ -1,9 +1,10 @@
-#include "../../osal/FreeRTOS/BinarySemaphore.h"
-#include "../../osal/FreeRTOS/BinSemaphUsingTask.h"
-#include "../../osal/FreeRTOS/CountingSemaphore.h"
-#include "../../osal/FreeRTOS/CountingSemaphUsingTask.h"
+#include "BinarySemaphore.h"
+#include "BinSemaphUsingTask.h"
+#include "CountingSemaphore.h"
+#include "CountingSemaphUsingTask.h"
+
 #include "../../tasks/SemaphoreFactory.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "../../serviceinterface/ServiceInterface.h"
 
 SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;
 

osal/FreeRTOS/TaskManagement.h

@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_OSAL_FREERTOS_TASKMANAGEMENT_H_
-#define FRAMEWORK_OSAL_FREERTOS_TASKMANAGEMENT_H_
+#ifndef FSFW_OSAL_FREERTOS_TASKMANAGEMENT_H_
+#define FSFW_OSAL_FREERTOS_TASKMANAGEMENT_H_
 
 #include "../../returnvalues/HasReturnvaluesIF.h"
 

osal/FreeRTOS/Timekeeper.cpp

@@ -1,6 +1,6 @@
 #include "Timekeeper.h"
 
-#include <FreeRTOSConfig.h>
+#include "FreeRTOSConfig.h"
 
 Timekeeper * Timekeeper::myinstance = nullptr;