Diff: src/ConfigurationHandler/Controls/ManualControl.cpp

Revision:

205:3c84af5f711f

Parent:

195:21df85341cb3

Child:

217:d5a2ff093319

diff -r d6011a00bfb8 -r 3c84af5f711f src/ConfigurationHandler/Controls/ManualControl.cpp
--- a/src/ConfigurationHandler/Controls/ManualControl.cpp	Fri Oct 07 14:47:39 2016 +0000
+++ b/src/ConfigurationHandler/Controls/ManualControl.cpp	Fri Oct 07 17:41:23 2016 +0000
@@ -10,6 +10,8 @@
 #include "ModbusMasterApi.h"
 #include "global.h"
 #include <string>
+#include <iostream>
+#include <iomanip>
 
 extern mDot *GLOBAL_mdot;
 
@@ -184,16 +186,16 @@
                         "CONTROL_ON",
                         "CONTROL_OFF"
                       };
-
-    printf("\r      controlFile : %s   \n", controlFile.c_str());
-    printf("\r               id : %s   \n", id.c_str());
-    printf("\r             type : %u   \n", type);
-    printf("\r         priority : %u   \n", priority);
-    printf("\r         duration : %u   \n", duration);
-    printf("\r            state : %u   \n", state);
-    printf("\r          percent : %u   \n", percent);
-    printf("\r      currentState: %s   \n", mapper[currentState].c_str());
-
+                      
     printf("\r\n");
-
+    std::cout << left << setw(10) << setfill(' ') << "manual: ";
+    std::cout << left << setw(32) << setfill(' ') << controlFile;
+    std::cout << left << setw(20) << setfill(' ') << id;
+    std::cout << left << setw(20) << setfill(' ') << output;
+    std::cout << left << setw(6)  << setfill(' ') << type;
+    std::cout << left << setw(6)  << setfill(' ') << priority;
+    std::cout << left << setw(8)  << setfill(' ') << duration;
+    std::cout << left << setw(8)  << setfill(' ') << percent;
+    std::cout << left << setw(16) << setfill(' ') << mapper[currentState];
+    std::cout.flush();
 }
\ No newline at end of file