Diff: src/ConfigurationHandler/Controls/TimerControl.h

Revision:

217:d5a2ff093319

Parent:

157:0d79678ed00f

Child:

262:696cd48bb04a

--- a/src/ConfigurationHandler/Controls/TimerControl.h	Mon Oct 10 16:07:40 2016 +0000
+++ b/src/ConfigurationHandler/Controls/TimerControl.h	Tue Oct 11 12:24:28 2016 +0000
@@ -42,34 +42,54 @@
     }
     // load a control from the control file
     bool load(std::string filename);
+    
+    // start the timer control
+    void start(void);
+    
+    // update the timer control (state machine)
+    TimerError_t update(void);
 
+    // start the timer
+    bool timerStart(void);
+    
+    // stop the timer
+    bool timerStop(void);
+
+    // start a feed
+    void startFeed(void);
+    
+    // stop a feed
+    void stopFeed(void);
+
+    // unregister the control with the output task
+    void unregisterControl(void);
+
+    // display the timer control     
     void display(void);
 
     std::string getControlFile(void) const {
         return controlFile;
     }
-
+    
+    std::string getId(void) const {
+        return id;
+    }
+    
     std::string getOutput(void) const {
         return output;
     }
-
-    unsigned long getStartTime() const {
-        return startTime;
+    
+    unsigned int getPriority(void) const {
+        return priority;
     }
 
-    bool timerStart(void);
-    bool timerStop(void);
-
-    void startFeed(void);
-    void stopFeed(void);
-
-    void start(void);
-    TimerError_t update(void);
-
-    void cleanup(void);
-
-    // unregister the control with the output task
-    void unregisterControl(void);
+    unsigned long getStartTime(void) const {
+        return startTime;
+    }
+    
+    unsigned int getDuration(void) const {
+        return duration;
+    }
 
     State getCurrentState(void) const {
         return currentState;