Diff: sensor.cpp

Revision:

8:e8d86c66283c

Parent:

7:fe8e827f4d1b

Child:

9:e501499af4ef

--- a/sensor.cpp	Mon Jun 22 14:47:14 2015 +0000
+++ b/sensor.cpp	Thu Jul 02 22:57:47 2015 +0000
@@ -1,13 +1,59 @@
 #include "sensor.h"
 
-extern AnalogIn voltage;
+extern AnalogIn voltage[];
 extern ParametersBlock APP_PARAMETERS;
 
-bool getEstadoSensor(){
-    float limit = APP_PARAMETERS.LIMITE_TENSAO_SENSOR_V * 0.01;
-    if(voltage > limit){
+Ticker tickerSamples;
+Timeout samplesTimeout;
+unsigned char currentChannel;
+float sample[DEFAULT_SAMPLES];
+int currentSample;
+bool finished;
+bool timeout;
+
+float getTensaoInstantanea(unsigned char channel){
+    currentChannel = channel;
+    currentSample = 0;
+    finished = false;
+    timeout = false;
+    tickerSamples.attach_us(&readSample, APP_PARAMETERS.SAMPLES_DELAY_US);
+    samplesTimeout.attach_us(&timeoutReadingSamples, (DEFAULT_SAMPLES + 2) * APP_PARAMETERS.SAMPLES_DELAY_US);
+    
+    while(!finished && !timeout){
+        wait(0.1f);
+    }
+    
+    return calculateRMS();
+}
+
+bool getEstadoSensor(unsigned char channel){
+    if(getTensaoInstantanea(channel) > APP_PARAMETERS.LIMITE_TENSAO_SENSOR_V){
         return SENSOR_COM_FORNECIMENTO;
     } else{
         return SENSOR_SEM_FORNECIMENTO;
     }
 }
+
+void readSample(){
+    sample[currentSample++] = voltage[currentChannel];
+    if(currentSample == DEFAULT_SAMPLES){
+        finished = true;
+        samplesTimeout.detach();
+        tickerSamples.detach();
+    }
+}
+
+void timeoutReadingSamples(){
+    tickerSamples.detach();
+    timeout = true;
+}
+
+float calculateRMS(){
+    float rms = 0;
+    for(int i=0; i < DEFAULT_SAMPLES; i++){
+        sample[i] = sample[i]*APP_PARAMETERS.SAMPLES_ANG_COEF + APP_PARAMETERS.SAMPLES_LIN_COEF;
+        rms += sample[i]*sample[i];
+    }
+    rms = rms / (float)DEFAULT_SAMPLES;
+    return sqrt(rms);
+}