Changeset 3374

Timestamp:

04/09/07 12:29:24 (6 years ago)

Author:

jgaeddert

Message:

adding more functionality

Location:

experimental/components/SymbolSyncPoly

Files:

• SymbolSyncPoly.cpp (modified) (1 diff)
• SymbolSyncPoly.h (modified) (1 diff)
• SymbolSyncPolyDSP.cpp (modified) (3 diffs)
• SymbolSyncPolyDSP.h (modified) (2 diffs)
• autotest_sources (modified) (1 prop)
• autotest_sources/.ignore (added)
• main.cpp (modified) (1 diff)

experimental/components/SymbolSyncPoly/SymbolSyncPoly.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2007 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE SymbolSyncPoly.

experimental/components/SymbolSyncPoly/SymbolSyncPoly.h

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2007 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE SymbolSyncPoly.

experimental/components/SymbolSyncPoly/SymbolSyncPolyDSP.cpp

@@ -49 +49 @@
     b = 0;
     b_soft = 0.0f;
-    Npfb = 16;
+    Npfb = 0;
+    k = 0;
+    v = 0;
 }
 
@@ -77 +79 @@
     } else {
         std::cerr << "ERROR: SymbolSyncPolyDSP::CreateFilterBank() :" << std::endl
-                  << "  => unknown filter type " << type << std::endl;
+                  << "  => unknown/unsupported filter type " << type << std::endl;
         throw 0;
     }
 
+    k = _k;
     Npfb = (int) _Npfb;
 }
@@ -107 +110 @@
 }
 
+// Main signal processing loop
+void SymbolSyncPolyDSP::SynchronizeAndDecimate(short * I_in,
+        short * Q_in,
+        unsigned int N_in,
+        short *& I_out,
+        short *& Q_out,
+        unsigned int & N_out)
+{
+    unsigned int i(0);
+    while ( i<N_in ) {
+        v++;
+
+        switch ( lc ) {
+            case SHIFT:
+                // Shift sample into state registers, normal operation
+                MF_i->PushInput( I_in[i] );
+                dMF_i->PushInput( I_in[i] );
+                MF_q->PushInput( Q_in[i] );
+                dMF_q->PushInput( Q_in[i] );
+                i++;
+                break;
+            case SKIP:
+                // 'Skip' input sample by incrementing index by two
+
+                if ( i < (N_in-1) ) {
+                    for (unsigned int k=0; k<2; k++) {
+                        MF_i->PushInput( I_in[i] );
+                        dMF_i->PushInput( I_in[i] );
+                        MF_q->PushInput( Q_in[i] );
+                        dMF_q->PushInput( Q_in[i] );
+                        i++;
+                    }
+                } else {
+                    // not enough samples in input buffer: save state and
+                    // wait for more
+                    /// \todo configure
+                    return;
+                }
+
+                // return loop control to normal 'shift' state
+                lc = SHIFT;
+                break;
+            case STUFF:
+                // 'Stuff' (repeat) input sample by not incrementing index
+                // This effectively does not update filter states
+
+                // return loop control to normal 'shift' state
+                lc = SHIFT;
+                break;
+            default:;
+        }
+
+        if ( v>=k ) {
+            // Enable output
+            
+            // Filter in-phase signal with MF and dMF with filter bank b
+            MF_i->ComputeOutput(mf_i, b);
+            dMF_i->ComputeOutput(dmf_i, b);
+            
+            // Filter quadrature signal with MF and dMF with filter bank b
+            MF_q->ComputeOutput(mf_q, b);
+            dMF_q->ComputeOutput(dmf_q, b);
+            
+            // Store result in output buffer
+            // I_out[x] = mf_i;
+            // Q_out[x] = mf_q;
+            
+            GenerateErrorSignal();
+            
+            AdvanceLoopFilter();
+            
+            ComputeFilterBankIndex();
+        }
+
+    } // while
+}
 
 
+

experimental/components/SymbolSyncPoly/SymbolSyncPolyDSP.h

@@ -61 +61 @@
     void SynchronizeAndDecimate(short * I_in,
             short * Q_in,
-            int N_in,
+            unsigned int N_in,
             short *& I_out,
             short *& Q_out,
-            int & N_out);
+            unsigned int & N_out);
 
   protected:
@@ -106 +106 @@
     int Npfb;           ///< number of filters in bank
 
+    unsigned int k;     ///< samples per symbol
+    unsigned int v;     ///< sample counter
+
     flow_control lc;    ///< loop flow control state
 

experimental/components/SymbolSyncPoly/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2007 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE SymbolSyncPoly.