inc/fsfw/osal/freertos/BinSemaphUsingTask.h

@@ -1,8 +1,8 @@
 #ifndef FSFW_OSAL_FREERTOS_BINSEMAPHUSINGTASK_H_
 #define FSFW_OSAL_FREERTOS_BINSEMAPHUSINGTASK_H_
 
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
-#include "../../tasks/SemaphoreIF.h"
+#include "fsfw/tasks/SemaphoreIF.h"
 
 #include "FreeRTOS.h"
 #include "task.h"

inc/fsfw/osal/freertos/BinarySemaphore.h

@@ -1,8 +1,8 @@
 #ifndef FSFW_OSAL_FREERTOS_BINARYSEMPAHORE_H_
 #define FSFW_OSAL_FREERTOS_BINARYSEMPAHORE_H_
 
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
-#include "../../tasks/SemaphoreIF.h"
+#include "fsfw/tasks/SemaphoreIF.h"
 
 #include "FreeRTOS.h"
 #include "semphr.h"

inc/fsfw/osal/freertos/CountingSemaphUsingTask.h

@@ -2,7 +2,7 @@
 #define FSFW_OSAL_FREERTOS_COUNTINGSEMAPHUSINGTASK_H_
 
 #include "CountingSemaphUsingTask.h"
-#include "../../tasks/SemaphoreIF.h"
+#include "fsfw/tasks/SemaphoreIF.h"
 
 #include "FreeRTOS.h"
 #include "task.h"

inc/fsfw/osal/freertos/FixedTimeslotTask.h

@@ -2,9 +2,9 @@
 #define FSFW_OSAL_FREERTOS_FIXEDTIMESLOTTASK_H_
 
 #include "FreeRTOSTaskIF.h"
-#include "../../tasks/FixedSlotSequence.h"
+#include "fsfw/tasks/FixedSlotSequence.h"
-#include "../../tasks/FixedTimeslotTaskIF.h"
+#include "fsfw/tasks/FixedTimeslotTaskIF.h"
-#include "../../tasks/Typedef.h"
+#include "fsfw/tasks/Typedef.h"
 
 #include "FreeRTOS.h"
 #include "task.h"

inc/fsfw/osal/freertos/MessageQueue.h

@@ -3,10 +3,10 @@
 
 #include "TaskManagement.h"
 
-#include "../../internalError/InternalErrorReporterIF.h"
+#include "fsfw/internalerror/InternalErrorReporterIF.h"
-#include "../../ipc/MessageQueueIF.h"
+#include "fsfw/ipc/MessageQueueIF.h"
-#include "../../ipc/MessageQueueMessageIF.h"
+#include "fsfw/ipc/MessageQueueMessageIF.h"
-#include "../../ipc/MessageQueueMessage.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
 
 #include "FreeRTOS.h"
 #include "queue.h"

inc/fsfw/osal/freertos/Mutex.h

@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_FREERTOS_MUTEX_H_
 #define FRAMEWORK_FREERTOS_MUTEX_H_
 
-#include "../../ipc/MutexIF.h"
+#include "fsfw/ipc/MutexIF.h"
 
 #include "FreeRTOS.h"
 #include "semphr.h"

inc/fsfw/osal/freertos/PeriodicTask.h

@@ -2,9 +2,9 @@
 #define FSFW_OSAL_FREERTOS_PERIODICTASK_H_
 
 #include "FreeRTOSTaskIF.h"
-#include "../../objectmanager/ObjectManagerIF.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
-#include "../../tasks/PeriodicTaskIF.h"
+#include "fsfw/tasks/PeriodicTaskIF.h"
-#include "../../tasks/Typedef.h"
+#include "fsfw/tasks/Typedef.h"
 
 #include "FreeRTOS.h"
 #include "task.h"

inc/fsfw/osal/freertos/QueueMapManager.h

