From 5f0858bab27d0b3eec60bdaf594a62d8899be620 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Thu, 9 Mar 2023 08:56:48 +0100 Subject: [PATCH] Removed logging from the DSP lib --- core/src/dsp/buffer/frame_buffer.h | 4 ---- core/src/dsp/mod/psk.h | 1 + core/src/dsp/mod/quadrature.h | 2 +- core/src/dsp/multirate/rrc_interpolator.h | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/dsp/buffer/frame_buffer.h b/core/src/dsp/buffer/frame_buffer.h index 004121bf..5e96e645 100644 --- a/core/src/dsp/buffer/frame_buffer.h +++ b/core/src/dsp/buffer/frame_buffer.h @@ -67,10 +67,6 @@ namespace dsp::buffer { sizes[writeCur] = count; writeCur++; writeCur = ((writeCur) % TEST_BUFFER_SIZE); - - // if (((writeCur - readCur + TEST_BUFFER_SIZE) % TEST_BUFFER_SIZE) >= (TEST_BUFFER_SIZE-2)) { - // flog::warn("Overflow"); - // } } cnd.notify_all(); _in->flush(); diff --git a/core/src/dsp/mod/psk.h b/core/src/dsp/mod/psk.h index 10c44c17..35f3a732 100644 --- a/core/src/dsp/mod/psk.h +++ b/core/src/dsp/mod/psk.h @@ -2,5 +2,6 @@ #include "../multirate/rrc_interpolator.h" namespace dsp::mod { + // TODO: Check if resample before RRC is better than using the RRC taps as a filter (bandwidth probably not correct for alias-free resampling) typedef multirate::RRCInterpolator PSK; } \ No newline at end of file diff --git a/core/src/dsp/mod/quadrature.h b/core/src/dsp/mod/quadrature.h index 402e1846..dfbf4ee6 100644 --- a/core/src/dsp/mod/quadrature.h +++ b/core/src/dsp/mod/quadrature.h @@ -5,7 +5,7 @@ #include "../math/hz_to_rads.h" namespace dsp::mod { - class Quadrature : Processor { + class Quadrature : public Processor { using base_type = Processor; public: Quadrature() {} diff --git a/core/src/dsp/multirate/rrc_interpolator.h b/core/src/dsp/multirate/rrc_interpolator.h index e2c697de..61eab2d5 100644 --- a/core/src/dsp/multirate/rrc_interpolator.h +++ b/core/src/dsp/multirate/rrc_interpolator.h @@ -83,8 +83,6 @@ namespace dsp::multirate { int interp = OutSR / gcd; int decim = InSR / gcd; - flog::warn("interp: {0}, decim: {1}", interp, decim); - // Configure resampler double tapSamplerate = _symbolrate * (double)interp; rrcTaps = taps::rootRaisedCosine(_rrcTapCount * interp, _rrcBeta, _symbolrate, tapSamplerate);