fmcomms5: refactoring

Signed-off-by: IonutMuthi <[email protected]>

Author: IonutMuthi

packages/ad936x/plugins/ad936x/include/ad936x/fmcomms5/fmcomms5advanced.h

@@ -70,6 +70,7 @@ class SCOPY_AD936X_EXPORT Fmcomms5Advanced : public QWidget
 	ToolTemplate *m_tool;
 	QVBoxLayout *m_mainLayout;
 	AnimatedRefreshBtn *m_refreshButton;
+
 	EnsmModeClocksWidget *m_ensmModeClocks;
 	ElnaWidget *m_elna;
 	RssiWidget *m_rssi;
@@ -80,8 +81,8 @@ class SCOPY_AD936X_EXPORT Fmcomms5Advanced : public QWidget
 	BistWidget *m_bist;
 	Fmcomms5Tab *m_fmcomms5;
 
-	iio_device *m_plutoDevice = nullptr;
-	iio_device *m_plutoDeviceB = nullptr;
+	iio_device *m_mainDevice = nullptr;
+	iio_device *m_secondDevice = nullptr;
 	QStackedWidget *m_centralWidget = nullptr;
 
 	bool m_isToolInitialized;

packages/ad936x/plugins/ad936x/include/ad936x/fmcomms5/fmcomms5calibration.h

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2025 Analog Devices Inc.
+ *
+ * This file is part of Scopy
+ * (see https://www.github.com/analogdevicesinc/scopy).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef FMCOMMS5CALIBRATION_H
+#define FMCOMMS5CALIBRATION_H
+
+#include <QObject>
+#include <iio.h>
+
+namespace scopy {
+namespace ad936x {
+
+struct MarkerResult
+{
+	double magnitude;
+	double offset;
+	int chA;
+	int chB;
+};
+
+// used devices
+#define CAP_DEVICE "cf-ad9361-lpc"
+#define CAP_DEVICE_ALT "cf-ad9361-A"
+#define CAP_SLAVE_DEVICE "cf-ad9361-B"
+#define DDS_DEVICE "cf-ad9361-dds-core-lpc"
+#define DDS_SLAVE_DEVICE "cf-ad9361-dds-core-B"
+
+/* 1MHZ tone */
+#define CAL_TONE 1000000
+#define CAL_SCALE 0.12500
+#define MARKER_AVG 3
+
+class Fmcomms5Calibration : public QObject
+{
+	Q_OBJECT
+public:
+	explicit Fmcomms5Calibration(iio_context *ctx, QObject *parent = nullptr);
+
+	void calibrate();
+	void resetCalibration();
+	void callSwitchPortsEnableCb(int val);
+
+Q_SIGNALS:
+	void calibrationFailed();
+	void updateCalibrationProgress(double progress);
+
+private:
+	iio_context *m_ctx;
+	iio_device *m_mainDevice = nullptr;
+	iio_device *m_secondDevice = nullptr;
+	iio_device *m_cf_ad9361_lpc = nullptr;
+	iio_device *m_cf_ad9361_hpc = nullptr;
+	iio_device *m_ddsMain = nullptr;
+	iio_device *m_ddsSecond = nullptr;
+
+	const char *ddsChannelNames[8] = {"altvoltage0", "altvoltage1", "altvoltage2", "altvoltage3",
+					  "altvoltage4", "altvoltage5", "altvoltage6", "altvoltage7"};
+
+	void calibrationFail(int ret);
+
+	double tuneTrxPhaseOffset(iio_device *ldev, int *ret, long long cal_freq, long long cal_tone, double sign,
+				  std::function<void(iio_device *, double)> tune);
+
+	void getMarkers(double *offset, double *mag);
+	std::vector<MarkerResult> getMarkersFromCrossCorrelation();
+	double calcPhaseOffset(double fsample, double dds_freq, double offset, double mag);
+	double scalePhase0360(double val);
+
+	int defaultDds(long long freq, double scale);
+	void ddsTxPhaseRotation(struct iio_device *dev, double val);
+	void trxPhaseRottation(iio_device *dev, double val);
+	unsigned int getCalTone();
+
+	int getCalSamples(long long calTone, long long calFreq);
+
+	void nearEndLoopbackCtrl(unsigned channel, bool enable);
+};
+} // namespace ad936x
+} // namespace scopy
+#endif // FMCOMMS5CALIBRATION_H

packages/ad936x/plugins/ad936x/include/ad936x/fmcomms5/fmcomms5tab.h

@@ -44,27 +44,9 @@ class Fmcomms5Tab : public QWidget
 private:
 	iio_context *m_ctx;
 	QVBoxLayout *m_layout;
-	iio_device *m_device = nullptr;
-	iio_device *m_deviceB = nullptr;
-	QCheckBox *m_silentCalibration;
 	QProgressBar *m_calibProgressBar;
 	QPushButton *m_calibrateBtn;
-
-	void initDevices();
-
-	void calibrate();
-	void trxPhaseRottation(iio_device *dev, double val);
-
-	void resetCalibration();
-	void callSwitchPortsEnableCb(int val);
-	double tuneTrxPhaseOffset(iio_device *ldev, int *ret, long long cal_freq, long long cal_tone, double sign,
-				  double abort, std::function<void(iio_device *, double)> tune);
-
-	// helper functions TODO MOVE TO CLASS
-	double scalePhase0360(double val);
-	double calcPhaseOffset(double fsample, double dds_freq, double offset, double mag);
-	void getMarkers(double *offset, double *mag);
-	int getCalSamples(long long calTone, long long calFreq);
+	QPushButton *m_resetCalibrationBtn;
 };
 } // namespace ad936x
 } // namespace scopy

