aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gr-usrptest/lib/measurement_sink_f_impl.cc
diff options
context:
space:
mode:
authorAndrej Rode <andrej.rode@ettus.com>2016-10-24 10:25:42 -0700
committerMartin Braun <martin.braun@ettus.com>2017-05-26 16:01:37 -0700
commit76e9e6393fe1d5a0ccc9e05deb431694921850ec (patch)
treeb7f1097a04fd7a7d0a423a353fbeba037746b782 /tools/gr-usrptest/lib/measurement_sink_f_impl.cc
parent06ff34eaa9e147b11d2698308fa91a5260fee2d2 (diff)
downloaduhd-76e9e6393fe1d5a0ccc9e05deb431694921850ec.tar.gz
uhd-76e9e6393fe1d5a0ccc9e05deb431694921850ec.tar.bz2
uhd-76e9e6393fe1d5a0ccc9e05deb431694921850ec.zip
gr-usrptest: Initial creation
- new OOT-blocks: phase_calc_ccf hier-block, measurement_sink_f - new python submodules: flowgraphs, functions, rts_tests - new apps: usrp_phasealignment.py - cmdline example for manual testing OOT-Blocks: - phase_calc_ccf takes two complex input streams and conjugate multiplys them and extracts the phase from the result and converts it to degree scale - measurement_sink_f: takes a float input stream and calculates average and stddev for a specified number of samples. Start of a measurement is invoked by a call of start_run() on the block. After a couple of runs average and stddev can be extracted. Python modules: - flowgrahps contains reconfigurable flowgraphs for different GNU Radio RF test cases - functions contains functions which are used in different apps/RTS scripts - rts_tests contains test cases which are meant to be executed from the RTS system. Depends on TinyDB, labview_automation Apps: - usrp_phasealignment.py is an example how to use the underlying flowgraph to measure phase differences. Commandline arguments of uhd_app can be used and several additional arguments can/have to be specified. Runs a phase difference measurement --runs number of times and averages phase difference over --duration seconds. Between measurements USRP sinks are retuned to random frequencies in daughterboard range. Results are displayed using motherboard serial and daughterboard serial
Diffstat (limited to 'tools/gr-usrptest/lib/measurement_sink_f_impl.cc')
-rw-r--r--tools/gr-usrptest/lib/measurement_sink_f_impl.cc124
1 files changed, 124 insertions, 0 deletions
diff --git a/tools/gr-usrptest/lib/measurement_sink_f_impl.cc b/tools/gr-usrptest/lib/measurement_sink_f_impl.cc
new file mode 100644
index 000000000..58faccb9a
--- /dev/null
+++ b/tools/gr-usrptest/lib/measurement_sink_f_impl.cc
@@ -0,0 +1,124 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2016 Ettus Research LLC.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/io_signature.h>
+#include "measurement_sink_f_impl.h"
+
+namespace gr {
+ namespace usrptest {
+
+ measurement_sink_f::sptr
+ measurement_sink_f::make(int num_samples, int runs)
+ {
+ return gnuradio::get_initial_sptr
+ (new measurement_sink_f_impl(num_samples, runs));
+
+ }
+
+ /*
+ * The private constructor
+ */
+ measurement_sink_f_impl::measurement_sink_f_impl(int num_samples, int runs)
+ : gr::sync_block("measurement_sink_f",
+ gr::io_signature::make(1, 1, sizeof(float)),
+ gr::io_signature::make(0, 0, 0)),
+ d_runs(runs),
+ d_nsamples(num_samples)
+ {
+ d_curr_run = 0; // number of completed measurement runs
+ d_curr_avg = 0.0f; // accumulated average
+ d_curr_M2 = 0.0f; // accumulated M2
+ d_run = false; // true if a measurement is currently recorded
+ d_curr_sample = 0; // current sample count
+ }
+
+ /*
+ * Our virtual destructor.
+ */
+ measurement_sink_f_impl::~measurement_sink_f_impl()
+ {
+ }
+
+ int
+ measurement_sink_f_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ const float *in = (const float *) input_items[0];
+ if ((d_curr_run < d_runs)&&d_run){ //check if we need to record data
+ const int max_items = std::min(noutput_items, d_nsamples-d_curr_sample); // calculate number of samples we have to take into account
+ for (int item=0; item < max_items;++item){
+ ++d_curr_sample;
+ inc_both(in[item]);
+ }
+ if (d_curr_sample == d_nsamples) {
+ d_avg.push_back(d_curr_avg);
+ d_stddev.push_back(std::sqrt(d_curr_M2/(float)(d_curr_sample - 1)));
+ ++d_curr_run;
+ d_run = false;
+ d_curr_sample = 0;
+ d_curr_avg = 0.0f;
+ d_curr_M2 = 0.0f;
+ }
+ }
+ return noutput_items;
+ }
+
+
+ void
+ measurement_sink_f_impl::inc_both(const float new_val)
+ {
+ float delta = new_val - d_curr_avg;
+ d_curr_avg = d_curr_avg + delta/(float)(d_curr_sample);
+ d_curr_M2 = d_curr_M2 + delta*(new_val - d_curr_avg);
+ }
+
+
+ void
+ measurement_sink_f_impl::start_run()
+ {
+ d_run = true;
+ }
+
+ std::vector<float>
+ measurement_sink_f_impl::get_avg() const
+ {
+ return d_avg;
+ }
+
+ std::vector<float>
+ measurement_sink_f_impl::get_stddev() const
+ {
+ return d_stddev;
+ }
+
+ int
+ measurement_sink_f_impl::get_run() const
+ {
+ return d_curr_run;
+ }
+
+ } /* namespace usrptest */
+} /* namespace gr */
+