Changeset 4746

Timestamp:

08/16/07 21:38:14 (6 years ago)

Author:

jgaeddert

Message:

fixing ModulateSequence method in DigitalModem, adding autotests

Location:

experimental/components/DigitalModem/trunk/DigitalModem

Files:

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

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

@@ -75 +75 @@
 
     void test_ModulateBPSK() {
+        char b[2] = {BIT0, BIT1};
+        short * I_out = new short[2];
+        short * Q_out = new short[2];
+
+        SetModulationScheme( SigProc::BPSK );
+        ModulateSequence( b, 2, I_out, Q_out );
+        
+        TS_ASSERT_EQUALS( I_out[0], -BPSK_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[0],  0          );
+        
+        TS_ASSERT_EQUALS( I_out[1],  BPSK_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[1],  0          );
+        
+        delete [] I_out;
+        delete [] Q_out;
     }
 
     void test_ModulateQPSK() {
+        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::QPSK );
+        ModulateSequence( b, 8, I_out, Q_out );
+        
+        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[1], -QPSK_LEVEL );
+        
+        TS_ASSERT_EQUALS( I_out[2], -QPSK_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[2],  QPSK_LEVEL );
+        
+        TS_ASSERT_EQUALS( I_out[3], -QPSK_LEVEL );
+        TS_ASSERT_EQUALS( Q_out[3], -QPSK_LEVEL );
+        
+        delete [] I_out;
+        delete [] Q_out;
+
     }
 
     void test_Modulate8PSK() {
+        char b[24] = {BIT0, BIT0, BIT0,
+                      BIT0, BIT0, BIT1,
+                      BIT0, BIT1, BIT0,
+                      BIT0, BIT1, BIT1,
+                      BIT1, BIT0, BIT0,
+                      BIT1, BIT0, BIT1,
+                      BIT1, BIT1, BIT0,
+                      BIT1, BIT1, BIT1};
+        
+        short * I_out = new short[8];
+        short * Q_out = new short[8];
+
+        SetModulationScheme( SigProc::PSK8 );
+        ModulateSequence(b, 24, I_out, Q_out);
+
+        TS_ASSERT_EQUALS( I_out[0],  PSK8_LEVEL_2 );
+        TS_ASSERT_EQUALS( Q_out[0],  0            );
+        
+        TS_ASSERT_EQUALS( I_out[1],  PSK8_LEVEL_1 );
+        TS_ASSERT_EQUALS( Q_out[1],  PSK8_LEVEL_1 );
+        
+        TS_ASSERT_EQUALS( I_out[2],  PSK8_LEVEL_1 );
+        TS_ASSERT_EQUALS( Q_out[2], -PSK8_LEVEL_1 );
+        
+        TS_ASSERT_EQUALS( I_out[3],  0            );
+        TS_ASSERT_EQUALS( Q_out[3], -PSK8_LEVEL_2 );
+        
+        TS_ASSERT_EQUALS( I_out[4], -PSK8_LEVEL_1 );
+        TS_ASSERT_EQUALS( Q_out[4],  PSK8_LEVEL_1 );
+        
+        TS_ASSERT_EQUALS( I_out[5],  0            );
+        TS_ASSERT_EQUALS( Q_out[5],  PSK8_LEVEL_2 );
+        
+        TS_ASSERT_EQUALS( I_out[6], -PSK8_LEVEL_2 );
+        TS_ASSERT_EQUALS( Q_out[6],  0            );
+        
+        TS_ASSERT_EQUALS( I_out[7], -PSK8_LEVEL_1 );
+        TS_ASSERT_EQUALS( Q_out[7], -PSK8_LEVEL_1 );
+        
+        delete [] I_out;
+        delete [] Q_out;
+
     }
 

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

@@ -125 +125 @@
         throw 0;
     } else {
-        for (unsigned int i=0; i<N_in; i++) {
-            ConvertBitsToSymbol(bits_in, s);
+        for (unsigned int i=0; j<N_in; i++) {
+            ConvertBitsToSymbol(bits_in+j, s);
             Modulate(s, I_out[i], Q_out[i]);
             j += bitsPerSymbol;