Diff: src/ConfigurationHandler/Controls/SetpointControl.cpp

Revision:

96:807f04bd5256

Parent:

94:18ae2fd82638

Child:

115:1558e01d04c6

diff -r 42f92b03f1b8 -r 807f04bd5256 src/ConfigurationHandler/Controls/SetpointControl.cpp
--- a/src/ConfigurationHandler/Controls/SetpointControl.cpp	Tue Sep 20 19:58:36 2016 +0000
+++ b/src/ConfigurationHandler/Controls/SetpointControl.cpp	Wed Sep 21 12:54:41 2016 +0000
@@ -46,10 +46,10 @@
     // parse the json data
     parse(json_value, dataBuf);
 
-    id              = json_value["id"].get<string>();
+    id              = json_value     ["id"].get<string>();
     priority        = atoi(json_value["priority"].get<string>().c_str());
-    input           = json_value["input"].get<string>();
-    output          = json_value["output"].get<string>();
+    input           = json_value     ["input"].get<string>();
+    output          = json_value     ["output"].get<string>();
     setpoint        = atof(json_value["setpoint"].get<string>().c_str());
     productFactor   = atof(json_value["prodfact"].get<string>().c_str());
     actingDir       = atoi(json_value["actingDir"].get<string>().c_str());
@@ -57,6 +57,7 @@
     lowAlert        = atof(json_value["lalert"].get<string>().c_str());
     highFailsafe    = atof(json_value["hfs"].get<string>().c_str());
     lowFailsafe     = atof(json_value["lfs"].get<string>().c_str());
+    tolerance       = atof(json_value["tol"].get<string>().c_str());
 
     return true;        // object created successfully
 }
@@ -132,10 +133,10 @@
     float flimit;
 
     if ( !actingDir ) {
-        flimit = setpoint + (setpoint * .04);
+        flimit = setpoint + tolerance;
         return (value.value > flimit);
     } else {
-        flimit = setpoint - (setpoint * .04);
+        flimit = setpoint - tolerance; 
         return (value.value < flimit);
     }
 }
@@ -155,10 +156,10 @@
     float  flimit;
 
     if ( !actingDir ) {
-        flimit = setpoint - (setpoint * .04);
+        flimit = setpoint - tolerance; 
         return (value.value < flimit);
     } else {
-        flimit = setpoint + (setpoint * .04);
+        flimit = setpoint + tolerance;
         return (value.value > flimit);
     }
 }
@@ -247,7 +248,10 @@
     printf("\r           lalert : %0.2f\n", lowAlert);
     printf("\r              hfs : %0.2f\n", highFailsafe);
     printf("\r              lfs : %0.2f\n", lowFailsafe);
+    printf("\r              tol : %0.2f\n", tolerance); 
     printf("\r\n");
-    printf("\r      currentState: %s\n",    mapper[currentState].c_str());
+    printf("\r     currentState : %s\n",    mapper[currentState].c_str());
+    printf("\r        high band : %0.2f\n", setpoint + tolerance);
+    printf("\r         low band : %0.2f\n", setpoint - tolerance);
     printf("\r\n");
 }
\ No newline at end of file