Diff: src/ConfigurationHandler/Controls/CompositeControl.cpp

Revision:

222:94ea9a091d99

Parent:

221:2a5e9902003c

Child:

227:7153e89b6974

--- a/src/ConfigurationHandler/Controls/CompositeControl.cpp	Fri Oct 14 21:30:21 2016 +0000
+++ b/src/ConfigurationHandler/Controls/CompositeControl.cpp	Mon Oct 17 13:01:37 2016 +0000
@@ -26,9 +26,6 @@
     MbedJSONValue json_value;           // JSON parsing element
     controlFile = _controlFile;
 
-    printf("\rDEBUG: attempting to load the composite control\n");
-    Thread::wait(500);
-
     // open and read from the control file
     mDot::mdot_file file = GLOBAL_mdot->openUserFile(controlFile.c_str(), mDot::FM_RDONLY);
     if ( file.fd < 0 ) {
@@ -67,6 +64,7 @@
 
     int entries = atoi(json_value["entries"].get<string>().c_str());
 
+    // populate the outputs 
     for ( int i = 0; i < entries; ++i ) {
         std::string tag = json_value["outputs"][i]["tag"].get<string>();
         std::string response = json_value["outputs"][i]["responseA"].get<string>();
@@ -78,8 +76,6 @@
         }
     }
 
-    printf("RETURN TRUE\n");
-
     return true;
 }
 
@@ -240,8 +236,8 @@
 //
 void CompositeControl::sendMail(const std::string io_tag, OutputAction action)
 {
-    logInfo("%s: %s attempting to start feed on relay %s\n",
-            __func__, controlFile.c_str(), tag.c_str());
+    logInfo("%s: composite control attempting to send action %d\n",
+            __func__, action);
 
     OutputControlMsg_t *output_mail = OutputMasterMailBox.alloc();
     memset(output_mail, 0, sizeof(OutputControlMsg_t));