aboutsummaryrefslogtreecommitdiffstats
path: root/host/test
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-12-22 17:33:43 -0800
committerJosh Blum <josh@joshknows.com>2010-12-22 17:33:43 -0800
commit67e89717659605e4d8e0ddd26e4ccef4dec24eb2 (patch)
treea011be8ad75e13fd98d61c8b31ed218e0bce687c /host/test
parent94682e4b04d9304a2f39c192bf423c4ee9f38e69 (diff)
parent8f93121987af42d8b049d29cd8ea101a6306fa87 (diff)
downloaduhd-67e89717659605e4d8e0ddd26e4ccef4dec24eb2.tar.gz
uhd-67e89717659605e4d8e0ddd26e4ccef4dec24eb2.tar.bz2
uhd-67e89717659605e4d8e0ddd26e4ccef4dec24eb2.zip
Merge branch 'master' into next
Conflicts: host/lib/usrp/usrp2/CMakeLists.txt
Diffstat (limited to 'host/test')
-rw-r--r--host/test/tune_helper_test.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/host/test/tune_helper_test.cpp b/host/test/tune_helper_test.cpp
index e0500ae3f..735e7e948 100644
--- a/host/test/tune_helper_test.cpp
+++ b/host/test/tune_helper_test.cpp
@@ -19,6 +19,7 @@
#include <uhd/usrp/tune_helper.hpp>
#include <uhd/usrp/subdev_props.hpp>
#include <uhd/usrp/dsp_props.hpp>
+#include <uhd/usrp/dsp_utils.hpp>
#include <iostream>
using namespace uhd;
@@ -165,6 +166,7 @@ private:
switch(key.as<dsp_prop_t>()){
case DSP_PROP_FREQ_SHIFT:
_freq_shift = val.as<double>();
+ dsp_type1::calc_cordic_word_and_update(_freq_shift, _codec_rate);
return;
case DSP_PROP_HOST_RATE: