summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum2012-03-27 11:17:04 -0700
committerJosh Blum2012-03-27 11:17:04 -0700
commitd346cb287299a04a71ea21007025edb694409043 (patch)
tree6322e84ddf96855f628e727a5c690367d3268735
parentf06bc44e150fbec00200ed98cf80cc384ec6dac2 (diff)
downloadgnuradio-d346cb287299a04a71ea21007025edb694409043.tar.gz
gnuradio-d346cb287299a04a71ea21007025edb694409043.tar.bz2
gnuradio-d346cb287299a04a71ea21007025edb694409043.zip
uhd: fix dc offset call in uhd source
SWIG/python cannot differentiate the calls set_dc_offset with an complex number or a boolean paramater. It seems to take the boolean as a complex number 1 or 0. Since the overloading is not working right: renamed set_dc_offset to set_auto_dc_offset for the boolean enable/disable paramater
-rw-r--r--gr-uhd/include/gr_uhd_usrp_source.h4
-rw-r--r--gr-uhd/lib/gr_uhd_usrp_source.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h
index 8a799b397..c33eb2a6f 100644
--- a/gr-uhd/include/gr_uhd_usrp_source.h
+++ b/gr-uhd/include/gr_uhd_usrp_source.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Free Software Foundation, Inc.
+ * Copyright 2010-2012 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -263,7 +263,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 2244238bd..c599b2b3d 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Free Software Foundation, Inc.
+ * Copyright 2010-2012 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -146,7 +146,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