Changeset 4104

Timestamp:

06/03/07 16:16:31 (6 years ago)

Author:

jgaeddert

Message:

removing antiquated methods, moving to DSP class

Location:

experimental/components/PacketizerSimpleBPSK

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/PNCodes.cpp (modified) (1 diff)
• src/PNCodes.h (modified) (1 diff)
• src/PacketizerDSP.cpp (added)
• src/PacketizerDSP.h (added)
• src/PacketizerSimpleBPSK.cpp (modified) (4 diffs)
• src/PacketizerSimpleBPSK.h (modified) (2 diffs)

experimental/components/PacketizerSimpleBPSK/Makefile.am

@@ -6 +6 @@
     src/PacketizerSimpleBPSK.cpp                \
     src/PacketizerSimpleBPSK.h                  \
+    src/PacketizerDSP.h                     \
+    src/PacketizerDSP.cpp                   \
     src/PNCodes.h                           \
     src/PNCodes.cpp                         \

experimental/components/PacketizerSimpleBPSK/configure.ac

@@ -19 +19 @@
 AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])])
 
+AC_CHECK_LIB([sigproc], [main], [], [AC_MSG_ERROR([cannot find sigproc library])])
+AC_CHECK_HEADERS([sigproc/SigProc.h], [], [AC_MSG_ERROR([cannot find sigproc library header files])])
+
 AC_CHECK_LIB([standardInterfaces], [main], [], [AC_MSG_ERROR([cannot find standardInterfaces])])
 AC_CHECK_HEADERS([standardinterfaces/complexShort.h], [], [AC_MSG_ERROR([cannot find standardInterfaces header files])])

experimental/components/PacketizerSimpleBPSK/src/PNCodes.cpp

@@ -30 +30 @@
     0, 0, 0};
 
+// P/N packet control code
+char pnControlCode[7] = {1, 1, 1, 0, 1, 0, 0};
+
+// P/N inverse packet control code
+char pnControlCodeInv[7] = {0, 0, 0, 1, 0, 1, 1};
+
+

experimental/components/PacketizerSimpleBPSK/src/PNCodes.h

@@ -28 +28 @@
 extern char pnPacketSyncCode[63];
 
+// P/N packet control code
+extern char pnControlCode[7];
+
+// P/N inverse packet control code
+extern char pnControlCodeInv[7];
+

experimental/components/PacketizerSimpleBPSK/src/PacketizerSimpleBPSK.cpp

@@ -36 +36 @@
     dataOut_0 = new standardInterfaces_i::realChar_u("bitsOut");
 
-    // set initial variable values
-    preamble = NULL;
-    preambleLength = 35;
-    pnSyncCode = NULL;
-    pnSyncCodeLength = 31;
-    controlBlock = NULL;
-    controlBlockLength = 15;
-    // dataBlock = NULL;
-    dataBlockLength = 400;
-    pnEOMCode = NULL;
-    pnEOMCodeLength = 31;
-
-    ConfigurePreamble();
-    //ConfigurePNSyncCode( 0x75ac21a8 );
-    ConfigurePNSyncCode( 0x05763e69 ); // m-sequence
-    ConfigureControlData( 0 );
-    //ConfigurePNEOMCode( 0x71357ac1 );
-    ConfigurePNEOMCode( 0x3e690576 );
-
     //Create the thread for the writer's processing function 
     processing_thread = new omni_thread(Run, (void *) this);
@@ -68 +49 @@
     delete dataIn_1;
     delete dataOut_0;
-
-    if ( preamble != NULL )
-        delete [] preamble;
-
-    if ( pnSyncCode != NULL )
-        delete [] pnSyncCode;
-
-    if ( controlBlock != NULL )
-        delete [] controlBlock;
-
-    if ( pnEOMCode != NULL )
-        delete [] pnEOMCode;
 }
 
@@ -142 +111 @@
     
     DEBUG(3, PacketizerSimpleBPSK, "props length : " << props.length())
