Diff: Codes/EventDetector.cpp

Revision:

32:8b108d8089e8

Parent:

31:647771325538

Child:

33:3abe9d906312

diff -r 647771325538 -r 8b108d8089e8 Codes/EventDetector.cpp
--- a/Codes/EventDetector.cpp	Fri May 01 14:46:08 2015 +0000
+++ b/Codes/EventDetector.cpp	Fri May 01 21:52:57 2015 +0000
@@ -48,7 +48,7 @@
 void EventDetector::ProcessEvent(float rmsvalue, float mv2, int under, int over)
 {
     int i, tempofuga = 0;    
-    float buf[NUMBER_OF_SAMPLES*2];    
+    float buf[NUMBER_OF_SAMPLES*2], newvm;    
     
     //Thread::wait(500);//TimeDelay(t));
     //printf("%d time delay\n", TimeDelay(t));
@@ -101,23 +101,24 @@
         {
             /* Retira o VM das amostras */
             //pega os dados da captura atual
-            mv2 = 0;
+            newvm = 0;
             Capture::CopyBufferFloat(m_Channel,buf);
             
             /* Retira o valorMedio de todas as amostras */
             for(i=0; i < NUMBER_OF_SAMPLES; i++){
                 buf[i] -= mv2;
-                mv2 += buf[i];
+                newvm += buf[i];
             }
             if ( m_EventCounter == Settings::get_EventLimit() ){                    
-                mv2 = mv2 / NUMBER_OF_SAMPLES;
-                printf("Novo valor medio %f RMS original %f\n", mv2, rmsvalue);
+                mv2 = newvm / NUMBER_OF_SAMPLES;
+                //printf("Novo valor medio %f RMS original %f\n", mv2, rmsvalue);
             }
                 
-            rmsvalue = SignalProcessor::CalculateRMSSigned(buf, m_Channel);
+            rmsvalue = SignalProcessor::CalculateRMSFloat(buf, m_Channel);
+            /*
             if ( m_EventCounter == Settings::get_EventLimit() )
                 printf("novo RMS %f\n", rmsvalue);                
-
+            */
             
             if(!m_OutletTriggered)
             {
@@ -196,8 +197,7 @@
     for(i=0;i<12;i++)
     {
         printf("Harm %d Sen %f Cos %f\n ", i, e->get_SineValue(i), e->get_CossineValue(i));
-    }
-    
+    }    
 }
 
 //void EventDetector::OnTrigger(float rmsvalue)