packages/ad936x/plugins/ad936x/resources/AD_FMCOMMS5_EBZ.jpg

@@ -5,5 +5,6 @@
         <file>ad936x-filters/AD936x_LP_256kHz_768kSPS.ftr</file>
         <file>ad936x-filters/AD936x_LP_333kHz_1MSPS.ftr</file>
         <file>ad936x-filters/AD936x_LP_666kHz_2MSPS.ftr</file>
+        <file>AD_FMCOMMS5_EBZ.jpg</file>
     </qresource>
 </RCC>

packages/ad936x/plugins/ad936x/resources/resources.qrc

@@ -120,7 +120,7 @@ AD936X::AD936X(iio_context *ctx, QWidget *parent)
 		controlWidgetLayout->addWidget(
 			generateRxChainWidget(plutoDevice, "AD9361 / AD9364 Receive Chain", controlsWidget));
 
-		/// third is Tx (transimt chain)
+		/// third is Tx (transmit chain)
 		controlWidgetLayout->addWidget(
 			generateTxChainWidget(plutoDevice, "AD9361 / AD9364 Transmit Chain", controlsWidget));
 

packages/ad936x/plugins/ad936x/src/ad936x/ad936x.cpp

@@ -96,13 +96,13 @@ FMCOMMS5::FMCOMMS5(iio_context *ctx, QWidget *parent)
 
 	if(m_ctx != nullptr) {
 
-		iio_device *plutoDevice = nullptr;
+		iio_device *mainDevice = nullptr;
 		int device_count = iio_context_get_devices_count(m_ctx);
 		for(int i = 0; i < device_count; ++i) {
 			iio_device *dev = iio_context_get_device(m_ctx, i);
 			const char *dev_name = iio_device_get_name(dev);
-			if(dev_name && QString(dev_name).contains("ad936", Qt::CaseInsensitive)) {
-				plutoDevice = dev;
+			if(dev_name && QString(dev_name).compare("ad9361-phy", Qt::CaseInsensitive) == 0) {
+				mainDevice = dev;
 				break;
 			}
 		}
@@ -111,67 +111,87 @@ FMCOMMS5::FMCOMMS5(iio_context *ctx, QWidget *parent)
 		connect(this, &FMCOMMS5::readRequested, m_helper, &AD936xHelper::readRequested);
 
 		///  first widget the global settings can be created with iiowigets only
-		controlWidgetLayout->addWidget(m_helper->generateGlobalSettingsWidget(
-			plutoDevice, "FMCOMMS5 Global Settings", controlsWidget));
+		controlWidgetLayout->addWidget(
+			m_helper->generateGlobalSettingsWidget(mainDevice, "FMCOMMS5 Global Settings", controlsWidget));
 
 		/// second is Rx ( receive chain)
 		controlWidgetLayout->addWidget(
-			generateRxChainWidget(plutoDevice, "FMCOMMS5 Receive Chain", controlsWidget));
+			generateRxChainWidget(mainDevice, "FMCOMMS5 Receive Chain", controlsWidget));
 
-		/// third is Tx (transimt chain)
+		/// third is Tx (transmit chain)
 		controlWidgetLayout->addWidget(
-			generateTxChainWidget(plutoDevice, "FMCOMMS5 Transmit Chain", controlsWidget));
+			generateTxChainWidget(mainDevice, "FMCOMMS5 Transmit Chain", controlsWidget));
 
 		controlWidgetLayout->addItem(new QSpacerItem(1, 1, QSizePolicy::Preferred, QSizePolicy::Expanding));
 	}
 