-#if 0
-    unsigned int j;
-
-    for (unsigned int i = 0; i <props.length(); i++)
-    {
-        DEBUG(3, PacketizerSimpleBPSK, "Property id : " << props[i].id)
-
-        // sync_code
-        if (strcmp(props[i].id, "DCE:58fa6fbf-0daa-4ed4-9d33-7f343a92c184") == 0)
-        {
-            CORBA::ULong simple_temp;
-            props[i].value >>= simple_temp;
-            simple_0_value = simple_temp;
-            if ( pnSyncCode != NULL )
-                delete [] pnSyncCode;
-            pnSyncCode  = new char[pnSyncCodeLength];
-            std::cout << "--- SYNC code: ";
-            for (j=0; j<pnSyncCodeLength; j++)
-            {
-                pnSyncCode[j] = (simple_0_value & 0x0001 == 0) ? BIT0 : BIT1;
-                simple_0_value >>= 1;
-                std::cout << pnSyncCode[j] << " ";
-            }
-            std::cout << std::endl;
-        }
-
-        // packetLength
-        if (strcmp(props[i].id, "DCE:e99ff5ab-d06a-4c99-965a-73901478176e") == 0)
-        {
-            CORBA::ULong simple_temp;
-            props[i].value >>= simple_temp;
-            // simple_1_value = simple_temp;
-            dataBlockLength = simple_temp;
-        }
-
-        // eom_code
-        if (strcmp(props[i].id, "DCE:67fa3260-533a-4184-be7c-c1868b3f70dd") == 0)
-        {
-            CORBA::ULong simple_temp;
-            props[i].value >>= simple_temp;
-            simple_2_value = simple_temp;
-            if ( pnEOMCode != NULL )
-                delete [] pnEOMCode;
-            pnEOMCode  = new char[pnEOMCodeLength];
-            std::cout << "--- EOM code: ";
-            for (j=0; j<pnEOMCodeLength; j++)
-            {
-                pnEOMCode[j] = (simple_2_value & 0x0001 == 0) ? BIT0 : BIT1;
-                simple_2_value >>= 1;
-                std::cout << pnEOMCode[j] << " ";
-            }
-            std::cout << std::endl;
-        }
-
-    }
-#endif
 }
 
-void PacketizerSimpleBPSK_i::ConfigurePreamble()
-{
-    if ( preamble != NULL )
-        delete [] preamble;
-    
-    unsigned int i;
-    preamble = new char[preambleLength];
-    for (i=0; i<preambleLength; i++)
-        preamble[i] = ( i%2==0 ) ? BIT0 : BIT1;
-
-}
-
-void PacketizerSimpleBPSK_i::ConfigurePNSyncCode( unsigned int _code )
-{
-    if ( pnSyncCode != NULL )
-        delete [] pnSyncCode;
-    
-    signed int i;
-    pnSyncCode = new char[pnSyncCodeLength];
-    for (i=pnSyncCodeLength-1; i>=0; i--)
-    {
-        pnSyncCode[i] = ( (_code & 0x0001) == 0 ) ? BIT0 : BIT1;
-        _code >>= 1;
-    }
-
-    std::cout << "PacketizerSimpleBPSK: (sync code) ";
-    for (i=0; (unsigned int) i<pnSyncCodeLength; i++)
-        std::cout << (int) pnSyncCode[i];
-    std::cout << std::endl;
-
-}
-
-void PacketizerSimpleBPSK_i::ConfigureControlData( unsigned int _data )
-{
-    if ( controlBlock != NULL )
-        delete [] controlBlock;
-    
-    signed int i;
-    controlBlock = new char[controlBlockLength];
-    for (i=controlBlockLength-1; i>=0; i--)
-    {
-        controlBlock[i] = ( (_data & 0x0001) == 0 ) ? BIT0 : BIT1;
-        _data >>= 1;
-    }
-
-}
-
-void PacketizerSimpleBPSK_i::ConfigurePNEOMCode( unsigned int _code )
-{
-    if ( pnEOMCode != NULL )
-        delete [] pnEOMCode;
-    
-    signed int i;
-    pnEOMCode = new char[pnEOMCodeLength];
-    for (i=pnEOMCodeLength-1; i>=0; i--)
-    {
-        pnEOMCode[i] = ( (_code & 0x0001) == 0 ) ? BIT0 : BIT1;
-        _code >>= 1;
-    }
-
-    std::cout << "PacketizerSimpleBPSK: (eom code) ";
-    for (i=0; (unsigned int) i<pnEOMCodeLength; i++)
-        std::cout << (int) pnEOMCode[i];
-    std::cout << std::endl;
-
-}
 
 void PacketizerSimpleBPSK_i::RunLoop()
