Changeset 3656

Timestamp:

05/03/07 20:30:09 (6 years ago)

Author:

jgaeddert

Message:

making component functional; needs testing

Location:

experimental/components/SymbolSyncPoly

Files:

• SymbolSyncPoly.cpp (modified) (6 diffs)
• SymbolSyncPoly.prf.xml (modified) (1 diff)
• main.cpp (modified) (1 diff)

experimental/components/SymbolSyncPoly/SymbolSyncPoly.cpp

@@ -163 +163 @@
     {
         DEBUG(5, SymbolSyncPoly, "configuring filter bank for " << 
-              "rrcos" << ", k=" << _k << ", m=" << _m << ", beta=" << _beta << ", Npfb=" << Npfb)
+              "rrcos" << ", k=" << _k << ", m=" << _m << ", beta=" << _beta << ", Npfb=" << _Npfb)
         ConfigureFilterBank("rrcos", _k, _m, _beta, _Npfb);
     }
@@ -183 +183 @@
     while( true )
     {
+        DEBUG(7, SymbolSyncPoly, "iterating loop...")
+
         // Get data from port
         dataIn_0->getData(I_in_0, Q_in_0);
+
+        DEBUG(7, SymbolSyncPoly, "Got " << I_in_0->length() << " samples")
 
         // Read input data length
@@ -197 +201 @@
         } else {
             N_in = I_in_0_length;
+        }
+
+        /// \todo Initialize I_in and Q_in from CORBA sequence instead
+        /// of copying values in loop
+        DEBUG(7, SymbolSyncPoly, "Copying data from CORBA sequence...")
+        /// \todo This is incredibly inefficient; need to manage memory better
+        I_in = new short[N_in];
+        Q_in = new short[N_in];
+        for (unsigned int ii=0; ii<N_in; ii++) {
+            I_in[ii] = (*I_in_0)[ii];
+            Q_in[ii] = (*Q_in_0)[ii];
         }
 
@@ -217 +232 @@
 
         // Main signal processing algorithm
+        DEBUG(7, SymbolSyncPoly, "Attempting to synchronize and decimate...")
         SynchronizeAndDecimate(
             I_in, Q_in, N_in,
             I_out, Q_out, N_out);
 
+        DEBUG(7, SymbolSyncPoly, "Setting output length...")
         I_out_0.length(N_out);
         Q_out_0.length(N_out);
@@ -226 +243 @@
         /// \todo Initialize I_out_0 and Q_out_0 from array instead
         /// of copying values in loop
+        DEBUG(7, SymbolSyncPoly, "Copying data to CORBA sequence...")
         for (unsigned int ii=0; ii<N_out; ii++) {
             I_out_0[ii] = I_out[ii];
@@ -231 +249 @@
         }
 
+        DEBUG(7, SymbolSyncPoly, "Emptying port buffer...")
         dataIn_0->bufferEmptied();
+
+        DEBUG(7, SymbolSyncPoly, "calling pushPacket()...")
         dataOut_0->pushPacket(I_out_0, Q_out_0);
+
+        /// \todo This is incredibly inefficient; need to manage memory better
+        DEBUG(7, SymbolSyncPoly, "Deleting temp buffers...")
+        delete [] I_in;
+        delete [] Q_in;
     }
 

experimental/components/SymbolSyncPoly/SymbolSyncPoly.prf.xml

@@ -29 +29 @@
         <kind kindtype="configure"/>
     </simple>
-    <!--
-    <simplesequence type="string" id="port_list" name="port_list" mode="readonly">
-        <description>Returns a sequence of strings with the names of the available Provides ports</description> 
-        <value>baseband_in::standardInterfaces.complexShort</value> 
-        <kind kindtype="configure"/>
-    </simplesequence>
-    -->
 </properties>

experimental/components/SymbolSyncPoly/main.cpp

@@ -30 +30 @@
 
 {
+    ossieDebugLevel = 5;
+
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;