Diff: main.cpp

Revision:

14:379796f5868e

Parent:

13:db76473a3d76

Child:

15:a98f8182c86f

--- a/main.cpp	Mon Dec 04 11:24:15 2017 +0000
+++ b/main.cpp	Mon Dec 04 11:27:35 2017 +0000
@@ -14,22 +14,14 @@
 
 //Declare Threads
 Thread t1;
-Thread t2;
 
-AnalogIn QDEF(PA_7);                    // Q Factor
-AnalogIn BDEF(PA_6);                    // Boost Level
-AnalogIn FDEF(PA_5);                    //Centre Frequency
     
 //Declare Ticker Rates
 float sample_rate = (1.0/35000);        //Rate of sampling
-float coeff_rate = (1.0 / 20);          //Rate of updating coefficients
 
 //Initial Input Value
 float input = 0.0;
 
-float Fo_Current;
-float Boost_Current;
-float Q_Current;
 
 //Declare Filter
 FILTER BP_filter(48000,10000,-16,2);  //Create object of type Filter(Fs,Fo,Boost,Q)
@@ -37,26 +29,11 @@
 
 //Forward Declarations
 void sampler(void);
-void update(void);
 
 
 int main()
 {
-    t2.start(sampler);//Start the Sampler timed interrupt
-    t1.start(update);//Update the coeffiecients of the filter
-}
-
-void update(void)
-{
-    while(1){
-    Fo_Current = FDEF * 22000 + 10;
-    Boost_Current = BDEF * 100 - 50;
-    Q_Current = QDEF * 49 + 1;
-    
-    BP_filter.coeff_update(Fo_Current,Boost_Current,Q_Current);//Coefficient update
-    printf("Q = %d \t Boost = %f \t Fo = %d\n\r", BP_filter.Get_Q(), BP_filter.Get_Boost(), BP_filter.Get_Fo());
-    Thread::wait(1000);//Sleep the thread for 1 second then re runs the coefficient calculation    
-    }
+    t1.start(sampler);//Start the Sampler timed interrupt
 }
 
 void sampler(void)