Changeset 3386

Timestamp:

04/10/07 17:19:10 (6 years ago)

Author:

jgaeddert

Message:

Binding SymbolSyncPolyDSP to component structure

Location:

experimental/components/SymbolSyncPoly

Files:

• SymbolSyncPoly.cpp (modified) (4 diffs)
• SymbolSyncPoly.h (modified) (2 diffs)
• SymbolSyncPoly.prf.xml (modified) (1 diff)
• SymbolSyncPolyDSP.cpp (modified) (4 diffs)
• SymbolSyncPolyDSP.h (modified) (2 diffs)
• documentation.txt (modified) (1 diff)

experimental/components/SymbolSyncPoly/SymbolSyncPoly.cpp

@@ -38 +38 @@
     //Start the thread containing the writer's processing function 
     processing_thread->start();
+
+    isConfigured_pulseShape = true;
+    isConfigured_k          = false;
+    isConfigured_m          = false;
+    isConfigured_beta       = false;
+    isConfigured_Npfb       = false;
 
 }
@@ -120 +126 @@
             CORBA::UShort simple_temp;
             props[i].value >>= simple_temp;
-            simple_1_value = simple_temp;
+            _k = simple_temp;
+            isConfigured_k = true;
         } else if (strcmp(props[i].id, "DCE:99bf718e-e44e-11db-99e4-00123f63025f") == 0) {
             // m : symbol delay
             CORBA::UShort simple_temp;
             props[i].value >>= simple_temp;
-            simple_2_value = simple_temp;
+            _m = simple_temp;
+            isConfigured_m = true;
         } else if (strcmp(props[i].id, "DCE:afc47b82-e44e-11db-b1f3-00123f63025f") == 0) {
             // beta : excess bandwidth factor
             CORBA::Float simple_temp;
             props[i].value >>= simple_temp;
-            simple_3_value = simple_temp;
+            _beta = simple_temp;
+            isConfigured_beta = true;
         } else if (strcmp(props[i].id, "DCE:bea3b19a-e44e-11db-a3dd-00123f63025f") == 0) {
-            // N : number of filters in bank
+            // Npfb : number of filters in bank
             CORBA::UShort simple_temp;
             props[i].value >>= simple_temp;
-            simple_4_value = simple_temp;
+            _Npfb = simple_temp;
+            isConfigured_Npfb = true;
         } else {
             // unknown property
@@ -142 +152 @@
         }
     }
+
+    /// \todo configure filter bank type
+    ///
+    /// Once all properties have been configured, create the filter bank
+    if ( isConfigured_k     &&
+         isConfigured_m     &&
+         isConfigured_beta  &&
+         isConfigured_Npfb )
+    {
+        DEBUG(5, SymbolSyncPoly, "configuring filter bank for " << 
+              "rrcos" << ", k=" << _k << ", m=" << _m << ", beta=" << _beta << ", Npfb=" << Npfb)
+        ConfigureFilterBank("rrcos", _k, _m, _beta, _Npfb);
+    }
 }
 
@@ -150 +173 @@
     PortTypes::ShortSequence I_out_0, Q_out_0;
 
-
     PortTypes::ShortSequence *I_in_0(NULL), *Q_in_0(NULL);