-	m_blockDiagramWidget = new QWidget(this);
-	Style::setBackgroundColor(m_blockDiagramWidget, json::theme::background_primary);
-	QVBoxLayout *blockDiagramLayout = new QVBoxLayout(m_blockDiagramWidget);
-	m_blockDiagramWidget->setLayout(blockDiagramLayout);
-
-	QWidget *blockDiagramWidget = new QWidget(this);
-	QVBoxLayout *blockDiagramWidgetLayout = new QVBoxLayout(blockDiagramWidget);
-	blockDiagramWidget->setLayout(blockDiagramWidgetLayout);
-
-	QScrollArea *blockDiagramWidgetScrollArea = new QScrollArea(this);
-	blockDiagramWidgetScrollArea->setWidgetResizable(true);
-	blockDiagramWidgetScrollArea->setWidget(blockDiagramWidget);
-
-	blockDiagramLayout->addWidget(blockDiagramWidgetScrollArea);
-
-	QLabel *blockDiagram = new QLabel(m_blockDiagramWidget);
-	blockDiagramWidgetLayout->addWidget(blockDiagram);
-	blockDiagram->setAlignment(Qt::AlignCenter);
-	// todo replace
-	QPixmap pixmap(":/pluto/ad936x.svg");
-	blockDiagram->setPixmap(pixmap);
+	// Block Diagram Stack Widget with Next/Prev buttons
+	QWidget *blockDiagramStackWidget = new QWidget(this);
+	Style::setBackgroundColor(blockDiagramStackWidget, json::theme::background_primary);
+	QVBoxLayout *blockDiagramStackLayout = new QVBoxLayout(blockDiagramStackWidget);
+	blockDiagramStackWidget->setLayout(blockDiagramStackLayout);
+
+	QStackedWidget *imageStack = new QStackedWidget(blockDiagramStackWidget);
+
+	// Add images as QLabel widgets
+	QLabel *imageLabel1 = new QLabel(blockDiagramStackWidget);
+	imageLabel1->setAlignment(Qt::AlignCenter);
+	imageLabel1->setPixmap(QPixmap(":/pluto/ad936x.svg"));
+	imageStack->addWidget(imageLabel1);
+
+	QLabel *imageLabel2 = new QLabel(blockDiagramStackWidget);
+	imageLabel2->setAlignment(Qt::AlignCenter);
+	imageLabel2->setPixmap(QPixmap(":/pluto/AD_FMCOMMS5_EBZ.jpg"));
+	imageStack->addWidget(imageLabel2);
+
+	blockDiagramStackLayout->addWidget(imageStack);
+
+	QHBoxLayout *buttonLayout = new QHBoxLayout();
+	QPushButton *prevBtn = new QPushButton("Prev", blockDiagramStackWidget);
+	Style::setStyle(prevBtn, style::properties::button::basicButton);
+	QPushButton *nextBtn = new QPushButton("Next", blockDiagramStackWidget);
+	Style::setStyle(nextBtn, style::properties::button::basicButton);
+	buttonLayout->addWidget(prevBtn);
+	buttonLayout->addWidget(nextBtn);
+	blockDiagramStackLayout->addLayout(buttonLayout);
+
+	// Navigation logic
+	connect(prevBtn, &QPushButton::clicked, this, [imageStack]() {
+		int idx = imageStack->currentIndex();
+		if(idx > 0)
+			imageStack->setCurrentIndex(idx - 1);
+	});
+	connect(nextBtn, &QPushButton::clicked, this, [imageStack]() {
+		int idx = imageStack->currentIndex();
+		if(idx < imageStack->count() - 1)
+			imageStack->setCurrentIndex(idx + 1);
+	});
 
 	centralWidget->addWidget(m_controlsWidget);
