Diff: main.cpp

Revision:

41:a413c26109c2

Parent:

38:132e83a591d0

--- a/main.cpp	Thu Jan 07 18:44:44 2016 +0000
+++ b/main.cpp	Thu Jan 14 17:28:38 2016 +0000
@@ -47,66 +47,6 @@
 
 void thread1(void const *args)
 {
-    DigitalOut led1(LED1);
-    int n = 0;
-    //int tatual, tnovo;
-    float rms[NUMBER_OF_CHANNELS], mv2[NUMBER_OF_CHANNELS];
-    int under[NUMBER_OF_CHANNELS], over[NUMBER_OF_CHANNELS];
-    
-    Capture::Initialize();
-    
-    //Timer t;
-    //t.start();
-    //tatual = 0;
-    
-    while(1)
-    {
-        Capture::Wait();
-        
-        // Calcula o RMS dos 6 canais
-        SignalProcessor::CalculateRMSBulk(rms, mv2, under, over);
-        //printf("Tempo ms %d\n", t.read_ms());
-        //t.reset();
-        
-        //rms[0] = 2050;
-        //rms[1]=rms[2]=rms[3]=rms[4]=rms[5]=2000;
-        
-        for(int i=0;i<6;i++){
-            //printf("Main %d\n", i);
-            EventDetector::get_Detector(i).ProcessEvent(rms[i], mv2[i], under[i], over[i]);
-            //wait_ms(2);
-        }
-        //Thread::yield();
-        
-        
-        /*
-        for(int i =0; i < 6; i++)
-            printf("%5.2f\t", rms[i]);
-        printf("\n");
-        
-        wait(5);
-        */
-        n++;
-        if(n==60)
-        {
-            printf("%.2f %.0f %.2f %.0f\t%.2f %.0f %.2f %.0f\t%.2f %.0f %.2f %.0f\n",rms[0], mv2[0],rms[1],mv2[1],rms[2],mv2[2],rms[3],mv2[3],rms[4],mv2[4],rms[5],mv2[5]);
-            led1 = !led1;            
-            n=0;    
-            //t.stop();
-            
-            /*
-            tnovo = t.read_us();            
-            printf("MAIN: The time XXX taken loop %d\n", tnovo - tatual);
-            tatual = tnovo;
-            t.reset();
-            */
-            //Thread::wait(1000); //1000
-            
-            PmedLog::Mark();
-            
-            //wait(1);
-        }
-    }
 }
 
 /*
@@ -140,6 +80,8 @@
     //DigitalOut myled3(LED3); //The pushbutton or power on caused a reset
     //DigitalOut myled4(LED4); //The watchdog timer caused a reset
     
+    printf("Versao estável com aquisição por DMA e FFT\n");
+    
     if ((LPC_WDT->WDMOD >> 2) & 1){
         //myled4 = 1; 
         PmedLog::WriteEntry(PMEDLOG_INITIALIZINGWDT);