-    CORBA::UShort I_in_0_length, Q_in_0_length;
+    unsigned int I_in_0_length, Q_in_0_length, N_in(0), N_out(0);
+    short * I_in(NULL);
+    short * Q_in(NULL);
+    short * I_out(NULL);
+    short * Q_out(NULL);
 
     while( true )
     {
+        // Get data from port
         dataIn_0->getData(I_in_0, Q_in_0);
 
+        // Read input data length
         I_in_0_length = I_in_0->length();
         Q_in_0_length = Q_in_0->length();
 
-        I_out_0.length(); //must define length of output
-        Q_out_0.length(); //must define length of output
-
-        /*insert code here to do work*/
-
-
-
-
-
+        if ( I_in_0_length != Q_in_0_length ) {
+            // Not sure how to handle multiple-length inputs
+            std::cerr << "ERROR: SymbolSyncPoly_i::ProcessData()" << std::endl
+                      << "  => Not sure how to handle multiple-length inputs" << std::endl;
+            throw 0;
+        } else {
+            N_in = I_in_0_length;
+        }
+
+        // Configure output data length
+        if ( I_out == NULL ) {
+            I_out = new short[2*N_in/k];
+            Q_out = new short[2*N_in/k];
+            N_out = 2*N_in/k;
+        } else if ( N_out < (2*N_in/k) ) {
+            delete [] I_out;
+            delete [] Q_out;
+            I_out = new short[2*N_in/k];
+            Q_out = new short[2*N_in/k];
+            N_out = 2*N_in/k;
+        } else {
+            // Nothing to do
+        }
+
+        // Main signal processing algorithm
+        SynchronizeAndDecimate(
+            I_in, Q_in, N_in,
+            I_out, Q_out, N_out);
+
+        I_out_0.length(N_out);
+        Q_out_0.length(N_out);
+
+        /// \todo Initialize I_out_0 and Q_out_0 from array instead
+        /// of copying values in loop
+        for (unsigned int ii=0; ii<N_out; ii++) {
+            I_out_0[ii] = I_out[ii];
+            Q_out_0[ii] = Q_out[ii];
+        }
 
         dataIn_0->bufferEmptied();

experimental/components/SymbolSyncPoly/SymbolSyncPoly.h

@@ -74 +74 @@
     ///   - \ref prop_m
     ///   - \ref prop_beta
-    ///   - \ref prop_N
+    ///   - \ref prop_Npfb
     void configure(const CF::Properties&)
         throw (CORBA::SystemException,
@@ -94 +94 @@
     omni_thread *processing_thread;     ///< for component writer function
     
+    // Configuration variables
     //CORBA::String simple_0_value;
-    CORBA::UShort simple_1_value;
-    CORBA::UShort simple_2_value;
-    CORBA::Float simple_3_value;
-    CORBA::UShort simple_4_value;
+    unsigned int _k;
+    unsigned int _m;
+    float _beta;
+    unsigned int _Npfb;
     
     // list components provides and uses ports
     standardInterfaces_i::complexShort_p *dataIn_0;
     standardInterfaces_i::complexShort_u *dataOut_0;
+
+    // configuration flags
+    bool isConfigured_pulseShape;
+    bool isConfigured_k;
+    bool isConfigured_m;
+    bool isConfigured_beta;
+    bool isConfigured_Npfb;
     
 };

experimental/components/SymbolSyncPoly/SymbolSyncPoly.prf.xml

@@ -20 +20 @@
     </simple>
     <simple type="float" id="DCE:afc47b82-e44e-11db-b1f3-00123f63025f" name="beta" mode="readwrite">
-        <description>Excess bandwidth factor</description> 
+        <description>Excess bandwidth factor, 0&lt;beta&lt;1</description> 
         <value>0.3</value> 
         <kind kindtype="configure"/>
     </simple>
-    <simple type="ushort" id="DCE:bea3b19a-e44e-11db-a3dd-00123f63025f" name="N" mode="readwrite">
+    <simple type="ushort" id="DCE:bea3b19a-e44e-11db-a3dd-00123f63025f" name="Npfb" mode="readwrite">
         <description>Number of filters in bank</description> 
         <value>16</value> 

experimental/components/SymbolSyncPoly/SymbolSyncPolyDSP.cpp

@@ -56 +56 @@
     k = 0;
     v = 0;
+
+    isConfigured = false;
 }
 
@@ -89 +91 @@
     k = _k;
     Npfb = (int) _Npfb;
+
+    isConfigured = true;
 }
 
@@ -126 +130 @@
         unsigned int & N_out)
 {
+    if ( !isConfigured ) {
+        std::cerr << "ERROR: SymbolSyncPolyDSP::SynchronizeAndDecimate() :" << std::endl
+                  << "  => must call ConfigureFilterBank() before invoking this method" << std::endl;
+        throw 0;
+    }
+
     unsigned int i(0);
+    unsigned int N_out_max(N_out);
     N_out = 0;
 
@@ -189 +200 @@
             I_out[N_out] = mf_i;
             Q_out[N_out] = mf_q;
-            N_out++;
+
+            // Throw exception if buffer is too small
+            if ( N_out == N_out_max ) {
+                std::cerr << "ERROR: SymbolSyncPolyDSP::SynchronizeAndDecimate() :" << std::endl
+                          << "  => output array is full " << std::endl;
+                throw 0;
+            } else {
+                N_out++;
+            }
             
             GenerateErrorSignal();

experimental/components/SymbolSyncPoly/SymbolSyncPolyDSP.h

@@ -65 +65 @@
     ///
     /// This method performs simultaneous synchronization and decimation.  It
-    /// assumes that the calling platform takes care of memory management
+    /// assumes that the calling platform takes care of memory management.
+    /// N_out initially stores the number of memory elements allocated to
+    /// I_out and Q_out, and assumes that this number is sufficiently large
+    /// to run the algorithm.  The method returns N_out as the actual number
+    /// of elements stored in I_out and Q_out.  This is approximately
+    /// \f$ N_{out} \approx N_{in}/k \f$
     void SynchronizeAndDecimate(short * I_in,
             short * Q_in,
@@ -120 +125 @@
     flow_control lc;    ///< loop flow control state
 
+    bool isConfigured;  ///< flag set when ConfigureFilterBank() is invoked properly
+
   private:
     /// Disallow copy constructor

experimental/components/SymbolSyncPoly/documentation.txt

@@ -40 +40 @@
 CORBA::Float
 
-\subsection prop_N Number of Filter in Bank (DCE:bea3b19a-e44e-11db-a3dd-00123f63025f)
+\subsection prop_Npfb Number of Filter in Bank (DCE:bea3b19a-e44e-11db-a3dd-00123f63025f)
 CORBA::UShort