Changeset 5253

Timestamp:

10/06/07 17:18:22 (6 years ago)

Author:

jgaeddert

Message:

moving code to dynamically set modulation scheme based on incoming meta data to separate method in demodulator

Location:

experimental/components/DigitalModem/trunk/DigitalModem/src

Files:

• DigitalDemodulator.cpp (modified) (6 diffs)
• DigitalDemodulator.h (modified) (2 diffs)

experimental/components/DigitalModem/trunk/DigitalModem/src/DigitalDemodulator.cpp

@@ -38 +38 @@
     processing_thread->start();
 
+    packet_data = NULL;
 }
 
@@ -105 +106 @@
     DEBUG(3, DigitalDemodulator, "configure() invoked")
     
-    DEBUG(3, DigitalModulator, "props length : " << props.length());
+    DEBUG(3, DigitalDemodulator, "props length : " << props.length());
 
     for (unsigned int i = 0; i <props.length(); i++) {
-        DEBUG(3, DigitalModulator, "Property id : " << props[i].id);
+        DEBUG(3, DigitalDemodulator, "Property id : " << props[i].id);
 
         if (strcmp(props[i].id, "DCE:df4641d3-5c25-47d4-8d0b-89a069ac0248") == 0) {
@@ -143 +144 @@
 }
 
+void DigitalDemodulator_i::SetModulationSchemeOnMetaData()
+{
+    switch (packet_data->modulation_scheme.scheme) {
+    case standardInterfaces::ModulationScheme::UNKNOWN:
+        // Meta data has not been configured; do not change modulation scheme
+        return;
+    case standardInterfaces::ModulationScheme::PSK:
+        switch (packet_data->modulation_scheme.M) {
+        case 2:
+            SetModulationScheme(SigProc::BPSK);
+            DEBUG(5, DigitalDemodulator, "Demod set to BPSK");
+            break;
+        case 4:
+            SetModulationScheme(SigProc::QPSK);
+            DEBUG(5, DigitalDemodulator, "Demod set to QPSK");
+            break;
+        case 8:
+            SetModulationScheme(SigProc::PSK8);
+            DEBUG(5, DigitalDemodulator, "Demod set to 8PSK");
+            break;
+        default:
+            std::cerr << "DigitalDemodulator-metadata: Unsupported PSK modulation depth" << std::endl;
+            throw 0;
+        }
+        break;
+    case standardInterfaces::ModulationScheme::QAM:
+        switch (packet_data->modulation_scheme.M) {
+        case 4:
+            SetModulationScheme(SigProc::QAM4);
+            DEBUG(5, DigitalDemodulator, "Demod set to 4-QAM");
+            break;
+        case 16:
+            SetModulationScheme(SigProc::QAM16);
+            DEBUG(5, DigitalDemodulator, "Demod set to 16QAM");
+            break;
+        default:
+            std::cerr << "DigitalDemodulator-metadata: Unsupported QAM modulation depth" << std::endl;
+            throw 0;
+        }
+        break;
+    case standardInterfaces::ModulationScheme::PAM:
+        switch (packet_data->modulation_scheme.M) {
+        case 4:
+            SetModulationScheme(SigProc::PAM4);
+            DEBUG(5, DigitalDemodulator, "Demod set to 4PAM");
+            break;
+        default:
+            std::cerr << "DigitalDemodulator-metadata: Unsupported PAM modulation depth" << std::endl;
+            throw 0;
+        }
+        break;
+    default:;
+    }
+}
+
+
 void DigitalDemodulator_i::ProcessData()
 {
@@ -150 +207 @@
 
     PortTypes::ShortSequence *I_in(NULL), *Q_in(NULL);
-    standardInterfaces::MetaData *packet_data(NULL);
+    
     unsigned int N_in(0), N_out(0);
 
@@ -166 +223 @@
         }
 
-        switch (packet_data->modulation_scheme.scheme) {
-        case standardInterfaces::ModulationScheme::PSK:
-            switch (packet_data->modulation_scheme.M) {
-            case 2:
-                SetModulationScheme(SigProc::BPSK);
-                DEBUG(5, DigitalModulator, "Demod set to BPSK");
-                break;
-            case 4:
-                SetModulationScheme(SigProc::QPSK);
-                DEBUG(5, DigitalModulator, "Demod set to QPSK");
-                break;
-            case 8:
-                SetModulationScheme(SigProc::PSK8);
-                DEBUG(5, DigitalModulator, "Demod set to 8PSK");
-                break;
-            default:
-                std::cerr << "DigitalDemodulator-metadata: Unsupported PSK modulation depth" << std::endl;
-                throw 0;
-            }
-            break;
-        case standardInterfaces::ModulationScheme::QAM:
-            switch (packet_data->modulation_scheme.M) {
-            case 4:
-                SetModulationScheme(SigProc::QPSK);
-                DEBUG(5, DigitalModulator, "Demod set to QPSK (4QAM)");
-                break;
-            case 16:
-                SetModulationScheme(SigProc::QAM16);
-                DEBUG(5, DigitalModulator, "Demod set to 16QAM");
-                break;
-            default:
-                std::cerr << "DigitalDemodulator-metadata: Unsupported QAM modulation depth" << std::endl;
-                throw 0;
-            }
-            break;
-        case standardInterfaces::ModulationScheme::PAM:
-            switch (packet_data->modulation_scheme.M) {
-            case 4:
-                SetModulationScheme(SigProc::PAM4);
-                DEBUG(5, DigitalModulator, "Demod set to 4PAM");
-                break;
-            default:
-                std::cerr << "DigitalDemodulator-metadata: Unsupported PAM modulation depth" << std::endl;
-                throw 0;
-            }
-            break;
-        case standardInterfaces::ModulationScheme::UNKNOWN:
-        default:;
-        }
+        // Set the modulation scheme based on the meta data tag
+        SetModulationSchemeOnMetaData();
 
         // Read input data length
@@ -243 +253 @@
 
         dataIn_0->bufferEmptied();
-        dataOut_0->pushPacket(bits_out);
+        dataOut_0->pushPacket(bits_out, *packet_data);
 
         delete [] b;

experimental/components/DigitalModem/trunk/DigitalModem/src/DigitalDemodulator.h

@@ -81 +81 @@
     DigitalDemodulator_i(DigitalDemodulator_i&);
 
+    /// Configure modulation scheme based on MetaData tag
+    void SetModulationSchemeOnMetaData();
+
     /// Main signal processing method
     void ProcessData();
@@ -91 +94 @@
     standardInterfaces_i::realChar_u *dataOut_0;
 
+    standardInterfaces::MetaData *packet_data;
 };