Diff: src/ConfigurationHandler/Controls/SetpointControl.h

Revision:

28:c410a61238bb

Parent:

20:653923c2f37a

Child:

30:738359dfdab1

--- a/src/ConfigurationHandler/Controls/SetpointControl.h	Thu Sep 08 15:32:50 2016 +0000
+++ b/src/ConfigurationHandler/Controls/SetpointControl.h	Thu Sep 08 20:12:04 2016 +0000
@@ -7,6 +7,7 @@
 #ifndef SETPOINTCONTROL_H
 #define SETPOINTCONTROL_H
 
+#include "MbedJSONValue.h"
 #include <string>
 using namespace std;
 
@@ -16,30 +17,63 @@
     string          controlFile;        // name of the control file
     string          id;                 // control identifier
     string          name;               // friendly name
-    unsigned int    priority;           // control priority
+    int             priority;           // control priority
     string          input;              // control input
-    string          output;             // control output 
-    float           productFactor;      
-    float           highAlert;
-    float           highFailsafe;
-    float           lowFailsafe;
-    float           tol;
-    
+    string          output;             // control output
+    double           productFactor;
+    double           highAlert;
+    double           lowAlert;
+    double           highFailsafe;
+    double           lowFailsafe;
+    double           tol;
+
+    MbedJSONValue json_value;
+
 public:
     // constructor
     SetpointControl() {};
     ~SetpointControl() {
         printf("\r%s destructor invoked\n", __func__);
-    } 
-    
-    // Load a control from the control file 
-    bool Load(string filename); 
-    
+    }
+
+    // Load a control from the control file
+    bool load(string filename);
+
     string getControlFile(void) {
         return controlFile;
     }
-    void setControLFile(string _controlFile) {
-        controlFile = _controlFile;
+    string getId(void) {
+        return id;
+    }
+    string getName(void) {
+        return name;
+    }
+    unsigned int getPriority(void) {
+        return priority;
+    }
+    string getInput(void) {
+        return input;
+    }
+    string getOutput(void) {
+        return output;
+    }
+    float getProductFactor(void) {
+        return productFactor;
+    }
+    float getHighAlert(void) {
+        return highAlert;
+    }
+    float getLowAlert(void) {
+        return lowAlert;
+    }
+    float getHighFailsafe(void) {
+        return highFailsafe;
+    }
+    float getLowFailsafe(void) {
+        return lowFailsafe;
+    }
+    float getTol(void) {
+        return tol;
     }
 };