adc: refactor time and FFT instruments

core/src/scopymainwindow.cpp

@@ -152,13 +152,13 @@ ScopyMainWindow::ScopyMainWindow(QWidget *parent)
 #ifdef SCOPY_DEV_MODE
 	// this is an example of how autoconnect is done
 
-//	 auto id = api->addDevice("ip:127.0.0.1", "m2k");
-//	 auto id = api->addDevice("ip:10.48.65.163", "iio");
-//	 auto id = api->addDevice("ip:192.168.2.1", "iio");
-//	 auto id = api->addDevice("", "test");
+	//	 auto id = api->addDevice("ip:127.0.0.1", "m2k");
+	//	 auto id = api->addDevice("ip:10.48.65.163", "iio");
+	auto id = api->addDevice("ip:192.168.2.1", "iio");
+	//	 auto id = api->addDevice("", "test");
 
-//	 api->connectDevice(id);
-//	 api->switchTool(id, "Oscilloscope");
+	// api->connectDevice(id);
+	// api->switchTool(id, "Time");
 #endif
 
 	qInfo(CAT_BENCHMARK) << "ScopyMainWindow constructor took: " << timer.elapsed() << "ms";

core/src/toolmanager.cpp

@@ -117,6 +117,7 @@ void ToolManager::unlockToolList(QString s)
 void ToolManager::updateToolEntry(ToolMenuEntry *tme)
 {
 	auto m = tm->getToolMenuItemFor(tme->uuid());
+	QSignalBlocker sb(m->getToolRunBtn());
 	m->setVisible(tme->visible());
 	m->setEnabled(tme->enabled());
 	m->setName(tme->name());

docs/plugins/adc/adc.rst

@@ -0,0 +1,70 @@
+.. _adc:
+
+ADC plugin
+================================================================================
+
+Description:
+
+The ADC plugin is used to interface with IIO ADCs that implement an IIO buffer mechanism. The plugin implements two instruments for data acquisition and visualization in time and frequency domain.
+
+Compatible:
+
+The plugin is compatible with contexts that have at least an IIO device that implements an IIO buffer interface.
+
+Usage:
+
+Time:
+
+Plot
+Plot Controls
+- buffersize
+- plot size
+- rolling mode
+- XMode
+- sampling rate (autoread)
+- autoscale 
+- XY
+- Plot/Curve settings
+
+Channel controls
+- Y-Axis controls
+- Measurements
+- Scaling (autoread)
+- Curve
+- Attributes
+- Plot
+
+
+Device controls:
+- Attributes
+
+Cursors
+
+Frequency
+Plot
+Plot Controls
+- buffersize
+- XMode
+- Sampling rate
+- Frequency offset
+- YAxis
+- Power offset
+- Window
+- Window correction
+- Plot/Curve settings
+
+Channel Controls
+- Y-Axis
+- Marker
+- Marker types
+- Curve
+- Attributes
+- Plot
+
+Complex mode
+
+
+Preferences:
+
+Usecases:
+

docs/plugins/index.rst

@@ -7,7 +7,7 @@ What is a Scopy plugin ?
 
 General IIO plugins
 
-* ADC Plugin
+* :ref: `ADC Plugin <adc>`
 
 * DAC plugin
 
@@ -60,6 +60,7 @@ Contents
 .. toctree::
    :maxdepth: 3
 
+   adc/adc
    datalogger/datalogger
    registermap/registermap
    m2k/index

gr-util/include/gr-util/grfftfloatproxy.h

@@ -0,0 +1,74 @@
+#ifndef GRFFTPROC_H
+#define GRFFTPROC_H
+
+#include "grproxyblock.h"
+#include "scopy-gr-util_export.h"
+
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/fft/fft_v.h>
+#include <gnuradio/fft/window.h>
+#include <gnuradio/blocks/float_to_complex.h>
+#include <gnuradio/blocks/vector_sink.h>
+#include <gnuradio/blocks/complex_to_mag_squared.h>
+#include <gnuradio/blocks/nlog10_ff.h>
+#include <gnuradio/blocks/multiply_const.h>
+#include <gnuradio/blocks/add_const_v.h>
+#include <QMap>
+
+namespace scopy::grutil {
+class SCOPY_GR_UTIL_EXPORT GRFFTFloatProc : public GRProxyBlock
+{
+public:
+	GRFFTFloatProc(QObject *parent = nullptr);
+	void setWindow(gr::fft::window::win_type w);
+	void setWindowCorrection(bool b);
+	void setPowerOffset(double);
+	void setNrBits(int);
+	void build_blks(GRTopBlock *top);
+	void destroy_blks(GRTopBlock *top);
+
+protected:
+	double m_powerOffset;
+	int nrBits;
+	gr::fft::fft_v<float, true>::sptr fft;
+	bool m_windowCorr;
+	gr::blocks::multiply_const_ff::sptr mult_nrbits;
+	gr::blocks::complex_to_mag_squared::sptr ctm;
+	gr::blocks::multiply_const_cc::sptr mult_wind_corr;
+	gr::blocks::multiply_const_ff::sptr mult_const1;
+	gr::blocks::nlog10_ff::sptr nlog10;
+	gr::blocks::add_const_vff::sptr powerOffset;
+
+	gr::fft::window::win_type m_fftwindow;
+	GRTopBlock *m_top;
+};
+
+class SCOPY_GR_UTIL_EXPORT GRFFTComplexProc : public GRProxyBlock
+{
+public:
+	GRFFTComplexProc(QObject *parent = nullptr);
+	void setWindow(gr::fft::window::win_type w);
+	void setPowerOffset(double);
+	void setWindowCorrection(bool b);
+	void setNrBits(int);
+	void build_blks(GRTopBlock *top);
+	void destroy_blks(GRTopBlock *top);
+
+protected:
+	double m_powerOffset;
+	int nrBits;
+	bool m_windowCorr;
+	gr::fft::fft_v<gr_complex, true>::sptr fft_complex;
+	gr::blocks::multiply_const_cc::sptr mult_nrbits;
+	gr::blocks::complex_to_mag_squared::sptr ctm;
+	gr::blocks::multiply_const_cc::sptr mult_wind_corr;
+	gr::blocks::multiply_const_ff::sptr mult_const1;
+	gr::blocks::nlog10_ff::sptr nlog10;
+	gr::blocks::add_const_vff::sptr powerOffset;
+
+	gr::fft::window::win_type m_fftwindow;
+	GRTopBlock *m_top;
+};
+} // namespace scopy::grutil
+
+#endif // GRFFTFLOATPROXY_H

gr-util/include/gr-util/griiocomplexchannelsrc.h

@@ -7,6 +7,7 @@
 
 #include <gnuradio/blocks/float_to_complex.h>
 #include <gnuradio/blocks/short_to_float.h>
+#include <gnuradio/blocks/stream_to_vector.h>
 
 namespace scopy::grutil {
 
@@ -22,11 +23,16 @@ class SCOPY_GR_UTIL_EXPORT GRIIOComplexChannelSrc : public GRIIOChannel
 	const QString &getChannelNameI() const;
 	const QString &getChannelNameQ() const;
 
+	const iio_data_format *getFmt() const;
+
 protected:
 	QString channelNameI;
 	QString channelNameQ;
+
+	const iio_data_format *fmt;
 	gr::blocks::short_to_float::sptr s2f[2];
 	gr::blocks::float_to_complex::sptr f2c;
+	gr::blocks::stream_to_vector::sptr s2v;
 };
 } // namespace scopy::grutil
 #endif // GRIIOCOMPLEXCHANNELSRC_H

gr-util/include/gr-util/griiodevicesource.h

@@ -18,17 +18,20 @@ class SCOPY_GR_UTIL_EXPORT GRIIOChannel : public GRProxyBlock
 	GRIIOChannel(QString channelName, GRIIODeviceSource *dev, QObject *parent = nullptr)
 		: GRProxyBlock(parent)
 		, channelName(channelName)
-		, dev(dev)
+		, m_dev(dev)
 	{}
-	GRIIODeviceSource *getDeviceSrc() { return dev; }
+	GRIIODeviceSource *getDeviceSrc() { return m_dev; }
 	QString getChannelName() { return channelName; }
-	virtual bool sampleRateAvailable() { return false; }
+	virtual bool samplerateAttributeAvailable() { return false; }
 	virtual double readSampleRate() { return -1; }
 	static QString findAttribute(QStringList possibleNames, iio_channel *);
 
+	virtual bool scaleAttributeAvailable() { return false; };
+	virtual double readScale() { return 1; };
+
 protected:
 	QString channelName;
-	GRIIODeviceSource *dev;
+	GRIIODeviceSource *m_dev;
 };
 
 class SCOPY_GR_UTIL_EXPORT GRIIODeviceSource : public GRProxyBlock
@@ -51,11 +54,13 @@ class SCOPY_GR_UTIL_EXPORT GRIIODeviceSource : public GRProxyBlock
 	std::vector<std::string> channelNames() const;
 
 	QString deviceName() const;
+	bool sampleRateAvailable();
 	double readSampleRate();
 
 	static QString findAttribute(QStringList possibleNames, iio_device *dev);
 
 	iio_device *iioDev() const;
+	iio_context *ctx() const;
 
 protected:
 	QList<GRIIOChannel *> m_list;

gr-util/include/gr-util/griiofloatchannelsrc.h

@@ -2,29 +2,45 @@
 #define GRIIOFLOATCHANNELSRC_H
 
 #include "griiodevicesource.h"
+#include "iioutil/iiounits.h"
 #include "scopy-gr-util_export.h"
