Skip to content

ADC Frequency: fix 32 bit complex mode crash #2101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −10
Open

ADC Frequency: fix 32 bit complex mode crash #2101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions gr-util/include/gr-util/griiocomplexchannelsrc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "scopy-gr-util_export.h"

#include <gnuradio/blocks/float_to_complex.h>
#include <gnuradio/blocks/short_to_float.h>
#include <gnuradio/blocks/stream_to_vector.h>

namespace scopy::grutil {
Expand All @@ -51,7 +50,7 @@ class SCOPY_GR_UTIL_EXPORT GRIIOComplexChannelSrc : public GRIIOChannel
QString channelNameQ;

const iio_data_format *fmt;
gr::blocks::short_to_float::sptr s2f[2];
gr::basic_block_sptr x2f[2];
gr::blocks::float_to_complex::sptr f2c;
gr::blocks::stream_to_vector::sptr s2v;
};
Expand Down
32 changes: 24 additions & 8 deletions gr-util/src/griiocomplexchannelsrc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
#include "griiodevicesource.h"
#include "grlog.h"
#include "grtopblock.h"
#include <gnuradio/blocks/short_to_float.h>
#include <gnuradio/blocks/int_to_float.h>
#include "gnuradio/blocks/copy.h"

#include <QDebug>

Expand All @@ -42,25 +45,38 @@ void GRIIOComplexChannelSrc::build_blks(GRTopBlock *top)
{
qDebug(SCOPY_GR_UTIL) << "Building GRIIOComplexChannelSrc";
m_dev->addChannel(this);
s2f[0] = gr::blocks::short_to_float::make();
s2f[1] = gr::blocks::short_to_float::make();
f2c = gr::blocks::float_to_complex::make();
switch(fmt->length) {
case 16:
x2f[0] = gr::blocks::short_to_float::make();
x2f[1] = gr::blocks::short_to_float::make();
break;
case 32:
x2f[0] = gr::blocks::int_to_float::make();
x2f[1] = gr::blocks::int_to_float::make();
break;
default:
qInfo(SCOPY_GR_UTIL) << "creating copy block of size " << fmt->length / 8;
x2f[0] = gr::blocks::copy::make(fmt->length / 8);
x2f[1] = gr::blocks::copy::make(fmt->length / 8);
break;
}

f2c = gr::blocks::float_to_complex::make();
s2v = gr::blocks::stream_to_vector::make(sizeof(gr_complex), top->vlen());

top->connect(s2f[0], 0, f2c, 0);
top->connect(s2f[1], 0, f2c, 1);
top->connect(x2f[0], 0, f2c, 0);
top->connect(x2f[1], 0, f2c, 1);
top->connect(f2c, 0, s2v, 0);
start_blk.append(s2f[0]);
start_blk.append(s2f[1]);
start_blk.append(x2f[0]);
start_blk.append(x2f[1]);
end_blk = s2v;
}

void GRIIOComplexChannelSrc::destroy_blks(GRTopBlock *top)
{
m_dev->removeChannel(this);
end_blk = nullptr;
s2f[0] = s2f[1] = nullptr;
x2f[0] = x2f[1] = nullptr;
f2c = nullptr;
s2v = nullptr;
start_blk.clear();
Expand Down
Loading