@@ -1,9 +1,9 @@
 #ifndef FSFW_OSAL_FREERTOS_QUEUEMAPMANAGER_H_
 #define FSFW_OSAL_FREERTOS_QUEUEMAPMANAGER_H_
 
-#include "../../ipc/MutexIF.h"
+#include "fsfw/ipc/MutexIF.h"
-#include "../../ipc/messageQueueDefinitions.h"
+#include "fsfw/ipc/messageQueueDefinitions.h"
-#include "../../ipc/MessageQueueIF.h"
+#include "fsfw/ipc/MessageQueueIF.h"
 
 #include "FreeRTOS.h"
 #include "queue.h"

inc/fsfw/tasks/SemaphoreFactory.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_TASKS_SEMAPHOREFACTORY_H_
 #define FSFW_TASKS_SEMAPHOREFACTORY_H_
 
-#include "../tasks/SemaphoreIF.h"
+#include "fsfw/tasks/SemaphoreIF.h"
 
 /**
  * Creates Semaphore.

src/osal/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Check the OS_FSFW variable
 if(FSFW_OSAL MATCHES "freertos")
-    add_subdirectory(FreeRTOS)
+    add_subdirectory(freertos)
 elseif(FSFW_OSAL MATCHES "rtems")
     add_subdirectory(rtems)
 elseif(FSFW_OSAL MATCHES "linux")

src/osal/freertos/BinSemaphUsingTask.cpp

@@ -1,6 +1,6 @@
-#include "BinSemaphUsingTask.h"
+#include "fsfw/osal/freertos/BinSemaphUsingTask.h"
-#include "TaskManagement.h"
+#include "fsfw/osal/freertos/TaskManagement.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || \
     tskKERNEL_VERSION_MAJOR > 8

src/osal/freertos/BinarySemaphore.cpp

@@ -1,6 +1,6 @@
-#include "BinarySemaphore.h"
+#include "fsfw/osal/freertos/BinarySemaphore.h"
-#include "TaskManagement.h"
+#include "fsfw/osal/freertos/TaskManagement.h"
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 BinarySemaphore::BinarySemaphore() {
 	handle = xSemaphoreCreateBinary();

src/osal/freertos/Clock.cpp

@@ -1,13 +1,13 @@
-#include "Timekeeper.h"
+#include "fsfw/osal/freertos/Timekeeper.h"
 
-#include "../../timemanager/Clock.h"
+#include "fsfw/timemanager/Clock.h"
-#include "../../globalfunctions/timevalOperations.h"
+#include "fsfw/globalfunctions/timevalOperations.h"
 
 #include "FreeRTOS.h"
 #include "task.h"
 
-#include <stdlib.h>
+#include <cstdlib>
-#include <time.h>
+#include <ctime>
 
 //TODO sanitize input?
 //TODO much of this code can be reused for tick-only systems

src/osal/freertos/CountingSemaphUsingTask.cpp

@@ -1,7 +1,7 @@
-#include "CountingSemaphUsingTask.h"
+#include "fsfw/osal/freertos/CountingSemaphUsingTask.h"
-#include "TaskManagement.h"
+#include "fsfw/osal/freertos/TaskManagement.h"
 
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || \
     tskKERNEL_VERSION_MAJOR > 8

src/osal/freertos/CountingSemaphore.cpp

@@ -1,7 +1,7 @@
-#include "CountingSemaphore.h"
+#include "fsfw/osal/freertos/CountingSemaphore.h"
-#include "TaskManagement.h"
+#include "fsfw/osal/freertos/TaskManagement.h"
 
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 #include "FreeRTOS.h"
 #include "semphr.h"

src/osal/freertos/FixedTimeslotTask.cpp

@@ -1,7 +1,7 @@
-#include "FixedTimeslotTask.h"
+#include "fsfw/osal/freertos/FixedTimeslotTask.h"
 
-#include "../../objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/ObjectManager.h"
-#include "../../serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 uint32_t FixedTimeslotTask::deadlineMissedCount = 0;
 const size_t PeriodicTaskIF::MINIMUM_STACK_SIZE = configMINIMAL_STACK_SIZE;

src/osal/freertos/MessageQueue.cpp

@@ -1,5 +1,6 @@
-#include "MessageQueue.h"
+#include "fsfw/osal/freertos/MessageQueue.h"
-#include "QueueMapManager.h"
+#include "fsfw/osal/freertos/QueueMapManager.h"
+
 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 

src/osal/freertos/Mutex.cpp

@@ -1,6 +1,6 @@
-#include "Mutex.h"
+#include "fsfw/osal/freertos/Mutex.h"
 
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
 
 Mutex::Mutex() {
 	handle = xSemaphoreCreateMutex();

src/osal/freertos/MutexFactory.cpp

@@ -1,6 +1,6 @@
-#include "Mutex.h"
+#include "fsfw/osal/freertos/Mutex.h"
 
-#include "../../ipc/MutexFactory.h"
+#include "fsfw/ipc/MutexFactory.h"
 
 
 //TODO: Different variant than the lazy loading in QueueFactory.

src/osal/freertos/PeriodicTask.cpp

@@ -1,8 +1,8 @@
-#include "PeriodicTask.h"
+#include "fsfw/osal/freertos/PeriodicTask.h"
 
-#include "../../objectmanager/ObjectManager.h"
+#include "fsfw/objectmanager/ObjectManager.h"
-#include "../../serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
-#include "../../tasks/ExecutableObjectIF.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
 
 PeriodicTask::PeriodicTask(const char *name, TaskPriority setPriority,
 		TaskStackSize setStack, TaskPeriod setPeriod,

src/osal/freertos/QueueFactory.cpp

@@ -1,7 +1,7 @@
-#include "MessageQueue.h"
+#include "fsfw/osal/freertos/MessageQueue.h"
 
-#include "../../ipc/MessageQueueSenderIF.h"
+#include "fsfw/ipc/MessageQueueSenderIF.h"
-#include "../../ipc/QueueFactory.h"
+#include "fsfw/ipc/QueueFactory.h"
 
 
 QueueFactory* QueueFactory::factoryInstance = nullptr;

src/osal/freertos/QueueMapManager.cpp

@@ -1,6 +1,6 @@
-#include "QueueMapManager.h"
+#include "fsfw/osal/freertos/QueueMapManager.h"
-#include "../../ipc/MutexFactory.h"
+#include "fsfw/ipc/MutexFactory.h"
-#include "../../ipc/MutexGuard.h"
+#include "fsfw/ipc/MutexGuard.h"
 
 QueueMapManager* QueueMapManager::mqManagerInstance = nullptr;
 

src/osal/freertos/SemaphoreFactory.cpp

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

src/osal/freertos/TaskFactory.cpp

@@ -1,9 +1,8 @@
-#include "../../tasks/TaskFactory.h"
+#include "fsfw/tasks/TaskFactory.h"
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/osal/freertos/PeriodicTask.h"
-
+#include "fsfw/osal/freertos/FixedTimeslotTask.h"
-#include "PeriodicTask.h"
-#include "FixedTimeslotTask.h"
 
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
 
 TaskFactory* TaskFactory::factoryInstance = new TaskFactory();
 

src/osal/freertos/TaskManagement.cpp

@@ -1,4 +1,4 @@
-#include "TaskManagement.h"
+#include "fsfw/osal/freertos/TaskManagement.h"
 
 void TaskManagement::vRequestContextSwitchFromTask() {
 	vTaskDelay(0);

src/osal/freertos/Timekeeper.cpp

@@ -1,4 +1,4 @@
-#include "Timekeeper.h"
+#include "fsfw/osal/freertos/Timekeeper.h"
 
 #include "FreeRTOSConfig.h"