diff options
| author | Philip Balister <philip@opensdr.com> | 2010-04-13 16:38:42 +0000 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-04-13 16:38:42 +0000 |
| commit | f1838b9284a124fcfb5996eaf1647a69b4473278 (patch) | |
| tree | 15e69f3641f8919fae201ec002a2edfc61f6cb42 /host/lib/usrp/tune_helper.cpp | |
| parent | b59c54e334dfc1c6ab7da81c62038444f93efe61 (diff) | |
| parent | 41a515f3f97ae77b7c1b4371fdef7c085dce8c1c (diff) | |
| download | uhd-f1838b9284a124fcfb5996eaf1647a69b4473278.tar.gz uhd-f1838b9284a124fcfb5996eaf1647a69b4473278.tar.bz2 uhd-f1838b9284a124fcfb5996eaf1647a69b4473278.zip | |
Merge branch 'usrp_e' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e
Diffstat (limited to 'host/lib/usrp/tune_helper.cpp')
| -rw-r--r-- | host/lib/usrp/tune_helper.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/host/lib/usrp/tune_helper.cpp b/host/lib/usrp/tune_helper.cpp index 79a6aff7b..2fb15064c 100644 --- a/host/lib/usrp/tune_helper.cpp +++ b/host/lib/usrp/tune_helper.cpp @@ -18,6 +18,7 @@ #include <uhd/usrp/tune_helper.hpp> #include <uhd/utils/algorithm.hpp> #include <uhd/usrp/subdev_props.hpp> +#include <uhd/usrp/dsp_props.hpp> #include <cmath> using namespace uhd; @@ -34,8 +35,8 @@ static tune_result_t tune_xx_subdev_and_dxc( wax::obj subdev_freq_proxy = subdev[SUBDEV_PROP_FREQ]; bool subdev_quadrature = subdev[SUBDEV_PROP_QUADRATURE].as<bool>(); bool subdev_spectrum_inverted = subdev[SUBDEV_PROP_SPECTRUM_INVERTED].as<bool>(); - wax::obj dxc_freq_proxy = dxc[std::string("freq")]; - double dxc_sample_rate = dxc[std::string("if_rate")].as<double>(); + wax::obj dxc_freq_proxy = dxc[DSP_PROP_FREQ_SHIFT]; + double dxc_sample_rate = dxc[DSP_PROP_CODEC_RATE].as<double>(); // Ask the d'board to tune as closely as it can to target_freq+lo_offset double target_inter_freq = target_freq + lo_offset; @@ -96,8 +97,8 @@ tune_result_t uhd::usrp::tune_rx_subdev_and_ddc( ){ double lo_offset = 0.0; //if the local oscillator will be in the passband, use an offset - if (subdev[SUBDEV_PROP_LO_INTERFERES].as<bool>()){ - lo_offset = 2.0*ddc[std::string("bb_rate")].as<double>(); + if (subdev[SUBDEV_PROP_USE_LO_OFFSET].as<bool>()){ + lo_offset = 2.0*ddc[DSP_PROP_HOST_RATE].as<double>(); } return tune_rx_subdev_and_ddc(subdev, ddc, target_freq, lo_offset); } @@ -119,8 +120,8 @@ tune_result_t uhd::usrp::tune_tx_subdev_and_duc( ){ double lo_offset = 0.0; //if the local oscillator will be in the passband, use an offset - if (subdev[SUBDEV_PROP_LO_INTERFERES].as<bool>()){ - lo_offset = 2.0*duc[std::string("bb_rate")].as<double>(); + if (subdev[SUBDEV_PROP_USE_LO_OFFSET].as<bool>()){ + lo_offset = 2.0*duc[DSP_PROP_HOST_RATE].as<double>(); } return tune_tx_subdev_and_duc(subdev, duc, target_freq, lo_offset); } |