Changeset 8935

Timestamp:

03/09/09 17:28:21 (4 years ago)

Author:

hvolos

Message:

Added properties to RxTxManager?

Location:

ossiedev/branches/hvolos/packetwfrm/components/RxTxManager

Files:

• RxTxManager.cpp (modified) (5 diffs)
• RxTxManager.h (modified) (1 diff)
• RxTxManager.prf.xml (modified) (1 diff)
• RxTxManager.spd.xml (modified) (1 diff)
• documentation.txt (modified) (2 diffs)

ossiedev/branches/hvolos/packetwfrm/components/RxTxManager/RxTxManager.cpp

@@ -33 +33 @@
 
 
-
-const float RxTxManager_i::frs_channels[14] = {
-    462.5625e+06f,
-    462.5875e+06f,
-    462.6125e+06f,
-    462.6375e+06f,
-    462.6625e+06f,
-    462.6875e+06f,
-    462.7125e+06f,
-    467.5625e+06f,
-    467.5875e+06f,
-    467.6125e+06f,
-    467.6375e+06f,
-    467.6625e+06f,
-    467.6875e+06f,
-    467.7125e+06f};
 
 RxTxManager_i::RxTxManager_i(const char *uuid, omni_condition *condition) :
@@ -66 +50 @@
 
     // Initialize RF properties
-    current_frs_channel = 1;
+
     tx_interp = 512;
-    tx_freq = frs_channels[current_frs_channel-1];
+    tx_freq = 462.5625e+06;
     tx_gain = 1;                // USRP tx gain, not RxTxManager gain_tx
     tx_start = true;
     rx_decim = 256;
     rx_gain_max = 1;
-    rx_freq = frs_channels[current_frs_channel-1];
+    rx_freq = 462.5625e+06;
     rx_gain = 1;
     rx_size = 2048;
@@ -82 +66 @@
     rx_power_threshold_lo = 20.0f;
     rx_power_threshold_hi = 35.0f;
+    conjugate_rx=false;
  
 
@@ -284 +269 @@
     {
         std::cout << "Property id : " << props[i].id << std::endl;
+        
+        if (strcmp(props[i].id, "DCE:c1fe96b4-52db-458a-bef8-ff0834548fc3") == 0) {
+            // RX Frequency
+            CORBA::Float F;
+            props[i].value >>= F;
+            DEBUG(3, RxTxManager, "RX Frequency property= " << F)
+            rx_freq = F;
+            RXControl->set_frequency(DEFAULT_USRP_RX_CHANNEL, rx_freq);
+        } else if (strcmp(props[i].id, "DCE:ddd746f5-a99f-414e-9d98-6470ecf75454") == 0) {
+            // TX Frequency
+            CORBA::Float F;
+            props[i].value >>= F;
+            DEBUG(3, RxTxManager, "TX Frequency property= " << F)
+            tx_freq = F;
+            TXControl->set_frequency(DEFAULT_USRP_TX_CHANNEL, tx_freq);
+        } else if (strcmp(props[i].id, "DCE:4ba6cb86-29fb-40c8-a90c-7e69b7e59d85") == 0) {
+           const char * prop_str;
+            props[i].value >>= prop_str;
+            if ( strcmp(prop_str, "True") == 0 ) {
+               conjugate_rx=true;
+            } else if ( strcmp(prop_str, "False") == 0 ){
+               conjugate_rx=false;
+            } else {
+              std::cerr << "ERROR: Channel::configure() unknown envelope type" << std::endl;
+               throw CF::PropertySet::InvalidConfiguration();
+           };
+         }
 
     }
@@ -355 +367 @@
         I_out_rx.length(N_out);
         Q_out_rx.length(N_out);
-        for (i=0; i<N_in; i++) {
-            // apply IIR pre-filter
-            lpf_i->do_work((*I_in_rx)[i], I_buf[i]);
-            lpf_q->do_work(-(*Q_in_rx)[i], Q_buf[i]);
+        
+        if (conjugate_rx==true){
+                for (i=0; i<N_in; i++) {
+                    // apply IIR pre-filter
+                    lpf_i->do_work((*I_in_rx)[i], I_buf[i]);
+                    lpf_q->do_work(-(*Q_in_rx)[i], Q_buf[i]);
+                    }
+        } else {
+                for (i=0; i<N_in; i++) {
+                    // apply IIR pre-filter
+                    lpf_i->do_work((*I_in_rx)[i], I_buf[i]);
+                    lpf_q->do_work((*Q_in_rx)[i], Q_buf[i]);
+                }
         }
-
 
  

ossiedev/branches/hvolos/packetwfrm/components/RxTxManager/RxTxManager.h

@@ -159 +159 @@
 
     // RxTxManager RF properties
-    int current_frs_channel;
-    int num_channels;
+    bool conjugate_rx;
+
     float gain_tx;
     float rx_power_threshold_lo;

ossiedev/branches/hvolos/packetwfrm/components/RxTxManager/RxTxManager.prf.xml

@@ -4 +4 @@
 <!--Powered by Python-->
 <properties>
+    <simple id="DCE:89b1a5b3-0623-4d66-b436-6482a6aab765" mode="readonly" name="Conjugate Rx Data" type="string">
+        <value>True</value> 
+        <description>Might need to set to "True" for some USRP Daughterboards</description> 
+        <kind kindtype="configure"/>
+    </simple>
+    <simple type="float" id="DCE:ddd746f5-a99f-414e-9d98-6470ecf75454" name="tx_freq" mode="readwrite">
+        <description>Transmitter Frequency</description> 
+        <value>465.5625e+06</value> 
+        <kind kindtype="configure"/>
+    </simple>
+    <simple type="float" id="DCE:c1fe96b4-52db-458a-bef8-ff0834548fc3" name="rx_freq" mode="readwrite">
+        <description>Receiver Frequency</description> 
+        <value>465.5625e+06</value> 
+        <kind kindtype="configure"/>
+    </simple>
 </properties>

ossiedev/branches/hvolos/packetwfrm/components/RxTxManager/RxTxManager.spd.xml

@@ -5 +5 @@
 <softpkg id="DCE:8f1fa7f6-77cd-4d3e-885f-6a8118647237" name="RxTxManager">
     <title/>
-    <description>The main CIREN controlling entity</description> 
+    <description>Controls the RX and TX operation</description> 
     <author>
         <name>OSSIE Project</name> 

ossiedev/branches/hvolos/packetwfrm/components/RxTxManager/documentation.txt

@@ -3 +3 @@
 Copyright 2007 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE CIREN_SM.
+This file is part of the OSSIE RxTxManager.
 
-OSSIE CIREN_SM is free software; you can redistribute it and/or modify
+OSSIE RxTxManager is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE CIREN_SM is distributed in the hope that it will be useful,
+OSSIE RxTxManager is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE CIREN_SM; if not, write to the Free Software
+along with OSSIE RxTxManager; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ****************************************************************************/
 
-/*! \mainpage CIREN_SM
+/*! \mainpage RxTxManager
 
 \section description Basic description
-This component implements the CIREN protocol and interfaces with the
-physical-layer components.
+
 
 \section properties Properties