Diff: measurement/AccelerationMeasurement.cpp

Revision:

73:313975bfec96

Parent:

72:c5709ae7b193

Child:

74:ca3001991fdc

--- a/measurement/AccelerationMeasurement.cpp	Mon Feb 16 13:15:52 2015 +0000
+++ b/measurement/AccelerationMeasurement.cpp	Tue Feb 17 16:31:30 2015 +0000
@@ -7,13 +7,18 @@
 #include "logging.h"
 
 #define THRESHOLD_PERCENT_ACCE 0.05       // Percentage cut-off for avoiding sending similar acceleration sensor data.
-#define TIME_LIMIT_ACCE 900               // Time interval for forcing a sending even if acceleration sensor readings are constantly similar. (in seconds)
+// Time interval for forcing a sending even if acceleration sensor readings are constantly similar (in seconds).
+#define TIME_LIMIT_ACCE 900          
 
-AccelerationMeasurement::AccelerationMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, MMA7660& sensor) :
+AccelerationMeasurement::AccelerationMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, 
+    MMA7660& sensor, DeviceIO& io, DeviceInfo& deviceInfo, DeviceBootstrap& bootstrap) :
     _client(client),
     _tpl(tpl),
     _deviceId(deviceId),
-    _sensor(sensor)
+    _sensor(sensor),
+    _io(io),
+    _deviceInfo(deviceInfo),
+    _bootstrap(bootstrap)
 {
     _init = false;
     oldValues[0] = 0;
@@ -29,7 +34,7 @@
     
     // Insert measurement
     // USAGE: 106,<DEVICE/ID>,<X>,<Y>,<Z>
-    if (!_tpl.add("10,106,POST,/measurement/measurements,application/vnd.com.nsn.cumulocity.measurement+json,application/vnd.com.nsn.cumulocity.measurement+json,%%,NOW UNSIGNED NUMBER NUMBER NUMBER,\"{\"\"time\"\":\"\"%%\"\",\"\"source\"\":{\"\"id\"\":\"\"%%\"\"},\"\"type\"\":\"\"c8y_MotionMeasurement\"\",\"\"c8y_MotionMeasurement\"\":{\"\"x\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m^2/s\"\"},\"\"y\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m^2/s\"\"},\"\"z\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m^2/s\"\"}}}\"\r\n"))
+    if (!_tpl.add("10,106,POST,/measurement/measurements,application/vnd.com.nsn.cumulocity.measurement+json,application/vnd.com.nsn.cumulocity.measurement+json,%%,NOW UNSIGNED NUMBER NUMBER NUMBER,\"{\"\"time\"\":\"\"%%\"\",\"\"source\"\":{\"\"id\"\":\"\"%%\"\"},\"\"type\"\":\"\"c8y_MotionMeasurement\"\",\"\"c8y_MotionMeasurement\"\":{\"\"x\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m/s^2\"\"},\"\"y\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m/s^2\"\"},\"\"z\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m/s^2\"\"}}}\"\r\n"))
         return false;
 
     _test = _sensor.testConnection();
@@ -44,18 +49,24 @@
         
     float data[3] = { 0.0, 0.0, 0.0 };
     _sensor.readData(data);    
-//    printf("Acceleration sensor readings: [Old] %.2f, %.2f, %.2f\r\n", oldValues[0], oldValues[1], oldValues[2]);
-//    printf("                              [New] %.2f, %.2f, %.2f\r\n", data[0], data[1], data[2]);
+    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(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_ACCE &&
         abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_ACCE &&
         abs(oldValues[2]-data[2]) <= abs(oldValues[2])*THRESHOLD_PERCENT_ACCE) {
         if (sendingTimer.read() < TIME_LIMIT_ACCE) {
-            aInfo("Similar acceleration readings found, no sending!\r\n");
+            aDebug("Similar acceleration readings found, no sending!\r\n");
+            _io.lcdPrint(tenant, signal);
             return true;
         } else {
-            aInfo("Sending timer of acceleration sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
+            aDebug("Sending timer of acceleration sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
         }
     }
+    char status[27] = {0};
+    snprintf(status, 27, "Sending Acc %.1f,%.1f,%.1f", data[0], data[1], data[2]);
+    _io.lcdPrint(tenant, signal, status);
         
     ComposedRecord record;
     IntegerValue msgId(106);
@@ -66,16 +77,18 @@
     if ((!record.add(msgId)) || (!record.add(devId)) || (!record.add(xValue)) || (!record.add(yValue)) || (!record.add(zValue)))
         return false;
 
+    float t_start = sendingTimer.read();
     if (_client.send(record) != SMARTREST_SUCCESS) {
         aError("Signal measurement failed.");
         _client.stop();
         return false;
     }
+    float t_end = sendingTimer.read();
     _client.stop();
+    aInfo("Acceleration readings sent in %.1f.\r\n", t_end-t_start);
     oldValues[0] = data[0];
     oldValues[1] = data[1];
     oldValues[2] = data[2];
     sendingTimer.reset();
-    aInfo("Acceleration readings sent.\r\n");
     return true;
 }