-	centralWidget->addWidget(m_blockDiagramWidget);
+	centralWidget->addWidget(blockDiagramStackWidget);
 
 	m_tool->addWidgetToCentralContainerHelper(centralWidget);
 
 	QButtonGroup *centralWidgetButtons = new QButtonGroup(this);
 	centralWidgetButtons->setExclusive(true);
 
-	QPushButton *ad963xBtn = new QPushButton("Controls", this);
-	ad963xBtn->setCheckable(true);
-	ad963xBtn->setChecked(true);
-	Style::setStyle(ad963xBtn, style::properties::button::blueGrayButton);
-	connect(ad963xBtn, &QPushButton::clicked, this,
+	QPushButton *controlsBtn = new QPushButton("Controls", this);
+	controlsBtn->setCheckable(true);
+	controlsBtn->setChecked(true);
+	Style::setStyle(controlsBtn, style::properties::button::blueGrayButton);
+	connect(controlsBtn, &QPushButton::clicked, this,
 		[=, this]() { centralWidget->setCurrentWidget(m_controlsWidget); });
 
 	QPushButton *blockDiagramBtn = new QPushButton("Block Diagram", this);
 	blockDiagramBtn->setCheckable(true);
 	Style::setStyle(blockDiagramBtn, style::properties::button::blueGrayButton);
 	connect(blockDiagramBtn, &QPushButton::clicked, this,
-		[=, this]() { centralWidget->setCurrentWidget(m_blockDiagramWidget); });
+		[=, this]() { centralWidget->setCurrentWidget(blockDiagramStackWidget); });
 
-	centralWidgetButtons->addButton(ad963xBtn);
+	centralWidgetButtons->addButton(controlsBtn);
 	centralWidgetButtons->addButton(blockDiagramBtn);
 
-	m_tool->addWidgetToTopContainerHelper(ad963xBtn, TTA_LEFT);
+	m_tool->addWidgetToTopContainerHelper(controlsBtn, TTA_LEFT);
 	m_tool->addWidgetToTopContainerHelper(blockDiagramBtn, TTA_LEFT);
 }
 
@@ -289,7 +309,7 @@ QWidget *FMCOMMS5::generateRxChainWidget(iio_device *dev, QString title, QWidget
 	for(int i = 0; i < device_count; ++i) {
 		iio_device *aux = iio_context_get_device(m_ctx, i);
 		const char *dev_name = iio_device_get_name(aux);
-		if(dev_name && QString(dev_name).contains("ad9361-phy-b", Qt::CaseInsensitive)) {
+		if(dev_name && QString(dev_name).contains("ad9361-phy-B", Qt::CaseInsensitive)) {
 			dev2 = aux;
 			break;
 		}