Diff: measurement/TemperatureMeasurement.cpp

Revision:

73:313975bfec96

Parent:

72:c5709ae7b193

Child:

74:ca3001991fdc

--- a/measurement/TemperatureMeasurement.cpp	Mon Feb 16 13:15:52 2015 +0000
+++ b/measurement/TemperatureMeasurement.cpp	Tue Feb 17 16:31:30 2015 +0000
@@ -6,14 +6,19 @@
 #include "logging.h"
 
 #define THRESHOLD_PERCENT_TEMP 0.05       // Percentage cut-off for avoiding sending similar temperature sensor data.
-#define TIME_LIMIT_TEMP 900               // Time interval for forcing a sending even if analog sensor readings are constantly similar.
+// Time interval for forcing a sending even if analog sensor readings are constantly similar (in seconds).
+#define TIME_LIMIT_TEMP 900               
 
-TemperatureMeasurement::TemperatureMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, LM75B& sensor) :
+TemperatureMeasurement::TemperatureMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, LM75B& sensor, 
+    DeviceIO& io, DeviceInfo& deviceInfo, DeviceBootstrap& bootstrap) :
     _client(client),
     _tpl(tpl),
     _deviceId(deviceId),
     _sensor(sensor),
-    oldValue(0)
+    oldValue(0),
+    _io(io),
+    _deviceInfo(deviceInfo),
+    _bootstrap(bootstrap)
 {
     _init = false;
     sendingTimer.start();
@@ -41,15 +46,23 @@
 
     float data = 0;
     data = _sensor.temp();
+    char tenant[25] = {0};
+    snprintf(tenant, 25, "Tenant: %s", _bootstrap.username());
+    char signal[25] = {0};
+    snprintf(signal, 25, "Network: %d dBm", _deviceInfo.signalQuality()->rssi);
     if (abs(oldValue-data) <= abs(oldValue)*THRESHOLD_PERCENT_TEMP) {
         if (sendingTimer.read() < TIME_LIMIT_TEMP) {
-            aInfo("Similar temperature readings found, no sending!\r\n");
+            aDebug("Similar temperature readings found, no sending!\r\n");
+            _io.lcdPrint(tenant, signal);
             return true;
         } else {
-            aInfo("Sending timer of temperature sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
+            aDebug("Sending timer of temperature sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
         } 
     }
 
+    char status[25] = {0};
+    snprintf(status, 25, "Sending Temp %.1f", data);
+    _io.lcdPrint(tenant, signal, status);
     ComposedRecord record;
     IntegerValue msgId(105);
     IntegerValue devId(_deviceId);
@@ -57,14 +70,16 @@
     if ((!record.add(msgId)) || (!record.add(devId)) || (!record.add(temperature)))
         return false;
 
+    float t_start = sendingTimer.read();
     if (_client.send(record) != SMARTREST_SUCCESS) {
         aError("Signal measurement failed.\r\n");
         _client.stop();
         return false;
     }
+    float t_end = sendingTimer.read();
     _client.stop();
+    aInfo("Acceleration readings sent in %.1f.\r\n", t_end-t_start);
     oldValue = data;
     sendingTimer.reset();
-    aInfo("Temperature readings sent.\r\n");
     return true;
 }