summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Abele <jason@ettus.com>2012-02-13 14:27:59 -0800
committerJosh Blum <josh@joshknows.com>2012-03-11 15:54:27 -0700
commitb2c0d1f55a1c2190a6a6fd5967eb0a6ffd60b272 (patch)
tree1678cf56bdff769a906daddc0a44afa44087a8f2
parent715fd038325fa4a265328fac2bdb54850b990ea7 (diff)
downloaduhd-b2c0d1f55a1c2190a6a6fd5967eb0a6ffd60b272.tar.gz
uhd-b2c0d1f55a1c2190a6a6fd5967eb0a6ffd60b272.tar.bz2
uhd-b2c0d1f55a1c2190a6a6fd5967eb0a6ffd60b272.zip
Make DBSRX* set default bandwidth based on codec rate
-rw-r--r--host/lib/usrp/dboard/db_dbsrx.cpp3
-rw-r--r--host/lib/usrp/dboard/db_dbsrx2.cpp6
2 files changed, 7 insertions, 2 deletions
diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index ff4bce20d..846597f06 100644
--- a/host/lib/usrp/dboard/db_dbsrx.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx.cpp
@@ -193,7 +193,8 @@ dbsrx::dbsrx(ctor_args_t args) : rx_dboard_base(args){
this->send_reg(0x0, 0x5);
//set defaults for LO, gains, and filter bandwidth
- _bandwidth = 33e6;
+ double codec_rate = this->get_iface()->get_codec_rate(dboard_iface::UNIT_RX);
+ _bandwidth = 0.8*codec_rate/2.0; // default to anti-alias at different codec_rate
////////////////////////////////////////////////////////////////////
// Register properties
diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp
index 01eec133f..517b7b183 100644
--- a/host/lib/usrp/dboard/db_dbsrx2.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx2.cpp
@@ -214,9 +214,13 @@ dbsrx2::dbsrx2(ctor_args_t args) : rx_dboard_base(args){
.set(true); //always enabled
this->get_rx_subtree()->create<bool>("use_lo_offset")
.set(false);
+
+ double codec_rate = this->get_iface()->get_codec_rate(dboard_iface::UNIT_RX);
+
this->get_rx_subtree()->create<double>("bandwidth/value")
.coerce(boost::bind(&dbsrx2::set_bandwidth, this, _1))
- .set(2.0*40.0e6); //bandwidth in lowpass, convert to complex bandpass
+ .set(2.0*(0.8*codec_rate/2.0)); //bandwidth in lowpass, convert to complex bandpass
+ //default to anti-alias at different codec_rate
this->get_rx_subtree()->create<meta_range_t>("bandwidth/range")
.set(dbsrx2_bandwidth_range);