diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-17 17:16:31 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-17 17:16:31 +0000 |
| commit | 1b47702245f0c1f4dda3e0eff487bbe664d48855 (patch) | |
| tree | d520539d1ad3502e789b74c40121d8415328ceb0 | |
| parent | a340b9fb5ffe0e43a746ce8ce051b08444a1a713 (diff) | |
| download | uhd-1b47702245f0c1f4dda3e0eff487bbe664d48855.tar.gz uhd-1b47702245f0c1f4dda3e0eff487bbe664d48855.tar.bz2 uhd-1b47702245f0c1f4dda3e0eff487bbe664d48855.zip | |
usrp-e: misc code tweaks
| -rw-r--r-- | host/examples/tx_timed_samples.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp_e/clock_ctrl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp_e/codec_ctrl.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/host/examples/tx_timed_samples.cpp b/host/examples/tx_timed_samples.cpp index ceae58a22..aa22d3465 100644 --- a/host/examples/tx_timed_samples.cpp +++ b/host/examples/tx_timed_samples.cpp @@ -77,7 +77,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ sdev->set_time_now(uhd::time_spec_t(0.0)); //allocate data to send - std::vector<std::complex<short> > buff(samps_per_packet, std::complex<float>(ampl, ampl)); + std::vector<std::complex<short> > buff(samps_per_packet, std::complex<short>(ampl, ampl)); uhd::tx_metadata_t md; //send the data in multiple packets diff --git a/host/lib/usrp/usrp_e/clock_ctrl.cpp b/host/lib/usrp/usrp_e/clock_ctrl.cpp index 22578a933..62807aec2 100644 --- a/host/lib/usrp/usrp_e/clock_ctrl.cpp +++ b/host/lib/usrp/usrp_e/clock_ctrl.cpp @@ -39,7 +39,7 @@ template <typename div_type, typename bypass_type> static void set_clock_divider * Constants **********************************************************************/ static const bool enable_test_clock = false; -static const double ref_clock_doubler = 2; //enabled below +static const size_t ref_clock_doubler = 2; //enabled below static const double ref_clock_rate = 10e6 * ref_clock_doubler; static const size_t r_counter = 1; diff --git a/host/lib/usrp/usrp_e/codec_ctrl.cpp b/host/lib/usrp/usrp_e/codec_ctrl.cpp index 5322f94bd..2bdbc0f1c 100644 --- a/host/lib/usrp/usrp_e/codec_ctrl.cpp +++ b/host/lib/usrp/usrp_e/codec_ctrl.cpp @@ -97,6 +97,7 @@ usrp_e_codec_ctrl_impl::usrp_e_codec_ctrl_impl(usrp_e_iface::sptr iface){ _ad9862_regs.coarse_mod = ad9862_regs_t::COARSE_MOD_BYPASS; _ad9862_regs.dac_a_coarse_gain = 0x3; _ad9862_regs.dac_b_coarse_gain = 0x3; + _ad9862_regs.edges = ad9862_regs_t::EDGES_BOTH; //setup the dll _ad9862_regs.input_clk_ctrl = ad9862_regs_t::INPUT_CLK_CTRL_EXTERNAL; |