Changeset 3767

Timestamp:

05/09/07 17:14:43 (6 years ago)

Author:

jgaeddert

Message:

kinda working... needs thorough testing

Location:

experimental/components/CostasLoop/src

Files:

• CostasLoop.cpp (modified) (4 diffs)
• CostasLoopDSP.cpp (modified) (2 diffs)

experimental/components/CostasLoop/src/CostasLoop.cpp

@@ -26 +26 @@
 #include "CostasLoop.h"
 
+#undef LOGGING
+
 CostasLoop_i::CostasLoop_i(const char *uuid, omni_condition *condition) : 
     Resource_impl(uuid), component_running(condition)
 {
+    UpdateLoopFilterCoefficients(0.001);
+
     dataIn_0 = new standardInterfaces_i::complexShort_p("IF_in");
     dataOut_0 = new standardInterfaces_i::complexShort_u("baseband_out");
@@ -128 +132 @@
 
     PortTypes::ShortSequence *I_in_0(NULL), *Q_in_0(NULL);
-    unsigned int I_in_0_length, Q_in_0_length;
+    unsigned int I_in_0_length, Q_in_0_length, N;
+
+#ifdef LOGGING
+    std::ofstream input_log;
+    input_log.open("cl_input_log.dat");
+
+    std::ofstream output_log;
+    output_log.open("cl_output_log.dat");
+#endif
 
     while( true )
@@ -151 +163 @@
             I_out_0.length( I_in_0_length );
             Q_out_0.length( Q_in_0_length );
+            
+            N = I_in_0_length;
         }
 
-        //
+#ifdef LOGGING
+        for ( unsigned int i=0; i<N; i++ )
+            input_log       << (*I_in_0)[i] << "  " << (*Q_in_0)[i] << std::endl;
+#endif
+
         // do work here
-        //
+        for ( unsigned int i=0; i<N; i++ ) {
+            LockPhase( (*I_in_0)[i], (*Q_in_0)[i], I_out_0[i], Q_out_0[i] );
+        }
+
+#ifdef LOGGING
+        for ( unsigned int i=0; i<N; i++ )
+            output_log      << I_out_0[i] << "  " << Q_out_0[i] << std::endl;
+#endif
+
 
         DEBUG(7, CostasLoop, "Emptying port buffer...")
@@ -164 +190 @@
 
     }
-}
-
-
+
+#ifdef LOGGING
+    input_log.close();
+    output_log.close();
+#endif
+
+}
+
+

experimental/components/CostasLoop/src/CostasLoopDSP.cpp

@@ -57 +57 @@
     BT = ( BT < BT_MIN ) ? BT_MIN : BT;
     BT = ( BT > BT_MAX ) ? BT_MAX : BT;
-    float k1 = Ac;
+    float k1 = 1.0f;
 
     beta = 2*BT/(XI+1/(4*XI))/k1;
     alpha = 2*XI*beta;
+
+    beta /= Ac;
+    alpha /= Ac;
 }
 
@@ -88 +91 @@
     // switch (order)
     pd2 = ( I_out > 0.0f ) ? Q_out : -Q_out;
-    pd2 /= Ac;
 }