!chore: merged in consoldated scheduler

CMakeLists.txt

@@ -23,6 +23,7 @@ set(GTEST_SOURCE_FILES
     src/antara_scheduler.cpp
     src/charlie_scheduler.cpp
     tests/fixed_google_tests.cpp
+    src/scheduler.cpp
     #tests/file_google_tests.cpp
     #tests/overlap_google_tests.cpp
     tests/scheduler_test_flog.cpp
@@ -32,6 +33,7 @@ set(EXAMINE_BEHAVIOR_SOURCE_FILES
     tests/test_ensembles.cpp
     src/charlie_scheduler.cpp
     src/antara_scheduler.cpp
+    src/scheduler.cpp
     tests/scheduler_test_flog.cpp
     tests/examine_behavior.cpp
 )

src/abstractScheduler.hpp

@@ -2,7 +2,7 @@
 #define __ABSTRACT_SCHEDULER_HPP__
 #include <cstdint>
 #include "deploymentSchedule.hpp"
-
+#include <cstdint>
 
 
 class AbstractScheduler {
@@ -25,8 +25,16 @@ class AbstractScheduler {
      * @return 0 if successful, otherwise error code to be defined by
      * implementation
      */
-    virtual int getNextTask(DeploymentSchedule_t** p_next_task,
+    virtual SCH_error_e getNextTask(DeploymentSchedule_t** p_next_task,
                     std::uint32_t* p_next_runtime,
                     std::uint32_t current_time) = 0;
 };
+
+typedef enum error_
+{
+    SUCCESS,
+    TASK_SEARCH_FAIL,
+    FLOG_SCHEDULER_DELAY_EXCEEDED
+}SCH_error_e;
+
 #endif // __ABSTRACT_SCHEDULER_HPP__

src/antara_scheduler.hpp

@@ -57,11 +57,7 @@ class Scheduler : public AbstractScheduler
                     std::uint32_t current_time);
     void initializeScheduler();
 };
-typedef enum error_
-{
-    SUCCESS,
-    TASK_SEARCH_FAIL,
-}SCH_error_e;
+
 
 
 #endif

src/charlie_scheduler.hpp

@@ -132,11 +132,7 @@ class Scheduler : public AbstractScheduler {
 
 };
 
-typedef enum error_
-{
-    SUCCESS,
-    TASK_SEARCH_FAIL,
-}SCH_error_e;
+
 
 
 

src/ensembles.hpp

@@ -5,11 +5,8 @@
 
 #ifndef __ENSEMBLES_HPP__
 #define __ENSEMBLES_HPP__
-
-#if SCHEDULER_VERSION == CHARLIE_VERSION
 #include "charlie_scheduler.hpp"
-#else
 #include "antara_scheduler.hpp"
-#endif
+#include "scheduler.hpp"
 
-#endif
+#endif //__ENSEMBLES_HPP__

src/rideTask.cpp

@@ -15,11 +15,9 @@
 #include "vers.hpp"
 #include "ensembles.hpp"
 #include "cli/flog.hpp"
-#if SCHEDULER_VERSION == CHARLIE_VERSION
 #include "charlie_scheduler.hpp"
-#else
 #include "antara_scheduler.hpp"
-#endif
+#include "scheduler.hpp"
 
 /**
  * @brief creates file name for log

src/scheduler.cpp

@@ -10,6 +10,7 @@
 #else
 #include "scheduler_test_system.hpp"
 #endif
+#include <cstdint>
 #include "cli/conio.hpp"
 #include "ensembles.hpp"
 #include "scheduler.hpp"
@@ -35,7 +36,7 @@ void Scheduler::initializeScheduler()
         tableSize++;
         memset(&(pDeployment->state), 0, 
             sizeof(StateInformation));
-        pDeployment->state.lastMeasurementTime = UINT32_MAX;
+
         pDeployment->init(pDeployment);
         pDeployment++;
     }
@@ -88,7 +89,7 @@ int Scheduler::getNextTask(DeploymentSchedule_t** p_nextEvent,
         {
             delay = 0;
         }
-        if (delay == currentEvent.maxDelay)
+        if (delay >= currentEvent.maxDelay)
         {
             //send warning
         }

src/scheduler.hpp

@@ -5,7 +5,7 @@
  * @version 1
  */
 #ifndef __CONSOLODATED_SCHEDULER__HPP__
-#define __CHARLIE_SCHEDULER__HPP__
+#define __CONSOLODATED_SCHEDULER__HPP__
 #include "product.hpp"
 #if SCHEDULER_VERSION == CONSOLODATED_VERSION
 
@@ -19,7 +19,7 @@
 #include "Particle.h"
 #else
 #include "scheduler_test_system.hpp"
-#endif
+#endif // TEST_VERSION
 
 
 /**
@@ -50,11 +50,10 @@ typedef void (*EnsembleInit)(DeploymentSchedule_t* pDeployment);
 struct StateInformation
 {
     //! how many times ensemble was scheduled
-    uint32_t measurementCount;
-    
+    std::uint32_t measurementCount;
+
     //! store the next time the task should run
-    uint32_t nextRunTime;
-
+    std::uint32_t nextRunTime;
 
 };
 /**
@@ -91,7 +90,7 @@ class Scheduler : public AbstractScheduler {
     DeploymentSchedule_t* scheduleTable;
 
 
-
+    
 
     Scheduler(DeploymentSchedule_t* scheduler);
 
@@ -116,31 +115,13 @@ class Scheduler : public AbstractScheduler {
      * @param nextStartTime The proposed start time of the current task.
      * @return True if there is an overlap with another task; false otherwise.
      */
-    int getNextTask(DeploymentSchedule_t** p_next_task,
+    SCH_error_e getNextTask(DeploymentSchedule_t** p_next_task,
                     uint32_t* p_next_runtime,
                     uint32_t current_time);
 
     bool willOverlap(uint32_t i, system_tick_t currentTime, 
                                                 uint32_t nextStartTime);
 
 };
-
-typedef enum error_
-{
-    SUCCESS,
-    TASK_SEARCH_FAIL,
-}SCH_error_e;
-
-
-
-
-
-
-
-
-
-
-
-#endif 
-
-#endif //__CHARLIE_SCHEDULER__HPP__
+#endif //SCHEDULER_VERSION
+#endif //__CONSOLODATED_SCHEDULER__HPP__