Diff: measurement/AnalogMeasurement.cpp

Revision:

90:423177e8a401

Parent:

88:8ab476939897

Child:

92:0acd11870c6a

--- a/measurement/AnalogMeasurement.cpp	Mon Mar 16 12:12:04 2015 +0000
+++ b/measurement/AnalogMeasurement.cpp	Fri Mar 20 13:55:21 2015 +0000
@@ -8,14 +8,19 @@
 #define THRESHOLD_PERCENT_ANA 0.02       // Percentage cut-off for avoiding sending similar analog sensor data.
 // Time interval for forcing a sending even if analog sensor readings are constantly similar (in seconds).
 #define TIME_LIMIT_ANA 900               
+    
+AnalogIn _analog1(A0);
+AnalogIn _analog2(A1);
 
-AnalogMeasurement::AnalogMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, AnalogIn& analog1,
-    AnalogIn& analog2, DeviceIO& io, DeviceInfo& deviceInfo, DisplayInfo& displayInfo) :
+AnalogMeasurement::AnalogMeasurement(AbstractSmartRest& client,
+                                     SmartRestTemplate& tpl,
+                                     long& deviceId,
+                                     DeviceIO& io,
+                                     DeviceInfo& deviceInfo,
+                                     DisplayInfo& displayInfo) :
+    _deviceId(deviceId),
+    _tpl(tpl),
     _client(client),
-    _tpl(tpl),
-    _deviceId(deviceId),
-    _analog1(analog1),
-    _analog2(analog2),
     _io(io),
     _deviceInfo(deviceInfo),
     _displayInfo(displayInfo)
@@ -43,8 +48,8 @@
 bool AnalogMeasurement::run()
 {
     extern bool lastSensorReadingSent;
-    float data[2] = {_analog1.read()*100, _analog2.read()*100};
-        
+    float data[2] = {(float)_analog1*100, (float)_analog2*100};
+
     if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_ANA &&
         abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_ANA) {
         if (sendingTimer.read() < TIME_LIMIT_ANA) {
@@ -57,9 +62,9 @@
             return true;
         } else {
             aDebug("Analog sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
-        } 
+        }
     }
-    
+
 //    printf("[Y] %f, %f (%f, %f)\r\n", data[0], data[1], oldValues[0], oldValues[1]);
     char status[25] = {0};
     snprintf(status, 25, "Sending Poti %.1f,%.1f", data[0], data[1]);