Diff: src/ConfigurationHandler/ConfigurationHandler.cpp

Revision:

28:c410a61238bb

Parent:

20:653923c2f37a

Child:

37:7e6986b77f01

--- a/src/ConfigurationHandler/ConfigurationHandler.cpp	Thu Sep 08 15:32:50 2016 +0000
+++ b/src/ConfigurationHandler/ConfigurationHandler.cpp	Thu Sep 08 20:12:04 2016 +0000
@@ -85,7 +85,8 @@
         for ( pos = timerTable.begin();
                 pos != timerTable.end();
                 ++pos ) {
-            printf("\r  control file: %32s\n", pos->second->getControlFile().c_str());
+            printf("\r  control file: %32s\n", 
+                pos->second->getControlFile().c_str());
         }
     }
     if ( !setpointTable.empty() ) {
@@ -94,7 +95,19 @@
         for ( pos = setpointTable.begin();
                 pos != setpointTable.end();
                 ++pos ) {
-            printf("\r  control file: %32s\n", pos->second->getControlFile().c_str());
+            printf("\r      controlFile : %s   \n", pos->second->getControlFile().c_str());
+            printf("\r               id : %s   \n", pos->second->getId().c_str());
+            printf("\r             name : %s   \n", pos->second->getName().c_str());
+            printf("\r         priority : %d   \n", pos->second->getPriority());
+            printf("\r            input : %s   \n", pos->second->getInput().c_str());
+            printf("\r           output : %s   \n", pos->second->getOutput().c_str());
+            printf("\r         prodfact : %0.2f\n", pos->second->getProductFactor());
+            printf("\r           halert : %0.2f\n", pos->second->getHighAlert());
+            printf("\r           lalert : %0.2f\n", pos->second->getLowAlert());
+            printf("\r              hfs : %0.2f\n", pos->second->getHighFailsafe());
+            printf("\r              lfs : %0.2f\n", pos->second->getLowFailsafe());
+            printf("\r              tol : %0.2f\n", pos->second->getTol());
+            printf("\r\n");
         }
     }
 }
@@ -131,7 +144,7 @@
     switch (msg->control) {
         case CONTROL_SETPOINT: {
             SetpointControl *setpointControl = new SetpointControl();
-            bool rc = setpointControl->Load(msg->controlFile);
+            bool rc = setpointControl->load(msg->controlFile);
             if ( rc != true ) {
                 logError("%s: failed to load %s\n", __func__, msg->controlFile);
                 delete setpointControl;
@@ -142,7 +155,7 @@
         }
         case CONTROL_TIMER: {
             TimerControl *timerControl = new TimerControl();
-            bool rc = timerControl->Load(msg->controlFile);
+            bool rc = timerControl->load(msg->controlFile);
             if ( rc != true ) {
                 logError("%s: failed to load %s\n", __func__, msg->controlFile);
                 delete timerControl;