Changeset 8328

Timestamp:

09/29/08 13:46:23 (5 years ago)

Author:

hvolos

Message:

directory for waveforms

Location:

ossiedev/branches/hvolos

Files:

• components/Channel/Channel.cpp (modified) (6 diffs)
• components/Channel/Channel.h (modified) (3 diffs)
• components/USRPSWDIV/USRPSWDIV.cpp (modified) (2 diffs)
• waveforms (added)

ossiedev/branches/hvolos/components/Channel/Channel.cpp

@@ -24 +24 @@
 #include <string>
 #include <iostream>
+#include "math.h"
 #include "Channel.h"
 
@@ -29 +30 @@
     Resource_impl(uuid), component_running(condition) 
 {
-    dataIn_0 = new standardInterfaces_i::complexShort_p("data_in");
-    dataOut_0 = new standardInterfaces_i::complexShort_u("data_out");
+    dataIn = new standardInterfaces_i::complexShort_p("data_in");
+    dataOut = new standardInterfaces_i::complexShort_u("data_out");
 
     //Create the thread for the writer's processing function 
@@ -42 +43 @@
 Channel_i::~Channel_i(void)
 {   
-    delete dataIn_0;
-    delete dataOut_0;
+    delete dataIn;
+    delete dataOut;
 }
 
@@ -59 +60 @@
     CORBA::Object_var p;
 
-    p = dataIn_0->getPort(portName);
+    p = dataIn->getPort(portName);
 
     if (!CORBA::is_nil(p))
         return p._retn();
 
-    p = dataOut_0->getPort(portName);
+    p = dataOut->getPort(portName);
 
     if (!CORBA::is_nil(p))
@@ -120 +121 @@
         if (strcmp(props[i].id, "DCE:3bbc0656-8a83-11dd-bcd3-0016769e497b") == 0)
         {
+        }
+    }
 }
 
@@ -126 +129 @@
     DEBUG(3, Channel, "ProcessData() invoked")
 
-    PortTypes::ShortSequence I_out_0, Q_out_0;
+    PortTypes::ShortSequence I_out, Q_out;
 
 
-    PortTypes::ShortSequence *I_in_0(NULL), *Q_in_0(NULL);
-    CORBA::UShort I_in_0_length, Q_in_0_length;
+    PortTypes::ShortSequence *I_in(NULL), *Q_in(NULL);
+    CORBA::UShort Data_length;
+    CORBA::Double noise_sigma;
 
     while(1)
     {
-        dataIn_0->getData(I_in_0, Q_in_0);
+        dataIn->getData(I_in, Q_in);
 
-        I_in_0_length = I_in_0->length();
-        Q_in_0_length = Q_in_0->length();
+        Data_length = I_in->length();
 
-        I_out_0.length(); //must define length of output
-        Q_out_0.length(); //must define length of output
+
+        I_out.length(Data_length); //must define length of output
+        Q_out.length(Data_length); //must define length of output
 
         /*insert code here to do work*/
+        noise_sigma=1;
+
+        for (unsigned int i=0; i<Data_length;i++)
+        {
 
 
 
+        //Add AWGN Noise
+        I_out[i]=(*I_in)[i]+(CORBA::Short)(noise_sigma*randn());
+        Q_out[i]=(*Q_in)[i]+(CORBA::Short)(noise_sigma*randn());
+        }
 
 
-
-        dataIn_0->bufferEmptied();
-        dataOut_0->pushPacket(I_out_0, Q_out_0);
+        dataIn->bufferEmptied();
+        dataOut->pushPacket(I_out, Q_out);
     }
 }
 
+float Channel_i::randn()
+//Generates a Gaussian distributed number with zero mean and unit standard deviation
+// Adapted from http://www.taygeta.com/random/gaussian.html
+// Algorithm bny Dr. Everett (Skip) Carter, Jr
+{
+float x1,x2,w;
+    do
+    {
+        x1=2.0*randf()-1.0;
+        x2=2.0*randf()-1.0;
+        w=x1*x1+x2*x2;
 
+    }while (w>=1.0);
+
+    w=sqrt((-2.0*log(w))/w);
+    return x1*w;
+    //y2=x2*w;
+
+}
+
+float Channel_i::randf()
+// Uniformly distributed number from 0 to 1
+{
+    return rand()/(float)RAND_MAX;
+}
+
+

ossiedev/branches/hvolos/components/Channel/Channel.h

@@ -74 +74 @@
             CF::PropertySet::PartialConfiguration);
 
-
-  private:
+   private:
     /// Disallow default constructor
     Channel_i();
@@ -89 +88 @@
         
         CORBA::Short simple_0_value;
-        CORBA::String simple_1_value;
+        //CORBA::String simple_1_value;
         CORBA::Short simple_2_value;
         CORBA::Short simple_3_value;
@@ -95 +94 @@
     
     // list components provides and uses ports
-        standardInterfaces_i::complexShort_p *dataIn_0;
-        standardInterfaces_i::complexShort_u *dataOut_0;
+        standardInterfaces_i::complexShort_p *dataIn;
+        standardInterfaces_i::complexShort_u *dataOut;
+
+    float randn();
+    float randf();
     
 };

ossiedev/branches/hvolos/components/USRPSWDIV/USRPSWDIV.cpp

@@ -231 +231 @@
             
             //std::cout<<"ant:"<<ant<<".";
-        }
 
         rx_config[0].id = CORBA::string_dup("SET_RX_ANT_1");
@@ -238 +237 @@
         rx_control->set_values(rx_config);
 
+        }
+
+
+
 
         rx_data_in->bufferEmptied();