Diff: main.cpp

Revision:

2:1d99e9b70f0d

Parent:

1:0b510109a099

--- a/main.cpp	Sun Dec 06 20:14:46 2015 +0000
+++ b/main.cpp	Tue Dec 08 12:15:51 2015 +0000
@@ -39,7 +39,7 @@
 // declare second filter
 inline float SecondFilterFloat(float Variable);
 //nadav - declare simple filter
-inline float simpleFilterFloat(float Variable);
+//inline float simpleFilterFloat(float Variable);
 
 // Variables
 uint16_t ADCValue=0;
@@ -166,7 +166,7 @@
         // Apply Filter to reading before further processing//
         //////////////////////////////////////////////////////
         
-        ADCFloat=simpleFilterFloat(ADCFloat); //nadav - filtering input
+        //ADCFloat=simpleFilterFloat(ADCFloat); //nadav - filtering input
         
         ADCFloat=FirstFilterFloat(ADCFloat);
         ADCFloat=SecondFilterFloat(ADCFloat);
@@ -211,21 +211,21 @@
 ///////////////////////////////////////////
 inline void NOP() { __ASM volatile ("nop"); } // one tick operation, Use to adjust frequency by slowing down the proccess
 //nadav - simple filter implementation
-inline float simpleFilterFloat(float Variable){
+//inline float simpleFilterFloat(float Variable){
     // Buffer variables
-    LastU=CurU;
-    CurU=Variable;
-    LastY=CurY;
+  //  LastU=CurU;
+   // CurU=Variable;
+   // LastY=CurY;
     
     // Simple Filter LFP
     //CurY=(1-ALPF)*LastY+ALPF*CurU;
     
     // Simple Filter HPF
-    CurY=AHPF*(LastY+CurU-LastU);
+   // CurY=AHPF*(LastY+CurU-LastU);
     
     
-    return CurY;
-}// end output filter function
+  //  return CurY;
+//}// end output filter function
 
 
 inline float FirstFilterFloat(float Variable){