Changeset 4748

Timestamp:

08/17/07 12:44:14 (6 years ago)

Author:

jgaeddert

Message:

fixing frequency metadata in USRP branch

Location:

platform/USRP/branches/USRP-metadata/src

Files:

• USRP.h (modified) (1 diff)
• port_impl.cpp (modified) (7 diffs)

platform/USRP/branches/USRP-metadata/src/USRP.h

@@ -116 +116 @@
     USRP_TX_Control_i(const USRP_TX_Control_i &); // No copying
 
+    /// return pointer to daughterboard
+    void get_db_reference(unsigned long channel, db_base *& db);
+ 
     USRP_i *usrp;
 

platform/USRP/branches/USRP-metadata/src/port_impl.cpp

@@ -96 +96 @@
 }
 
+void USRP_TX_Control_i::get_db_reference(unsigned long channel, db_base *& db)
+{
+    omni_mutex_lock l(usrp->rx_control_access);
+    if (channel == 0) {
+        if (usrp->rx_db0_control)
+            db = usrp->rx_db0_control;
+    } else if (channel == 1) {
+        if (usrp->rx_db1_control)
+            db = usrp->rx_db1_control;
+    } else {
+        std::cerr << "Bad channel specified" << std::endl;
+        return; ///\todo throw bad channel exception
+    }
+}
+
+
 void USRP_TX_Control_i::set_frequency(unsigned long channel, float f)
 {
@@ -102 +118 @@
     class db_base *db(NULL);
 
-    omni_mutex_lock l(usrp->tx_control_access);
-    if (channel == 0) {
-        if (usrp->tx_db0_control)
-            db = usrp->tx_db0_control;
-    } else if (channel == 1) {
-        if (usrp->tx_db1_control)
-            db = usrp->tx_db1_control;
-    } else {
-        return; ///\todo throw bad channel exception
-    }
+    // get reference for daughter board on this channel
+    get_db_reference(channel, db);
 
     if (!db)
@@ -144 +152 @@
 void USRP_TX_Control_i::get_frequency(unsigned long channel, float &f)
 {
-    f = usrp->usrp_tx->tx_freq(channel);
+    float ddc_freq = usrp->usrp_rx->rx_freq(channel); // DDC frequency
+
+    // Get local oscillator frequency on daughterboard (if available)
+    //float lo_freq(0.0f)
+    db_base * db(NULL);
+    get_db_reference(channel, db);
+    if (!db) {
+        // No daughterboard present
+        std::cerr << "ERROR: USRP_RX_Control_i::get_frequency(): " << std::endl
+                  << "  Attempt to get frequency for slot with no board (channel "
+                  << channel << ")" << std::endl;
+        ///\todo: throw better exception
+        throw 0;
+    }
+
+    if (db->db_has_lo()) {
+        // get lo_freq here
+        // db->get_db_freq(lo_freq)
+    }
+
+    f = ddc_freq + db_lo_freq;
 }
 
@@ -305 +333 @@
 void USRP_RX_Control_i::get_db_reference(unsigned long channel, db_base *& db)
 {
-    
-}
-
-void USRP_RX_Control_i::set_frequency(unsigned long channel, float f)
-{
-    DEBUG(3, USRP, "In RX Control set frequency channel: " << channel << ", frequency: " << f);
-
-    class db_base *db(NULL);
-
     omni_mutex_lock l(usrp->rx_control_access);
     if (channel == 0) {
@@ -325 +344 @@
         return; ///\todo throw bad channel exception
     }
-    
+}
+
+void USRP_RX_Control_i::set_frequency(unsigned long channel, float f)
+{
+    DEBUG(3, USRP, "In RX Control set frequency channel: " << channel << ", frequency: " << f);
+
+    class db_base *db(NULL);
+
+    // get reference for daughter board on this channel
+    get_db_reference(channel, db);
+
     if (!db) {
         // No daughterboard present
-        std::cerr << "ERROR: USRP_RX_Control_i::get_frequency(): " << std::endl
+        std::cerr << "ERROR: USRP_RX_Control_i::set_frequency(): " << std::endl
                   << "  Attempt to set frequency for slot with no board (channel "
                   << channel << ")" << std::endl;
@@ -375 +404 @@
 
     // Get local oscillator frequency on daughterboard (if available)
-    float lo_freq(0.0f);
+    //float lo_freq(0.0f)
     db_base * db(NULL);
     get_db_reference(channel, db);
@@ -392 +421 @@
     }
 
-    f = ddc_freq + lo_freq;
+    f = ddc_freq + db_lo_freq;
 }