Changeset 9519

Timestamp:

08/22/09 22:18:16 (4 years ago)

Author:

hvolos

Message:

added MRC, needs debuging

Location:

ossiedev/branches/hvolos/components/MIMODec

Files:

• MIMODec.cpp (modified) (4 diffs)
• MIMODec.h (modified) (1 diff)
• MIMODec.prf.xml (modified) (1 diff)

ossiedev/branches/hvolos/components/MIMODec/MIMODec.cpp

@@ -18 +18 @@
     Mr=1;
     Nt=1;
-    MIMOmethod="STBC";
+    MIMOmethod=0;
     Modmethod="BPSK";
 
@@ -99 +99 @@
         if (strcmp(props[i].id, "DCE:74a38a7c-3b3e-11de-b7e0-0000e80014f9") == 0) {
             const char * prop_str;
+            //string prop_str;
             props[i].value >>= prop_str;
-            MIMOmethod=prop_str;
+            //prop_str=prop_char;
+
+            if (strcmp(prop_str,"MRC")) {
+                MIMOmethod=0;
+
+            } else if (strcmp(prop_str,"STBC")) {
+                MIMOmethod=1;
+
+            } else if (strcmp(prop_str,"VBLAST")) {
+                MIMOmethod=2;
+            };
         }
 
@@ -128 +139 @@
 
     while (1) {
-        Mr=4;
-        Nt=2;
+        //Mr=4;
+        //Nt=2;
+
         NH=Mr*Nt;
         dataIn->getData(I_in, Q_in);
@@ -143 +155 @@
 
         cx_mat H(Mr,Nt);
+        MIMOmethod=0;
+        std::cout<<Mr<<"X"<<Nt<<" M:"<< MIMOmethod<<" DL:"<<Data_length<<std::endl;
         for (int i=0;i<Mr;i++) {
             for (int j=0;j<Nt;j++) {
                 H(i,j)=cx_double((*I_in)[i*Mr+j],(*Q_in)[i*Mr+j])/10000.0;
-                //std::cout<<"Iin:"<<(*I_in)[i*2+j];
+                //std::cout<<"Iin:"<<(*I_in)[i*2+j]<<"  ";
+                std::cout<<"H("<<i<<","<<j<<")="<<H(i,j)<<"  ";
             }
         }
-        //std::cout<<std::endl;
-
-        /*Alamouti
-        for i=1:2:length(RX_symbols1),
-          r1=RX_symbols1(i);
-          r2=RX_symbols1(i+1);
-          RX_symbols(i)=r1*conj(H(1,1))+conj(r2)*H(1,2);
-          RX_symbols(i+1)=r1*conj(H(1,2))-conj(r2)*H(1,1);
-        end;
-        */
+        std::cout<<std::endl;
 
         cx_double r1;
         cx_double r2;
         cx_mat rx_symbols(((Data_length-NH)/Mr),1);
-        short int j=0;
-        //std::cout<<"Decode"<<std::endl;
-        //std::cout<<"Hdec="<<H;
-
-        for (short int i=NH; i<Data_length;i+=2*Mr) {
-            rx_symbols(j,0)=0;
-            rx_symbols(j+1,0)=0;
-
-            for (short int k=0;k<Mr;k++) {
-                r1=cx_double((*I_in)[i+k],(*Q_in)[i+k]);
-                r2=cx_double((*I_in)[i+Mr+k],(*Q_in)[i+Mr+k]);
-                rx_symbols(j,0)+=r1*conj(H(k,0))+conj(r2)*H(k,1);
-                rx_symbols(j+1,0)+=r1*conj(H(k,1))-conj(r2)*H(k,0);
-
+         short int j=0;
+
+        switch (MIMOmethod) {
+        case 0:
+            j=0;
+
+            for (short int i=NH; i<Data_length;i+=Mr) {
+                rx_symbols(j,0)=0;
+
+                for (short int k=0;k<Mr;k++) {
+                    r1=cx_double((*I_in)[i+k],(*Q_in)[i+k]);
+                    rx_symbols(j,0)+=r1*conj(H(k,0));
+                    std::cout<<i<<","<<j<<","<<k<<std::endl;
+                }
+
+                j+=1;
             }
 
-            j+=2;
-        }
+            break;
+        case 1:
+            //std::cout<<std::endl;
+
+            /*Alamouti
+            for i=1:2:length(RX_symbols1),
+              r1=RX_symbols1(i);
+              r2=RX_symbols1(i+1);
+              RX_symbols(i)=r1*conj(H(1,1))+conj(r2)*H(1,2);
+              RX_symbols(i+1)=r1*conj(H(1,2))-conj(r2)*H(1,1);
+            end;
+            */
+
+
+
+            j=0;
+            //std::cout<<"Decode"<<std::endl;
+            //std::cout<<"Hdec="<<H;
+
+            for (short int i=NH; i<Data_length;i+=2*Mr) {
+                rx_symbols(j,0)=0;
+                rx_symbols(j+1,0)=0;
+
+                for (short int k=0;k<Mr;k++) {
+                    r1=cx_double((*I_in)[i+k],(*Q_in)[i+k]);
+                    r2=cx_double((*I_in)[i+Mr+k],(*Q_in)[i+Mr+k]);
+                    rx_symbols(j,0)+=r1*conj(H(k,0))+conj(r2)*H(k,1);
+                    rx_symbols(j+1,0)+=r1*conj(H(k,1))-conj(r2)*H(k,0);
+
+                }
+
+                j+=2;
+            }
+
+            break;
+        case 2:
+            break;
+        }
+
         double scale=1;
         for (short int i=0; i<((Data_length-NH)/Mr);i++) {

ossiedev/branches/hvolos/components/MIMODec/MIMODec.h

@@ -68 +68 @@
     /// Main signal processing method
     void ProcessData();
-   
+
     omni_condition *component_running;  ///< for component shutdown
     omni_thread *processing_thread;     ///< for component writer function
-        
+
         CORBA::Short Mr; //number of rx antennas
         CORBA::Short Nt; //number of tx antennas
-        const char * MIMOmethod;
+        short int MIMOmethod;
+        std::string MIMOmethodstr;
         const char * Modmethod;
 
-    
+
     // list components provides and uses ports
         standardInterfaces_i::complexShort_u *dataOut;
         standardInterfaces_i::complexShort_p *dataIn;
-    
+
 };
 #endif

ossiedev/branches/hvolos/components/MIMODec/MIMODec.prf.xml

@@ -6 +6 @@
     <description>These are the properties to configure the device manager</description>
     <simple id="DCE:4c5f385e-3b3e-11de-b7e0-0000e80014f9" mode="readonly" name="No of TX Antennas" type="short">
-        <value>2</value>
+        <value>1</value>
         <description>Specifies the number of TX antennas. 1 disables the MIMO encoding</description>
         <kind kindtype="configure"/>
     </simple>
     <simple id="DCE:74a38a7c-3b3e-11de-b7e0-0000e80014f9" mode="readonly" name="MIMO Method" type="string">
-        <value>STBC</value>
-        <description>The MIMO method used, currently supports STBC (Alamouti) and VBLAST</description>
+        <value>MRC</value>
+        <description>The MIMO method used, currently supports MRC, STBC (Alamouti) and VBLAST</description>
         <kind kindtype="configure"/>
     </simple>