[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9843 - gnuradio/branches/developers/jcorgan/u2-wip/gr
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r9843 - gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src |
Date: |
Sat, 25 Oct 2008 15:36:12 -0600 (MDT) |
Author: jcorgan
Date: 2008-10-25 15:36:09 -0600 (Sat, 25 Oct 2008)
New Revision: 9843
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, adds interp(), decim(), and tx and rx set_scale_iq()
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 21:22:12 UTC (rev 9842)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2.i
2008-10-25 21:36:09 UTC (rev 9843)
@@ -64,6 +64,8 @@
%rename(_real_set_center_freq) set_center_freq;
bool set_center_freq(double frequency, usrp2::tune_result *r);
bool set_decim(int decimation_factor);
+ bool set_scale_iq(int scale_i, int scale_q);
+ int decim();
%rename(_real_adc_rate) adc_rate;
bool adc_rate(long *rate);
};
@@ -118,6 +120,8 @@
%rename(_real_set_center_freq) set_center_freq;
bool set_center_freq(double frequency, usrp2::tune_result *r);
bool set_interp(int interp_factor);
+ bool set_scale_iq(int scale_i, int scale_q);
+ int interp();
%rename(_real_dac_rate) dac_rate;
bool dac_rate(long *rate);
};
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 21:22:12 UTC (rev 9842)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.cc
2008-10-25 21:36:09 UTC (rev 9843)
@@ -64,6 +64,18 @@
return d_u2->set_tx_interp(interp_factor);
}
+bool
+usrp2_sink_base::set_scale_iq(int scale_i, int scale_q)
+{
+ return d_u2->set_tx_scale_iq(scale_i, scale_q);
+}
+
+int
+usrp2_sink_base::interp()
+{
+ return d_u2->tx_interp();
+}
+
bool
usrp2_sink_base::dac_rate(long *rate)
{
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 21:22:12 UTC (rev 9842)
+++ gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_sink_base.h
2008-10-25 21:36:09 UTC (rev 9843)
@@ -56,6 +56,16 @@
bool set_interp(int interp_factor);
/*!
+ * \brief Set transmit IQ scale factors
+ */
+ bool set_scale_iq(int scale_i, int scale_q);
+
+ /*!
+ * \brief Get transmit interpolation rate
+ */
+ int interp();
+
+ /*!
* \brief Get DAC sample rate in Hz
*/
bool dac_rate(long *rate);
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 21:22:12 UTC (rev 9842)
+++
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.cc
2008-10-25 21:36:09 UTC (rev 9843)
@@ -64,6 +64,18 @@
return d_u2->set_rx_decim(decimation_factor);
}
+bool
+usrp2_source_base::set_scale_iq(int scale_i, int scale_q)
+{
+ return d_u2->set_rx_scale_iq(scale_i, scale_q);
+}
+
+int
+usrp2_source_base::decim()
+{
+ return d_u2->rx_decim();
+}
+
bool
usrp2_source_base::adc_rate(long *rate)
{
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 21:22:12 UTC (rev 9842)
+++
gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src/usrp2_source_base.h
2008-10-25 21:36:09 UTC (rev 9843)
@@ -56,6 +56,16 @@
bool set_decim(int decimation_factor);
/*!
+ * \brief Set receive IQ scale factors
+ */
+ bool set_scale_iq(int scale_i, int scale_q);
+
+ /*!
+ * \brief Get receive decimation rate
+ */
+ int decim();
+
+ /*!
* \brief Get the ADC sample rate
*/
bool adc_rate(long *rate);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9843 - gnuradio/branches/developers/jcorgan/u2-wip/gr-usrp2/src,
jcorgan <=