Changeset 9465

Timestamp:

07/22/09 00:13:50 (4 years ago)

Author:

hvolos

Message:

both rx antennas are used

Files:

• ossiedev/branches/hvolos/components/MIMODec/MIMODec.cpp (modified) (1 diff)

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

@@ -169 +169 @@
         */
 
-        cx_double r1;
-        cx_double r2;
+        cx_double r1,r1b;
+        cx_double r2,r2b;
         cx_mat rx_symbols(((Data_length-NH)/2),1);
         short int j=0;
         //std::cout<<"Decode"<<std::endl;
         std::cout<<"Hdec="<<H;
+        
         for (short int i=NH; i<Data_length;i+=4){
                 r1=cx_double((*I_in)[i],(*Q_in)[i]);
+                r1b=cx_double((*I_in)[i+1],(*Q_in)[i+1]);
                 r2=cx_double((*I_in)[i+2],(*Q_in)[i+2]);
+                r2b=cx_double((*I_in)[i+3],(*Q_in)[i+3]);
                // std::cout<<((Data_length-NH)/2)<<" i:"<<i<<" j"<<j<<std::endl;
                 rx_symbols(j,0)=r1*conj(H(0,0))+conj(r2)*H(0,1);
-                rx_symbols(j+1,0)=r1*conj(H(0,1))-conj(r2)*H(0,0);                                            
+                rx_symbols(j+1,0)=r1*conj(H(0,1))-conj(r2)*H(0,0);
+                rx_symbols(j,0)+=r1b*conj(H(1,0))+conj(r2b)*H(1,1);
+                rx_symbols(j+1,0)+=r1b*conj(H(1,1))-conj(r2b)*H(1,0);
+                                          
                 j+=2;
         } 
-        
+        double scale=1;
         for (short int i=0; i<((Data_length-NH)/2);i++){
-        I_out[i]=(CORBA::Short)real(rx_symbols(i,0));
-        Q_out[i]=(CORBA::Short)imag(rx_symbols(i,0));
+        
+        if ( (real(rx_symbols(i,0))>30000)||(imag(rx_symbols(i,0))>30000))
+        scale=20;
+        else
+        scale=1;
+        
+        
+        I_out[i]=(CORBA::Short)(real(rx_symbols(i,0))/scale);
+        Q_out[i]=(CORBA::Short)(imag(rx_symbols(i,0))/scale);
         std::cout<<"Symbol"<<rx_symbols(i,0)<<std::endl;
         std::cout<<"I:"<<I_out[i]<<"Q:"<<Q_out[i]<<std::endl;