@@ -288 +135 @@
         
         //dataBlockLength = data_bits_in->length();
-        bits_out.length( preambleLength +
-                         pnSyncCodeLength +
-                         controlBlockLength +
-                         dataBlockLength +
-                         pnEOMCodeLength );
-        N=0;
-        DEBUG(7, PacketizerSimpleBPSK, "preparing to copy data...")
-
-        DEBUG(7, PacketizerSimpleBPSK, "copying preamble")
-        // copy preamble sync pattern
-        for (i=0; i<preambleLength; i++)
-            bits_out[i] = preamble[i];
-        N += preambleLength;
+        bits_out.length( 512 );
 
         DEBUG(7, PacketizerSimpleBPSK, "copying P/N sync code")
         // copy P/N sync code
-        for (i=0; i<pnSyncCodeLength; i++)
+        for (i=0; i<63; i++)
             bits_out[N+i] = pnSyncCode[i];
-        N += pnSyncCodeLength;
+        N += 63;
 
         DEBUG(7, PacketizerSimpleBPSK, "copying control data")
-        unsigned int ctrl;
-        ctrl = k | (k<<5) | (k<<10);
-        ConfigureControlData( ctrl );
-        // copy control data
-        for (i=0; i<controlBlockLength; i++)
-            bits_out[N+i] = (*control_bits_in)[i];//controlBlock[i];
-        N += controlBlockLength;
+        N += 49;
 
         DEBUG(7, PacketizerSimpleBPSK, "copying data block")
-        // copy data block
-        for (i=0; i<dataBlockLength; i++)
+        for (i=0; i<400; i++)
             bits_out[N+i] = (*data_bits_in)[i];
-        N += dataBlockLength;
-
-        DEBUG(7, PacketizerSimpleBPSK, "copying P/N EOM code")
-        // copy P/N eom code
-        for (i=0; i<pnEOMCodeLength; i++)
-            bits_out[N+i] = pnEOMCode[i];
-        N += pnEOMCodeLength;
+        N += 400;
 
         DEBUG(5, PacketizerSimpleBPSK, "pushing data " << N << " samples...")

experimental/components/PacketizerSimpleBPSK/src/PacketizerSimpleBPSK.h

@@ -35 +35 @@
 #include "standardinterfaces/realChar_p.h"
 
+#include "PacketizerDSP.h"
 
-class PacketizerSimpleBPSK_i : public virtual Resource_impl
+class PacketizerSimpleBPSK_i : public virtual Resource_impl, public PacketizerDSP
 {
   public:
@@ -96 +97 @@
     standardInterfaces_i::realChar_u *dataOut_0; // output packet
 
-    // algorithm methods
-    void ConfigurePreamble();
-    void ConfigurePNSyncCode( unsigned int _code );
-    void ConfigureControlData( unsigned int _data );
-    void ConfigurePNEOMCode( unsigned int _code );
-
-    // algorithm variables
-    char * preamble;
-    unsigned int preambleLength;
-    char * pnSyncCode;
-    unsigned int pnSyncCodeLength;
-    char * controlBlock;
-    unsigned int controlBlockLength;
-    // char * dataBlock;
-    unsigned int dataBlockLength;
-    char * pnEOMCode;
-    unsigned int pnEOMCodeLength;
+    /// Operational mode
+    enum {
+        ASSEMBLE_PN_PACKET_SYNC_CODE,
+        ASSEMBLE_CONTROL_CODES,
+        ASSEMBLE_PACKET
+    } operationalMode;
     
 };