gr-util: fix unit tests

Signed-off-by: Adrian Suciu <[email protected]>
analogdevicesinc · Sep 16, 2024 · dac8f74 · dac8f74
1 parent 4f7d5c8
commit dac8f74
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 50 deletions.
diff --git a/gr-util/include/gr-util/grsignalsrc.h b/gr-util/include/gr-util/grsignalsrc.h
@@ -5,6 +5,7 @@
 #include "scopy-gr-util_export.h"
 
 #include <gnuradio/analog/sig_source.h>
+#include <gnuradio/blocks/stream_to_vector.h>
 
 namespace scopy::grutil {
 class SCOPY_GR_UTIL_EXPORT GRSignalSrc : public GRProxyBlock
@@ -26,6 +27,7 @@ class SCOPY_GR_UTIL_EXPORT GRSignalSrc : public GRProxyBlock
 protected:
 	gr::analog::sig_source_f::sptr sig;
 	gr::analog::gr_waveform_t m_waveform;
+	gr::blocks::stream_to_vector::sptr s2v;
 	double m_sampling_frequency;
 	double m_freq;
 	double m_phase;

diff --git a/gr-util/src/grsignalsrc.cpp b/gr-util/src/grsignalsrc.cpp
@@ -1,5 +1,5 @@
 #include "grsignalsrc.h"
-
+#include "grtopblock.h"
 #include "grlog.h"
 
 using namespace scopy::grutil;
@@ -55,8 +55,11 @@ void GRSignalSrc::build_blks(GRTopBlock *top)
 {
 	qDebug(SCOPY_GR_UTIL) << "Building GRSignalSrc";
 	sig = gr::analog::sig_source_f::make(m_sampling_frequency, m_waveform, m_freq, m_amplitude, m_offset, m_phase);
+	s2v = gr::blocks::stream_to_vector::make(sizeof(float), top->vlen());
+	top->connect(sig,0,s2v,0);
 	start_blk.append(sig);
-	end_blk = sig;
+	start_blk.append(s2v);
+	end_blk = s2v;
 }
 
 void GRSignalSrc::destroy_blks(GRTopBlock *top)

diff --git a/gr-util/src/grtopblock.cpp b/gr-util/src/grtopblock.cpp
@@ -17,7 +17,7 @@ GRTopBlock::GRTopBlock(QString name, QObject *parent)
 	QString topblockname = m_name + QString::number(topblockid);
 	topblockid++;
 	qInfo() << "building" << topblockname;
-	top = gr::make_top_block(topblockname.toStdString());
+	top = gr::make_top_block(topblockname.toStdString(),false);
 	QObject::connect(this, SIGNAL(requestRebuild()), this, SLOT(rebuild()), Qt::QueuedConnection);
 }