+#include <gnuradio/blocks/stream_to_vector.h>
 
 namespace scopy::grutil {
 class SCOPY_GR_UTIL_EXPORT GRIIOFloatChannelSrc : public GRIIOChannel
 {
 public:
 	GRIIOFloatChannelSrc(GRIIODeviceSource *dev, QString channelName, QObject *parent = nullptr);
 
-	void build_blks(GRTopBlock *top);
-	void destroy_blks(GRTopBlock *top);
-	virtual bool sampleRateAvailable() override;
+	void build_blks(GRTopBlock *top) override;
+	void destroy_blks(GRTopBlock *top) override;
+
+	virtual bool samplerateAttributeAvailable() override;
 	virtual double readSampleRate() override;
 
+	virtual bool scaleAttributeAvailable() override;
+	virtual double readScale() override;
+
+	IIOUnit unit();
+
 	const iio_data_format *getFmt() const;
 	struct iio_channel *channel() const;
+	struct iio_device *dev() const;
+	struct iio_context *ctx() const;
+
+	const QString &scaleAttribute() const;
 
 protected:
 	gr::basic_block_sptr x2f;
+	gr::blocks::stream_to_vector::sptr s2v;
 
 private:
+	GRTopBlock *m_top;
+	IIOUnit m_unit;
 	const iio_data_format *fmt;
 	iio_channel *m_iioCh;
 	QString m_sampleRateAttribute;
+	QString m_scaleAttribute;
 };
 } // namespace scopy::grutil
 #endif // GRIIOFLOATCHANNELSRC_H

gr-util/include/gr-util/grscaleoffsetproc.h

@@ -4,7 +4,7 @@
 #include "grproxyblock.h"
 #include "scopy-gr-util_export.h"
 
-#include <gnuradio/blocks/add_const_ff.h>
+#include <gnuradio/blocks/add_const_v.h>
 #include <gnuradio/blocks/multiply_const.h>
 
 namespace scopy::grutil {
@@ -18,10 +18,11 @@ class SCOPY_GR_UTIL_EXPORT GRScaleOffsetProc : public GRProxyBlock
 	void destroy_blks(GRTopBlock *top);
 
 protected:
-	gr::blocks::add_const_ff::sptr add;
+	gr::blocks::add_const_v<float>::sptr add;
 	gr::blocks::multiply_const_ff::sptr mul;
 	double m_scale;
 	double m_offset;
+	GRTopBlock *m_top;
 };
 } // namespace scopy::grutil
 #endif // GRSCALEOFFSETPROC_H

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;

gr-util/include/gr-util/grtopblock.h

@@ -23,10 +23,15 @@ class SCOPY_GR_UTIL_EXPORT GRTopBlock : public QObject
 	void registerIIODeviceSource(GRIIODeviceSource *);
 	void unregisterIIODeviceSource(GRIIODeviceSource *);
 
+	void setVLen(size_t vlen);
+	size_t vlen();
+
 	void connect(gr::basic_block_sptr src, int srcPort, gr::basic_block_sptr dst, int dstPort);
 
 	gr::top_block_sptr getGrBlock();
 
+	QString name() const;
+
 Q_SIGNALS:
 	void aboutToBuild();
 	void builtSignalPaths();
@@ -37,6 +42,7 @@ class SCOPY_GR_UTIL_EXPORT GRTopBlock : public QObject
 	void aboutToStop();
 	void stopped();
 	void finished();
+	void requestRebuild();
 
 public Q_SLOTS:
 	void build();
@@ -51,6 +57,7 @@ public Q_SLOTS:
 	QString m_name;
 	bool running;
 	bool built;
+	size_t m_vlen;
 	QList<GRSignalPath *> m_signalPaths;
 	QList<GRIIODeviceSource *> m_iioDeviceSources;
 };

gr-util/include/gr-util/time_sink_f.h

@@ -66,22 +66,19 @@ class SCOPY_GR_UTIL_EXPORT time_sink_f : virtual public gr::sync_block
 	// scopy::time_sink_f::sptr
 	typedef std::shared_ptr<time_sink_f> sptr;
 
-	static sptr make(int size, float sampleRate, const std::string &name, int nconnections);
+	static sptr make(int size, size_t vlen, float sampleRate, const std::string &name, int nconnections);
 	virtual std::string name() const = 0;
-	virtual void updateData() = 0;
+	virtual uint64_t updateData() = 0;
 	virtual const std::vector<float> &time() const = 0;
 	virtual const std::vector<float> &freq() const = 0;
 	virtual const std::vector<std::vector<float>> &data() const = 0;
-	virtual const std::vector<std::vector<PlotTag_t>> &tags() const = 0;
 	virtual void setRollingMode(bool) = 0;
 	virtual bool rollingMode() = 0;
 	virtual void setSingleShot(bool) = 0;
 	virtual bool singleShot() = 0;
 	virtual bool finishedAcquisition() = 0;
-	virtual bool computeTags() = 0;
 	virtual float freqOffset() = 0;
 	virtual void setFreqOffset(float) = 0;
-	virtual void setComputeTags(bool newComputeTags) = 0;
 	virtual bool fftComplex() = 0;
 	virtual void setFftComplex(bool) = 0;
 };