[Commit-gnuradio] r9848 - gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src

[jcorgan]

Author: jcorgan
Date: 2008-10-25 16:24:04 -0600 (Sat, 25 Oct 2008)
New Revision: 9848

Modified:
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc
   gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h
Log:
wip, added gain and freq accessors

Modified: gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i
===================================================================
--- gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i    
2008-10-25 22:14:44 UTC (rev 9847)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i    
2008-10-25 22:24:04 UTC (rev 9848)
@@ -68,6 +68,11 @@
   int decim();
   %rename(_real_adc_rate) adc_rate;
   bool adc_rate(long *rate);
+  double gain_min();
+  double gain_max();
+  double gain_db_per_step();
+  double freq_min();
+  double freq_max();
 };
 
 // ----------------------------------------------------------------
@@ -124,6 +129,11 @@
   int interp();
   %rename(_real_dac_rate) dac_rate;
   bool dac_rate(long *rate);
+  double gain_min();
+  double gain_max();
+  double gain_db_per_step();
+  double freq_min();
+  double freq_max();
 };
 
 // ----------------------------------------------------------------

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc 
2008-10-25 22:14:44 UTC (rev 9847)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc 
2008-10-25 22:24:04 UTC (rev 9848)
@@ -81,3 +81,33 @@
 {
   return d_u2->dac_rate(rate);
 }
+
+double
+usrp2_sink_base::gain_min()
+{
+  return d_u2->tx_gain_min();
+}
+
+double
+usrp2_sink_base::gain_max()
+{
+  return d_u2->tx_gain_max();
+}
+
+double
+usrp2_sink_base::gain_db_per_step()
+{
+  return d_u2->tx_gain_db_per_step();
+}
+  
+double
+usrp2_sink_base::freq_min()
+{
+  return d_u2->tx_freq_min();
+}
+
+double
+usrp2_sink_base::freq_max()
+{
+  return d_u2->tx_freq_max();
+}

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h
===================================================================
--- gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h  
2008-10-25 22:14:44 UTC (rev 9847)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h  
2008-10-25 22:24:04 UTC (rev 9848)
@@ -69,6 +69,31 @@
    * \brief Get DAC sample rate in Hz 
    */
   bool dac_rate(long *rate);
+
+  /*!
+   * \brief Returns minimum Tx gain 
+   */
+  double gain_min();
+
+  /*!
+   * \brief Returns maximum Tx gain 
+   */
+  double gain_max();
+  
+  /*!
+   * \brief Returns Tx gain db_per_step
+   */
+  double gain_db_per_step();
+
+  /*!
+   * \brief Returns minimum Tx center frequency
+   */
+  double freq_min();
+
+  /*!
+   * \brief Returns maximum Tx center frequency
+   */
+  double freq_max();
 };
 
 #endif /* INCLUDED_USRP2_SINK_BASE_H */

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc   
    2008-10-25 22:14:44 UTC (rev 9847)
+++ 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc   
    2008-10-25 22:24:04 UTC (rev 9848)
@@ -82,6 +82,36 @@
   return d_u2->adc_rate(rate);
 }
 
+double
+usrp2_source_base::gain_min()
+{
+  return d_u2->rx_gain_min();
+}
+
+double
+usrp2_source_base::gain_max()
+{
+  return d_u2->rx_gain_max();
+}
+
+double
+usrp2_source_base::gain_db_per_step()
+{
+  return d_u2->rx_gain_db_per_step();
+}
+  
+double
+usrp2_source_base::freq_min()
+{
+  return d_u2->rx_freq_min();
+}
+
+double
+usrp2_source_base::freq_max()
+{
+  return d_u2->rx_freq_max();
+}
+
 bool
 usrp2_source_base::start()
 {

Modified: 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h    
    2008-10-25 22:14:44 UTC (rev 9847)
+++ 
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h    
    2008-10-25 22:24:04 UTC (rev 9848)
@@ -71,6 +71,31 @@
   bool adc_rate(long *rate);
 
   /*!
+   * \brief Returns minimum Rx gain 
+   */
+  double gain_min();
+
+  /*!
+   * \brief Returns maximum Rx gain 
+   */
+  double gain_max();
+  
+  /*!
+   * \brief Returns Rx gain db_per_step
+   */
+  double gain_db_per_step();
+  
+  /*!
+   * \brief Returns minimum Rx center frequency
+   */
+  double freq_min();
+
+  /*!
+   * \brief Returns maximum Rx center frequency
+   */
+  double freq_max();
+
+  /*!
    * \brief Called by scheduler when starting flowgraph
    */
   virtual bool start();