Changeset 8367

Timestamp:

10/13/08 13:06:11 (5 years ago)

Author:

hvolos

Message:

added fading capability

Location:

ossiedev/branches/hvolos/components/Channel

Files:

• Channel.cpp (modified) (8 diffs)
• Channel.h (modified) (1 diff)

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

@@ -33 +33 @@
     dataOut = new standardInterfaces_i::complexShort_u("data_out");
 
+    fading=false;
+
+    noise_sigma=0;
+    K_factor=1;
+    MaxDopplerRate=0;
+
     //Create the thread for the writer's processing function 
     processing_thread = new omni_thread(Run, (void *) this);
@@ -38 +44 @@
     //Start the thread containing the writer's processing function 
     processing_thread->start();
+
 
 }
@@ -112 +119 @@
         std::cout << "Property id : " << props[i].id << std::endl;
 
-        if (strcmp(props[i].id, "DCE:eddc66ce-8a82-11dd-ae05-0016769e497b") == 0)
-        {
+        if (strcmp(props[i].id, "DCE:eddc66ce-8a82-11dd-ae05-0016769e497b") == 0) {
+            //The power of the AWGN noise
             CORBA::Short simple_temp;
             props[i].value >>= simple_temp;
-            simple_0_value = simple_temp;
-        }
-
-        if (strcmp(props[i].id, "DCE:3bbc0656-8a83-11dd-bcd3-0016769e497b") == 0)
-        {
+            noise_sigma = sqrt(simple_temp/2.0);
+        } else if (strcmp(props[i].id, "DCE:3bbc0656-8a83-11dd-bcd3-0016769e497b") == 0) {
+            //Specifies the fading type. Valid values are None and Ricean
+            const char * prop_str;
+            props[i].value >>= prop_str;
+            if ( strcmp(prop_str, "None") == 0 ) {
+            fading=false;
+            } else if ( strcmp(prop_str, "Ricean") == 0 ){
+               fading=true;
+            } else {
+              std::cerr << "ERROR: Channel::configure() unknown fading type" << std::endl;
+               throw CF::PropertySet::InvalidConfiguration();
+            };
+            
+
+        }       } else if (strcmp(props[i].id, "DCE:25a1df92-7f22-43af-8720-ad37714a66db") == 0) {
+            // Frame size
+            CORBA::UShort simple_temp;
+            props[i].value >>= simple_temp;
+
+            ConfigureFrameSize(simple_temp);
+
+        } else {
+            // unknown property
+            std::cerr << "ERROR: Channel::configure() unknown property" << std::endl;
+            throw CF::PropertySet::InvalidConfiguration();
         }
     }
@@ -134 +162 @@
     PortTypes::ShortSequence *I_in(NULL), *Q_in(NULL);
     CORBA::UShort Data_length,NumberOfMultipath;
-    CORBA::Double noise_sigma,K,MaxDopplerRate;
 
     NumberOfMultipath=50;
@@ -169 +196 @@
 
         /*insert code here to do work*/
-        noise_sigma=0;
+
 
 
@@ -175 +202 @@
         for (unsigned int i=0; i<Data_length;i++)
         {
+            
+            if (fading){
             pI=0;
             pQ=0;
@@ -180 +209 @@
             for (unsigned int j=0;j<NumberOfMultipath;j++)
             {
-                totalphi=2*PI*(DopplerFreq[j]*(i+packetno*Data_length)   +phi);
+                totalphi=2*PI*(DopplerFreq[j]*(i+packetno*Data_length)+phi);
                 pI+=cos(totalphi);
                 pQ+=sin(totalphi);
@@ -188 +217 @@
             pI/=PathPower;
             pQ/=PathPower;
+            }
+            else {
+             pI=1;
+             pQ=1;
+            };
        
         //Add AWGN Noise

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

@@ -97 +97 @@
         standardInterfaces_i::complexShort_u *dataOut;
 
+    bool fading;
+
+    double noise_sigma,K_factor,MaxDopplerRate;
+
     float randn();
     float randf();