Changeset 4178

Timestamp:

06/14/07 16:26:19 (6 years ago)

Author:

hvolos

Message:

Components updated, waveform execution is hit or miss, not sure were is the problem

Location:

experimental/components/Conv_Dec

Files:

• Conv_Dec.cpp (modified) (8 diffs)
• Conv_Dec.h (modified) (1 diff)
• Conv_Dec.prf.xml (modified) (1 diff)
• documentation.txt (modified) (2 diffs)

experimental/components/Conv_Dec/Conv_Dec.cpp

@@ -32 +32 @@
     dataOut_0 = new standardInterfaces_i::realChar_u("decoded_bits");
 
-
+    trellisTables=NULL;
     inputGeneratorPolynomialsLength = 2;
     inputGeneratorPolynomials = new unsigned int[inputGeneratorPolynomialsLength];
@@ -38 +38 @@
     inputGeneratorPolynomials[1]=0;
     decoder=new SigProc::fec_conv_decoder;
+    configured=false;
 
     //Create the thread for the writer's processing function 
@@ -52 +53 @@
     delete dataOut_0;
     delete []inputGeneratorPolynomials;
+    delete trellisTables;
 }
 
@@ -124 +126 @@
             props[i].value >>= simple_temp;
             rate_index = simple_temp;
-        }
-
-        if (strcmp(props[i].id, "DCE:ac364768-a06a-49f0-b74c-c4ad22183301") == 0)
-        {
-            CORBA::Short simple_temp;
-            props[i].value >>= simple_temp;
-            block_size = simple_temp;
         }
 
@@ -188 +183 @@
          DEBUG(3, Conv_Dec, "Configure is done, generate the trellis etc")
  
- 
-            TrellisTables=new SigProc::trellisTable(inputGeneratorPolynomials,
-            (short unsigned int) k,
-            (short unsigned int)n,
-            (short unsigned int)K);
-
-            DEBUG(3, Conv_Dec, "trellis table generated")
-
-            decoder->SetTrellisTable(TrellisTables);
+         switch (rate_index){
+            unsigned int genPoly[10];
+            case 0:
+                trellisTables=new SigProc::trellisTable(inputGeneratorPolynomials,
+                (short unsigned int)k,
+                (short unsigned int)n,
+                (short unsigned int)K);
+
+                DEBUG(3, Conv_Dec, "custom trellis table generated")
+                break;
+            case 1:
+                //Rate 1, no trellis needed;           
+            
+                break;
+            case 2:
+                //4/5
+                genPoly[0]=159;
+                genPoly[1]=188;
+                genPoly[2]=110;
+                genPoly[3]=173;
+                genPoly[4]=223;
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)4,
+                (short unsigned int)5,
+                (short unsigned int)2);
+                DEBUG(3, Conv_Dec, "4/5 trellis table generated")
+                break;
+            case 3:
+                 //2/3
+                genPoly[0]=158;
+                genPoly[1]=109;
+                genPoly[2]=223;
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)2,
+                (short unsigned int)3,
+                (short unsigned int)4);
+                DEBUG(3, Conv_Dec, "2/3 trellis table generated")
+                break;
+            case 4:
+                 //1/2
+                genPoly[0]=91;
+                genPoly[1]=121;
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)1,
+                (short unsigned int)2,
+                (short unsigned int)7);
+                DEBUG(3, Conv_Dec, "1/2 trellis table generated")
+                break;
+            case 5:
+                 //1/3
+                genPoly[0]=91;
+                genPoly[1]=101;
+                genPoly[2]=125;
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)1,
+                (short unsigned int)3,
+                (short unsigned int)7);
+                DEBUG(3, Conv_Dec, "1/3 trellis table generated")
+                break;
+            case 6:   
+                 //1/4
+                genPoly[0]=93;
+                genPoly[1]=93;
+                genPoly[2]=103;
+                genPoly[3]=115;
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)1,
+                (short unsigned int)4,
+                (short unsigned int)7);
+                DEBUG(3, Conv_Dec, "1/4 trellis table generated")
+                break;
+            case 7:
+                 //1/5
+                genPoly[0]=125;
+                genPoly[1]=89;
+                genPoly[2]=93;
+                genPoly[3]=93;
+                genPoly[4]=103;
+
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)1,
+                (short unsigned int)5,
+                (short unsigned int)7);
+                DEBUG(3, Conv_Dec, "1/5 trellis table generated")
+                break;
+            case 8:
+                 //1/6
+                genPoly[0]=123;
+                genPoly[1]=105;
+                genPoly[2]=93;
+                genPoly[3]=93;
+                genPoly[4]=115;
+                genPoly[5]=95;
+
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)1,
+                (short unsigned int)6,
+                (short unsigned int)7);
+                DEBUG(3, Conv_Dec, "1/6 trellis table generated")
+                break;
+            case 9:
+                 //1/7
+                genPoly[0]=117;
+                genPoly[1]=101;
+                genPoly[2]=123;
+                genPoly[3]=93;
+                genPoly[4]=93;
+                genPoly[5]=103;
+                genPoly[6]=95;
+                
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)1,
+                (short unsigned int)7,
+                (short unsigned int)7);
+                DEBUG(3, Conv_Dec, "1/7 trellis table generated")
+                break;
+            case 10:
+                 //1/8
+                genPoly[0]=107;
+                genPoly[1]=73;
+                genPoly[2]=117;
+                genPoly[3]=123;
+                genPoly[4]=93;
+                genPoly[5]=93;
+                genPoly[6]=103;
+                genPoly[7]=95;
+                trellisTables=new SigProc::trellisTable(genPoly,
+                (short unsigned int)1,
+                (short unsigned int)8,
+                (short unsigned int)7);
+                DEBUG(3, Conv_Dec, "1/8 trellis table generated")
+                break;
+            default:
+                //Unknown rate
+                throw 0;
+        };         
+          if (rate_index!=1)  {
+            decoder->SetTrellisTable(trellisTables);
 
              DEBUG(4, Conv_Dec, "the trellis was sent to the decoder")
+            }
+            configured=true;
 
 }
