diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2021-01-25 23:13:18 +0100 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-02-18 06:50:08 -0500 |
| commit | 15c86a13d974e673903ea0c6bac02157aeb9f50a (patch) | |
| tree | d9ebda3923a10a3a4a5708494a04a5d00d27e3f8 /gr-digital/lib | |
| parent | c5a1be2e93186df3c20ed2c0512dfd2e1ce7799e (diff) | |
digital: Simple correlator debug not based on writing to file but logger
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Diffstat (limited to 'gr-digital/lib')
| -rw-r--r-- | gr-digital/lib/simple_correlator_impl.cc | 31 | ||||
| -rw-r--r-- | gr-digital/lib/simple_correlator_impl.h | 5 |
2 files changed, 15 insertions, 21 deletions
diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc index c9a9a995fa..babec8bb37 100644 --- a/gr-digital/lib/simple_correlator_impl.cc +++ b/gr-digital/lib/simple_correlator_impl.cc @@ -16,8 +16,6 @@ #include <gnuradio/blocks/count_bits.h> #include <gnuradio/digital/simple_framer_sync.h> #include <gnuradio/io_signature.h> -#include <cassert> -#include <cstdio> #include <cstring> #include <stdexcept> @@ -48,20 +46,15 @@ simple_correlator_impl::simple_correlator_impl(int payload_bytesize) d_avbi = 0; d_accum = 0.0; d_avg = 0.0; - for (int i = 0; i < AVG_PERIOD; i++) + for (int i = 0; i < AVG_PERIOD; i++) { d_avgbuf[i] = 0.0; + } -#ifdef DEBUG_SIMPLE_CORRELATOR - d_debug_fp = fopen("corr.log", "w"); -#endif enter_looking(); } simple_correlator_impl::~simple_correlator_impl() { -#ifdef DEBUG_SIMPLE_CORRELATOR - fclose(d_debug_fp); -#endif delete[] d_bitbuf; delete[] d_pktbuf; } @@ -143,8 +136,8 @@ int simple_correlator_impl::general_work(int noutput_items, #ifdef DEBUG_SIMPLE_CORRELATOR struct debug_data { float raw_data; - float sampled; - float enter_locked; + bool sampled; + bool enter_locked; } debug_data; #endif @@ -152,8 +145,8 @@ int simple_correlator_impl::general_work(int noutput_items, #ifdef DEBUG_SIMPLE_CORRELATOR debug_data.raw_data = in[n]; - debug_data.sampled = 0.0; - debug_data.enter_locked = 0.0; + debug_data.sampled = false; + debug_data.enter_locked = false; #endif switch (d_state) { @@ -161,7 +154,7 @@ int simple_correlator_impl::general_work(int noutput_items, if (d_osi == d_center_osi) { #ifdef DEBUG_SIMPLE_CORRELATOR - debug_data.sampled = 1.0; + debug_data.sampled = true; #endif decision = slice(in[n]); @@ -195,16 +188,20 @@ int simple_correlator_impl::general_work(int noutput_items, // no longer seeing good PN code, compute center of goodness enter_locked(); #ifdef DEBUG_SIMPLE_CORRELATOR - debug_data.enter_locked = 1.0; + debug_data.enter_locked = true; #endif } break; default: - assert(0); + GR_LOG_ERROR(d_logger, "Unknown simple correlator state encountered"); + throw std::runtime_error("unknown simple correlator state"); } #ifdef DEBUG_SIMPLE_CORRELATOR - fwrite(&debug_data, sizeof(debug_data), 1, d_debug_fp); + GR_LOG_TRACE(d_debug_logger, + (boost::format("%e %c%c") % debug_data.raw_data % + (debug_data.sampled ? 'S' : ' ') % + (debug_data.enter_locked ? 'L' : ' '))); #endif d_osi = add_index(d_osi, 1); diff --git a/gr-digital/lib/simple_correlator_impl.h b/gr-digital/lib/simple_correlator_impl.h index 505a2e296d..59188363c8 100644 --- a/gr-digital/lib/simple_correlator_impl.h +++ b/gr-digital/lib/simple_correlator_impl.h @@ -13,6 +13,7 @@ #include <gnuradio/digital/simple_correlator.h> +// To enable tracing to the debug logger, un-comment the following line //#define DEBUG_SIMPLE_CORRELATOR namespace gr { @@ -41,10 +42,6 @@ private: float d_avg; float d_accum; -#ifdef DEBUG_SIMPLE_CORRELATOR - FILE* d_debug_fp; // binary log file -#endif - inline int slice(float x) { return x >= d_avg ? 1 : 0; } void update_avg(float x); |