Changeset 5248

Timestamp:

10/06/07 12:42:31 (6 years ago)

Author:

jgaeddert

Message:

Updating DigitalModem components to work with SigProc? from r5246:5247

Location:

experimental/components/DigitalModem/trunk/DigitalModem

Files:

• atsrc/DigitalDemodulator_testsuite.h (modified) (2 diffs)
• atsrc/DigitalModulator_testsuite.h (modified) (1 diff)
• src/DigitalModem.cpp (modified) (1 diff)

experimental/components/DigitalModem/trunk/DigitalModem/atsrc/DigitalDemodulator_testsuite.h

@@ -143 +143 @@
 
     void test_DemodulateQPSK() {
-        short I[4] = {10,  10, -10, -10};
-        short Q[4] = {10, -10,  10, -10};
+        short I[4] = {10,   0,   0, -10};
+        short Q[4] = { 0, -10,  10,   0};
         char * bits_out = new char[8];
 
@@ -162 +162 @@
     }
 
+    void test_DemodulateQAM4() {
+        short I[4] = {10,  10, -10, -10};
+        short Q[4] = {10, -10,  10, -10};
+        char * bits_out = new char[8];
+
+        SetModulationScheme( SigProc::QAM4 );
+        DemodulateSequence(I, Q, 4, bits_out);
+
+        TS_ASSERT_EQUALS( bits_out[0], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[1], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[2], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[3], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[4], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[5], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[6], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[7], BIT1 );
+
+        delete [] bits_out;
+    }
+
+    
     void test_Demodulate8PSK() {
         short I[8] = { 100,  71,  71,    0, -71,   0, -100, -71};

experimental/components/DigitalModem/trunk/DigitalModem/atsrc/DigitalModulator_testsuite.h

@@ -105 +105 @@
         
         TS_ASSERT_EQUALS( I_out[0],  QPSK_LEVEL );
-        TS_ASSERT_EQUALS( Q_out[0],  QPSK_LEVEL );
-        
-        TS_ASSERT_EQUALS( I_out[1],  QPSK_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[0],  0          );
+        
+        TS_ASSERT_EQUALS( I_out[1],  0          );
         TS_ASSERT_EQUALS( Q_out[1], -QPSK_LEVEL );
         
-        TS_ASSERT_EQUALS( I_out[2], -QPSK_LEVEL );
+        TS_ASSERT_EQUALS( I_out[2],  0          );
         TS_ASSERT_EQUALS( Q_out[2],  QPSK_LEVEL );
         
         TS_ASSERT_EQUALS( I_out[3], -QPSK_LEVEL );
-        TS_ASSERT_EQUALS( Q_out[3], -QPSK_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[3],  0          );
+        
+        delete [] I_out;
+        delete [] Q_out;
+
+    }
+
+    void test_ModulateQAM4() {
+        char b[8] = {BIT0, BIT0,
+                     BIT0, BIT1,
+                     BIT1, BIT0,
+                     BIT1, BIT1};
+                     
+        short * I_out = new short[4];
+        short * Q_out = new short[4];
+
+        SetModulationScheme( SigProc::QAM4 );
+        ModulateSequence( b, 8, I_out, Q_out );
+        
+        TS_ASSERT_EQUALS( I_out[0],  QAM4_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[0],  QAM4_LEVEL );
+        
+        TS_ASSERT_EQUALS( I_out[1],  QAM4_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[1], -QAM4_LEVEL );
+        
+        TS_ASSERT_EQUALS( I_out[2], -QAM4_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[2],  QAM4_LEVEL );
+        
+        TS_ASSERT_EQUALS( I_out[3], -QAM4_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[3], -QAM4_LEVEL );
         
         delete [] I_out;

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

@@ -60 +60 @@
         Modulate = &Modulate8PSK;
         bitsPerSymbol = 3;
+        differentialMode = false;
+        break;
+    case QAM4:
+        Demodulate = &DemodulateQAM4;
+        Modulate = &ModulateQAM4;
+        bitsPerSymbol = 2;
         differentialMode = false;
         break;