@@ -211 +337 @@
     PortTypes::CharSequence *I_in_0(NULL);
     CORBA::UShort I_in_0_length;
-    unsigned short int data2Dec[20],decData[20],noOfSymbols;
+    unsigned short int data2Dec[20],decData[20],noOfSymbols=0;
     //signed short int tmp;
-    unsigned short int numberOfBits, blockIndex;
+    unsigned short int numberOfBits=0;
     SigProc::trellisTable *theTrellisTable;
-    theTrellisTable=TrellisTables;
-    blockIndex=0;
-    DEBUG(4, Conv_Dec, "Before decoder reset")
-    //decoder->Reset();
-    DEBUG(4, Conv_Dec, "After decoder reset")
+    theTrellisTable=trellisTables;
+  
+    //DEBUG(4, Conv_Dec, "Before decoder reset")
+//    decoder->Reset();
+    //DEBUG(4, Conv_Dec, "After decoder reset")
     while(1)
     {
-        blockIndex++;
+
         dataIn_0->getData(I_in_0);
-
+        if (!configured) throw 0;
+        DEBUG(4, Conv_Dec, numberOfBits <<" getData Executed")
         I_in_0_length = I_in_0->length();
         
@@ -230 +357 @@
         DEBUG(4, Conv_Dec, numberOfBits <<" bits received")
         
+        if (rate_index==1){
+            I_out_0.length(I_in_0_length);
+            for (unsigned int i=0;i<I_in_0_length;i++) {
+                I_out_0[i]=(*I_in_0)[i];
+            };
+            DEBUG(4, Conv_Dec, "Pass through mode, no decoding done")
+        }
+        else {
         noOfSymbols=numberOfBits/theTrellisTable->n;
         DEBUG(5, Conv_Dec, "Number of symbols:"<<noOfSymbols) 
@@ -256 +391 @@
             }
         }
-
-       DEBUG(4, Conv_Dec, noOfSymbols*theTrellisTable->n<<"Dec Bits sent to the next component")
+             DEBUG(5, Conv_Dec, "Will reset the decoder")
+        decoder->Reset();
+             DEBUG(5, Conv_Dec, "The decoder was reset")
+        }
+       DEBUG(4, Conv_Dec, noOfSymbols*theTrellisTable->k<<"Dec Bits sent to the next component")
+        
+
+        dataOut_0->pushPacket(I_out_0);
         dataIn_0->bufferEmptied();
