Modified getTimeout() and setTimeout()

Author: wizard97

src/ProcessScheduler/Config.h

@@ -8,7 +8,7 @@
 
 /* Uncomment this to allow the scheduler to interrupt long running processes */
 // This requires _PROCESS_EXCEPTION_HANDLING to also be enabled
-//#define _PROCESS_TIMEOUT_INTERRUPTS
+#define _PROCESS_TIMEOUT_INTERRUPTS
 
 /* Uncomment this to allow Process timing statistics functionality */
 #define _PROCESS_STATISTICS

src/ProcessScheduler/Includes.h

@@ -18,6 +18,20 @@ typedef enum ProcessWarning
 #endif
 } ProcessWarning;
 
+// Process period
+#define SERVICE_CONSTANTLY 0
+#define SERVICE_SECONDLY 1000
+#define SERVICE_MINUTELY 60000
+#define SERVICE_HOURLY 3600000
+
+// Number of Processs
+#define RUNTIME_FOREVER -1
+#define RUNTIME_ONCE 1
+
+#define PROCESS_NO_TIMEOUT 0
+
+#define OVERSCHEDULED_NO_WARNING 0
+
 // PICK INT VALUES PEOPLE UNLIKLEY TO USE
 #define LONGJMP_ISR_CODE -1000
 #define LONGJMP_YIELD_CODE -1001

src/ProcessScheduler/Process.cpp

@@ -14,6 +14,9 @@
         this->_force = false;
         this->_overSchedThresh = overSchedThresh;
         this->_pBehind = 0;
+#ifdef _PROCESS_TIMEOUT_INTERRUPTS
+        setTimeout(PROCESS_NO_TIMEOUT);
+#endif
     }
 
 

src/ProcessScheduler/Process.h

@@ -4,18 +4,6 @@
 #include "Includes.h"
 #include "Scheduler.h"
 
-// Process period
-#define SERVICE_CONSTANTLY 0
-#define SERVICE_SECONDLY 1000
-#define SERVICE_MINUTELY 60000
-#define SERVICE_HOURLY 3600000
-
-// Number of Processs
-#define RUNTIME_FOREVER -1
-#define RUNTIME_ONCE 1
-
-#define OVERSCHEDULED_NO_WARNING 0
-
 class Scheduler;
 
 
@@ -51,9 +39,6 @@ class Process
 
     inline ProcPriority getPriority() { return _pLevel; }
 
-    // Timeout
-    virtual uint32_t getTimeout() { return 0; };
-
 protected:
     inline uint32_t getStartDelay() { return _actualTS - _scheduledTS; }
     // Fired on creation/destroy
@@ -112,6 +97,12 @@ class Process
 
 #ifdef _PROCESS_TIMEOUT_INTERRUPTS
 
+public:
+    inline uint32_t getTimeout() {return _timeout;}
+protected:
+    inline void setTimeout(uint32_t timeout) { _timeout = timeout; }
+private:
+    uint32_t _timeout;
 
 #endif