From 1b33aa93b74895fc4f2d1b3691085c857b05fac8 Mon Sep 17 00:00:00 2001
From: Thierry Leconte <f4dwv@users.sourceforge.net>
Date: Sun, 5 Jun 2005 19:01:27 +0000
Subject: [PATCH] -Faster Phase estimator -Cleaning pll

---
 dsp.c    | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 filter.c |  5 +++--
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/dsp.c b/dsp.c
index 79cc3bd..e47e0d5 100755
--- a/dsp.c
+++ b/dsp.c
@@ -51,6 +51,36 @@ fr=FreqOsc=Fc/Fe;
 return(0);
 }
 
+/* fast phase estimator */
+static inline double Phase(double I,double Q)
+{
+   double angle,r;
+   int s;
+
+   if(I==0.0 && Q==0.0)
+	return(0.0);
+
+   if (Q < 0)  {
+	s=-1;
+	Q=-Q;
+   } else {
+	s=1;
+   }
+	
+   if (I>=0) {
+      r = (I - Q) / (I + Q);
+      angle = 0.5 - 0.5 * r;
+   } else {
+      r = (I + Q) / (Q - I);
+      angle = 1.5 - 0.5 * r;
+   }
+
+  if(s>0)
+  	return(angle);
+  else
+  	return(-angle);
+}
+
 static float pll(double I, double Q)
 {
 
@@ -68,23 +98,27 @@ static float pll(double I, double Q)
     Qo = sin(PhaseOsc);
 
 /* phase detector */
-    Ip = I*Io-Q*Qo;
-    Qp = I*Qo+Q*Io;
-    DPhi = -atan2(Qp, Ip) / M_PI;
+    Ip = I*Io+Q*Qo;
+    Qp = Q*Io-I*Qo;
+    DPhi = Phase(Ip,Qp);
+
+printf("%g\n",DPhi);
 
 /*  loop filter  */
     DF = K1 * DPhi + FreqOsc;
-    FreqOsc += K2 * DPhi;
-    if (FreqOsc > ((Fc + DFc) / Fe))
-	FreqOsc = (Fc + DFc) / Fe;
-    if (FreqOsc < ((Fc - DFc) / Fe))
-	FreqOsc = (Fc - DFc) / Fe;
+
     PhaseOsc += 2.0 * M_PI * DF;
     if (PhaseOsc > M_PI)
 	PhaseOsc -= 2.0 * M_PI;
     if (PhaseOsc <= -M_PI)
 	PhaseOsc += 2.0 * M_PI;
 
+    FreqOsc += K2 * DPhi;
+    if (FreqOsc > ((Fc + DFc) / Fe))
+	FreqOsc = (Fc + DFc) / Fe;
+    if (FreqOsc < ((Fc - DFc) / Fe))
+	FreqOsc = (Fc - DFc) / Fe;
+
     return ((float)Ip);
 }
 
diff --git a/filter.c b/filter.c
index fab50cb..95ae993 100755
--- a/filter.c
+++ b/filter.c
@@ -40,10 +40,11 @@ void iqfir(float *buff, const float *coeff, const int len,double *I,double *Q)
     double i,q;
 
     i=q=0.0;
-    for (k = 0; k < len; k++) {
-	i += buff[2*k] ;
+    for (k = 0; k < len-1; k++) {
 	q += buff[2*k] * coeff[k];
+	i += buff[2*k+1] ;
     } 
+    q += buff[2*k] * coeff[k];
     i= buff[len-1]-i/len;
     *I=i,*Q=q;
 }