-        dataOut_0->pushPacket(I_out_0);
     }
 }

experimental/components/Conv_Dec/Conv_Dec.h

@@ -90 +90 @@
         
          CORBA::Short rate_index;
-        CORBA::Short block_size;
         CORBA::Short mode;
         CORBA::Short k;
         CORBA::Short K;
-        CORBA::Short n;
+        CORBA::Short n; 
         
         unsigned short int inputGeneratorPolynomialsLength;
         unsigned int*inputGeneratorPolynomials;
+
+    bool configured;
         
-        SigProc::trellisTable *TrellisTables;
+        SigProc::trellisTable *trellisTables;
         SigProc::fec_conv_decoder  * decoder;
         

experimental/components/Conv_Dec/Conv_Dec.prf.xml

@@ -6 +6 @@
     <simple type="short" id="DCE:0e756459-63b7-4f5e-8b15-e5fbe3bf200f" name="rate_index" mode="readwrite">
         <description>The index of the decoding rate from the supported rates table. For a custom rate use rate_index=0</description> 
-        <value>0</value> 
-        <kind kindtype="configure"/>
-    </simple>
-    <simple type="short" id="DCE:ac364768-a06a-49f0-b74c-c4ad22183301" name="block_size" mode="readwrite">
-        <description>The number of bits that were encoded for each block</description> 
-        <value>1024</value> 
+        <value>1</value> 
         <kind kindtype="configure"/>
     </simple>

experimental/components/Conv_Dec/documentation.txt

@@ -24 +24 @@
 
 \section description Basic description
-Include a basic description of the Conv_Dec component here
+The Conv_Dec is a convolutional encoder
 
 \section properties Properties
 This section details the properties
 
-\subsection prop_property_name Property Name (DCE:xxxx-xxx-xxx-xxx-xxxx)
+\subsection rate_index Rate Index (DCE:0e756459-63b7-4f5e-8b15-e5fbe3bf200f)
+    The index of the desired decoding rate from the supported rates list
+    
+    -Rates List:
+        - 0: Custom rate (need to use k,K,n and generatorPolynomials properties)
+        - 1: Pass through (no decoding)
+        - 2: 4/5 K=2
+        - 3: 2/3 K=4
+        - 4: 1/2 K=7
+        - 5: 1/3 K=7
+        - 6: 1/4 K=7
+        - 7: 1/5 K=7
+        - 8: 1/6 K=7
+        - 9: 1/7 K=7
+        - 10:1/8 K=7
+
+\subsection mode mode(DCE:8fd6f6e3-41d0-40b4-a26a-5ebdd6514931)
+   mode 0 means the encoder started at the zero state
+   mode 1 means that the encoder both started and finished at the zero state (not fully implemented yet)
+ 
+\subsection  k k(DCE:c8638626-7377-4b2e-a2a4-85de280eac05) 
+Input bits at a time (for the custom rate rate_index=0) The encoder rate = k/n
+
+\subsection  K K(DCE:91b1454d-f5b7-4049-a60c-cf5d587f3149)
+      Constrain length for the custom rate. (rate_index=0)
+
+\subsection  n n(DCE:6fa08774-471e-4761-aa7b-a37ba2166cf9)
+Output bits at a time for the custom rate index, has to match the number of suplied polynomials (rate_index=0) The encoder rate = k/n
+
+\subsection  generatorPolynomials  generatorPolynomials(DCE:7a4234e2-fe15-44e0-bedb-cffc9e2ec78d)
+A list of generator polynomials in DECIMAL for the custom rate (rate_index=0)
 
 \section interfaces Interfaces
@@ -37 +67 @@
 
 \section dependencies Software build dependencies
-  - Dependency 1
-  - Dependency 2
+  - SigProc
 
 \section algorithm Detailed Description of Algorithm
+Convolutioal Encoder
 
 \section status Status and history
+Needs testing
 
 \section references References
-
+Proakis Digital Communications 4th Edition
 */