osal/FreeRTOS/Clock.cpp

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

osal/FreeRTOS/Timekeeper.cpp

@@ -1,13 +1,6 @@
-/**
- * @file Timekeeper.cpp
- * @date
- */
-
 #include <framework/osal/FreeRTOS/Timekeeper.h>
 
-extern "C" {
-#include <task.h>
-}
+#include "FreeRTOSConfig.h"
 
 Timekeeper * Timekeeper::myinstance = nullptr;
 

osal/FreeRTOS/Timekeeper.h

@@ -3,7 +3,8 @@
 
 #include <framework/timemanager/Clock.h>
 extern "C" {
-#include <FreeRTOS.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
 }