Diff: measurement/SignalQualityMeasurement.cpp

Revision:

72:c5709ae7b193

Parent:

71:063c45e99578

Child:

73:313975bfec96

--- a/measurement/SignalQualityMeasurement.cpp	Mon Feb 16 09:17:30 2015 +0000
+++ b/measurement/SignalQualityMeasurement.cpp	Mon Feb 16 13:15:52 2015 +0000
@@ -3,6 +3,7 @@
 #include "CharValue.h"
 #include "IntegerValue.h"
 #include "FloatValue.h"
+#include "logging.h"
 
 #define THRESHOLD_PERCENT_SIG 0.05       // Percentage cut-off for avoiding sending similar signal sensor data.
 #define TIME_LIMIT_SIG 900               // Time interval for forcing a sending even if signal sensor readings are constantly similar.
@@ -46,10 +47,10 @@
     if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_SIG &&
         abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_SIG) {
         if (sendingTimer.read() < TIME_LIMIT_SIG) {
-            printf("Similar signal readings found, no sending!\r\n");
+            aInfo("Similar signal readings found, no sending!\r\n");
             return true;
         } else {
-            printf("Sending timer of signal sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
+            aInfo("Sending timer of signal sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
         } 
     }    
         
@@ -62,7 +63,7 @@
         return false;
 
     if (_client.send(record) != SMARTREST_SUCCESS) {
-        puts("Signal measurement failed.");
+        aError("Signal measurement failed.\r\n");
         _client.stop();
         return false;
     }
@@ -71,6 +72,6 @@
     oldValues[0] = data[0];
     oldValues[1] = data[1];
     sendingTimer.reset();
-    printf("Signal quality measurement sent.\r\n");
+    aInfo("Signal quality measurement sent.\r\n");
     return true;
 }