diff options
author | Johnathan Corgan | 2012-03-27 14:28:48 -0700 |
---|---|---|
committer | Johnathan Corgan | 2012-03-27 14:28:48 -0700 |
commit | 16d63a572c8022766063d2d601e9a635f92871ce (patch) | |
tree | c7cf089157e0a44f0c68a5c23b71a8e5ab1e4b2d /gr-uhd | |
parent | e91ae54188e9812f3d8ed45e7f675e5a98ec889f (diff) | |
parent | 79e341d9064b8e44c2d1900cb34ddb51deebb559 (diff) | |
download | gnuradio-16d63a572c8022766063d2d601e9a635f92871ce.tar.gz gnuradio-16d63a572c8022766063d2d601e9a635f92871ce.tar.bz2 gnuradio-16d63a572c8022766063d2d601e9a635f92871ce.zip |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd')
-rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 2 | ||||
-rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_source.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index abf3512f6..415503bc1 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -276,7 +276,7 @@ public: * \param enb true to enable automatic DC offset correction * \param chan the channel index 0 to N-1 */ - virtual void set_dc_offset(const bool enb, size_t chan = 0) = 0; + virtual void set_auto_dc_offset(const bool enb, size_t chan = 0) = 0; /*! * Set a constant DC offset value. diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc index b17481adc..bd7f4e21d 100644 --- a/gr-uhd/lib/gr_uhd_usrp_source.cc +++ b/gr-uhd/lib/gr_uhd_usrp_source.cc @@ -148,7 +148,7 @@ public: return _dev->set_rx_bandwidth(bandwidth, chan); } - void set_dc_offset(const bool enable, size_t chan){ + void set_auto_dc_offset(const bool enable, size_t chan){ #ifdef UHD_USRP_MULTI_USRP_FRONTEND_CAL_API return _dev->set_rx_dc_offset(enable, chan); #else |